Skip to content

Commit

Permalink
cleanup and new icons
Browse files Browse the repository at this point in the history
  • Loading branch information
FluffiestFloof committed Oct 10, 2023
1 parent b26c021 commit a04f142
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 22 deletions.
9 changes: 6 additions & 3 deletions Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
- type: Sprite
layers:
- state: green
- state: miner
- sprite: DeltaV/Markers/jobs.rsi # DeltaV - Salvage specialist look change
state: salvagespecialist

# Civilian

Expand Down Expand Up @@ -430,7 +431,8 @@
- type: Sprite
layers:
- state: green
- state: rd
- sprite: DeltaV/Markers/jobs.rsi # DeltaV - Epistemics new labcoats
state: mystagogue

- type: entity
id: SpawnPointSeniorResearcher
Expand All @@ -454,7 +456,8 @@
- type: Sprite
layers:
- state: green
- state: scientist
- sprite: DeltaV/Markers/jobs.rsi # DeltaV - Epistemics new labcoats
state: scientist

# Security

Expand Down
23 changes: 11 additions & 12 deletions Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
- type: SpawnPoint
job_id: Gladiator
- type: Sprite
sprite: DeltaV/Markers/jobs.rsi
layers:
- state: green
- state: nyanogladiator
- sprite: DeltaV/Markers/jobs.rsi
state: nyanogladiator

- type: entity
id: SpawnPointPrisoner
Expand All @@ -19,10 +19,9 @@
- type: SpawnPoint
job_id: Prisoner
- type: Sprite
sprite: DeltaV/Markers/jobs.rsi
layers:
- state: green
- state: nyanoprisoner
- state: prisoner

- type: entity
id: SpawnPointPrisonGuard
Expand All @@ -32,10 +31,10 @@
- type: SpawnPoint
job_id: PrisonGuard
- type: Sprite
sprite: DeltaV/Markers/jobs.rsi
layers:
- state: green
- state: nyanoprisonguard
- sprite: DeltaV/Markers/jobs.rsi
state: nyanoprisonguard

- type: entity
id: SpawnPointMailCarrier
Expand All @@ -45,10 +44,10 @@
- type: SpawnPoint
job_id: MailCarrier
- type: Sprite
sprite: DeltaV/Markers/jobs.rsi
layers:
- state: green
- state: nyanomailcarrier
- sprite: DeltaV/Markers/jobs.rsi
state: nyanomailcarrier

- type: entity
id: SpawnPointMartialArtist
Expand All @@ -58,10 +57,10 @@
- type: SpawnPoint
job_id: MartialArtist
- type: Sprite
sprite: DeltaV/Markers/jobs.rsi
layers:
- state: green
- state: nyanomartialartist
- sprite: DeltaV/Markers/jobs.rsi
state: nyanomartialartist

- type: entity
id: SpawnPointForensicMantis
Expand All @@ -71,7 +70,7 @@
- type: SpawnPoint
job_id: ForensicMantis
- type: Sprite
sprite: DeltaV/Markers/jobs.rsi
layers:
- state: green
- state: nyanomantis
- sprite: DeltaV/Markers/jobs.rsi
state: nyanomantis
Binary file removed Resources/Textures/DeltaV/Markers/jobs.rsi/green.png
Binary file not shown.
17 changes: 10 additions & 7 deletions Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi",
"copyright": "made by Floofers",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "green"
},
{
"name": "nyanogladiator"
},
{
"name": "nyanoprisonguard"
},
{
"name": "nyanoprisoner"
},
{
"name": "nyanomailcarrier"
},
Expand All @@ -27,6 +21,15 @@
},
{
"name": "nyanomantis"
},
{
"name": "salvagespecialist"
},
{
"name": "mystagogue"
},
{
"name": "scientist"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/DeltaV/Markers/jobs.rsi/nyanogladiator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/DeltaV/Markers/jobs.rsi/nyanomailcarrier.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/DeltaV/Markers/jobs.rsi/nyanomartialartist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified Resources/Textures/DeltaV/Markers/jobs.rsi/nyanoprisonguard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a04f142

Please sign in to comment.