diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml deleted file mode 100644 index 2376de0f27d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml +++ /dev/null @@ -1,23 +0,0 @@ - -- type: entity - id: ADTSpawnPointJobBase - parent: MarkerBase - abstract: true - suffix: Job Spawn ADT - components: - - type: SpawnPoint - spawn_type: Job - - type: Sprite - sprite: ADT/Markers/job.rsi - -- type: entity - id: SpawnPointADTPathologist - parent: ADTSpawnPointJobBase - name: pathologist - components: - - type: SpawnPoint - job_id: ADTPathologist - - type: Sprite - layers: - - state: green - - state: pathologist \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml index ef6d511358b..10d99928089 100644 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml @@ -2,13 +2,25 @@ id: ADTSpawnPointJobBase parent: MarkerBase abstract: true - suffix: Job Spawn + suffix: Job Spawn ADT components: - type: SpawnPoint spawn_type: Job - type: Sprite sprite: ADT/Markers/jobs.rsi +- type: entity + id: SpawnPointADTPathologist + parent: ADTSpawnPointJobBase + name: pathologist + components: + - type: SpawnPoint + job_id: ADTPathologist + - type: Sprite + layers: + - state: green + - state: pathologist + - type: entity id: SpawnPointMagistrat parent: ADTSpawnPointJobBase diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json index b442515e295..a71d57c8075 100644 --- a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json @@ -1,9 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi . Blueshield made by Tamioki.", -======= - "copyright": "Sprite made by JustKeks(github) ", + "copyright": "ADTPathologist icon made by JustKeks(github) | Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi . Blueshield made by Tamioki.", "size": { "x": 8, @@ -12,11 +10,7 @@ "states": [ { "name": "Magistrat" - } - ] -} -======= - + }, { "name": "ADTPathologist" } diff --git a/Resources/Textures/ADT/Markers/job.rsi/green.png b/Resources/Textures/ADT/Markers/job.rsi/green.png deleted file mode 100644 index 0becfdb0c54..00000000000 Binary files a/Resources/Textures/ADT/Markers/job.rsi/green.png and /dev/null differ diff --git a/Resources/Textures/ADT/Markers/job.rsi/iaa.png b/Resources/Textures/ADT/Markers/job.rsi/iaa.png deleted file mode 100644 index f93b5d50349..00000000000 Binary files a/Resources/Textures/ADT/Markers/job.rsi/iaa.png and /dev/null differ diff --git a/Resources/Textures/ADT/Markers/job.rsi/magistrat.png b/Resources/Textures/ADT/Markers/job.rsi/magistrat.png deleted file mode 100644 index 1e86415378c..00000000000 Binary files a/Resources/Textures/ADT/Markers/job.rsi/magistrat.png and /dev/null differ diff --git a/Resources/Textures/ADT/Markers/job.rsi/meta.json b/Resources/Textures/ADT/Markers/job.rsi/meta.json deleted file mode 100644 index 40d0eda2dcf..00000000000 --- a/Resources/Textures/ADT/Markers/job.rsi/meta.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Adventure Time, justkekc", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "green" - }, - { - "name": "investigator" - }, - { - "name": "magistrat" - }, - { - "name": "iaa" - }, - { - "name": "urist" - }, - { - "name": "pathologist" - } - ] -} diff --git a/Resources/Textures/ADT/Markers/job.rsi/investigator.png b/Resources/Textures/ADT/Markers/jobs.rsi/investigator.png similarity index 100% rename from Resources/Textures/ADT/Markers/job.rsi/investigator.png rename to Resources/Textures/ADT/Markers/jobs.rsi/investigator.png diff --git a/Resources/Textures/ADT/Markers/jobs.rsi/meta.json b/Resources/Textures/ADT/Markers/jobs.rsi/meta.json index 3984951aaab..40d0eda2dcf 100644 --- a/Resources/Textures/ADT/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/ADT/Markers/jobs.rsi/meta.json @@ -6,15 +6,24 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "magistrat" - }, - { - "name": "green" - }, - { - "name": "iaa" - } - ] + "states": [ + { + "name": "green" + }, + { + "name": "investigator" + }, + { + "name": "magistrat" + }, + { + "name": "iaa" + }, + { + "name": "urist" + }, + { + "name": "pathologist" + } + ] } diff --git a/Resources/Textures/ADT/Markers/job.rsi/pathologist.png b/Resources/Textures/ADT/Markers/jobs.rsi/pathologist.png similarity index 100% rename from Resources/Textures/ADT/Markers/job.rsi/pathologist.png rename to Resources/Textures/ADT/Markers/jobs.rsi/pathologist.png diff --git a/Resources/Textures/ADT/Markers/job.rsi/urist.png b/Resources/Textures/ADT/Markers/jobs.rsi/urist.png similarity index 100% rename from Resources/Textures/ADT/Markers/job.rsi/urist.png rename to Resources/Textures/ADT/Markers/jobs.rsi/urist.png