Skip to content

Commit

Permalink
Добавление магистрата: fix:
Browse files Browse the repository at this point in the history
Resources\Textures\ADT\Markers\job.rsi\meta.json
Resources\Prototypes\ADT\Entities\Markers\Spawners\jobs.yml
Resources\Textures\ADT\Markers\jobs.rsi
  • Loading branch information
Bolper committed Aug 3, 2024
1 parent ee62d64 commit 7baf95f
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 72 deletions.
23 changes: 0 additions & 23 deletions Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml

This file was deleted.

14 changes: 13 additions & 1 deletion Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -12,11 +10,7 @@
"states": [
{
"name": "Magistrat"
}
]
}
=======

},
{
"name": "ADTPathologist"
}
Expand Down
Binary file removed Resources/Textures/ADT/Markers/job.rsi/green.png
Binary file not shown.
Binary file removed Resources/Textures/ADT/Markers/job.rsi/iaa.png
Binary file not shown.
Binary file removed Resources/Textures/ADT/Markers/job.rsi/magistrat.png
Binary file not shown.
29 changes: 0 additions & 29 deletions Resources/Textures/ADT/Markers/job.rsi/meta.json

This file was deleted.

31 changes: 20 additions & 11 deletions Resources/Textures/ADT/Markers/jobs.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}

0 comments on commit 7baf95f

Please sign in to comment.