Skip to content

Commit

Permalink
bu bu bu
Browse files Browse the repository at this point in the history
  • Loading branch information
Kirillcas committed Dec 22, 2023
1 parent 1425216 commit 7deaa81
Show file tree
Hide file tree
Showing 13 changed files with 69 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
- type: Storage
maxItemSize: Normal
grid:
- 0,0,10,1
- 0,0,4,1
whitelist:
tags:
- Katana
Expand Down
29 changes: 27 additions & 2 deletions Resources/Prototypes/Backmen/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
layers:
- state: green
- state: centcom_operator
- state: jobicon

- type: entity
id: SpawnPointBKCCOfficial
Expand All @@ -21,6 +22,7 @@
layers:
- state: green
- state: centcom_official
- state: jobicon

- type: entity
id: SpawnPointBKCCOperator
Expand All @@ -33,6 +35,7 @@
layers:
- state: green
- state: centcom_operator
- state: jobicon

- type: entity
id: SpawnPointBKCCSecGavna
Expand All @@ -45,6 +48,7 @@
layers:
- state: green
- state: centcom_head_of_securiry
- state: jobicon

- type: entity
id: SpawnPointBKCCCargo
Expand All @@ -57,6 +61,8 @@
layers:
- state: green
- state: qm
- state: jobicon
sprite: Backmen/Markers/jobs.rsi

- type: entity
id: SpawnPointBKCCAssistant
Expand All @@ -70,6 +76,7 @@
layers:
- state: green
- state: centcom_intern
- state: jobicon

- type: entity
id: SpawnPointBKCCSecOfficer
Expand All @@ -82,6 +89,8 @@
layers:
- state: green
- state: security_officer
- state: jobicon
sprite: Backmen/Markers/jobs.rsi

- type: entity
id: SpawnPointDelivery
Expand All @@ -95,6 +104,20 @@
layers:
- state: green
- state: Delivery
- state: jobicon

- type: entity
id: SpawnPointBrigmedic
parent: SpawnPointBKCCAssistant
name: brigmedic
components:
- type: SpawnPoint
job_id: Brigmedic
- type: Sprite
layers:
- state: green
- state: brigmedic
- state: jobicon

#- type: entity
# id: SpawnPointGladiator
Expand Down Expand Up @@ -206,16 +229,16 @@

- type: entity
id: SpawnPointPrisoner
parent: SpawnPointJobBase
parent: SpawnPointBKCCAssistant
name: prisoner
components:
- type: SpawnPoint
job_id: Prisoner
- type: Sprite
sprite: Backmen/Interface/Misc/job_icons.rsi
layers:
- state: green
- state: prisoner
- state: jobicon

#- type: entity
# id: SpawnPointValet
Expand Down Expand Up @@ -264,3 +287,5 @@
layers:
- state: green
- state: ai
- state: jobicon
sprite: Backmen/Markers/jobs.rsi

This file was deleted.

4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@
- EncryptionKeySecurity
- EncryptionKeyCommon
- type: Sprite
sprite: Clothing/Ears/Headsets/brigmedic.rsi
sprite: Backmen/Clothing/Ears/Headsets/secmed.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/brigmedic.rsi
sprite: Backmen/Clothing/Ears/Headsets/secmed.rsi

- type: entity
parent: ClothingHeadset
Expand Down
22 changes: 11 additions & 11 deletions Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -486,17 +486,17 @@
- state: green
- state: detective

- type: entity
id: SpawnPointBrigmedic
parent: SpawnPointJobBase
name: brigmedic
components:
- type: SpawnPoint
job_id: Brigmedic
- type: Sprite
layers:
- state: green
- state: brigmedic
# - type: entity
# id: SpawnPointBrigmedic
# parent: SpawnPointJobBase
# name: brigmedic
# components:
# - type: SpawnPoint
# job_id: Brigmedic
# - type: Sprite
# layers:
# - state: green
# - state: brigmedic

# SPECIAL
# ERT
Expand Down
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by PuroSlavKing and some resprited by SonicHDC (github) for SS14, recolor by Kirillcas(github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EARS",
"directions": 4
}
]
}
Binary file modified Resources/Textures/Backmen/Markers/factions.rsi/syndicate.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.
11 changes: 10 additions & 1 deletion Resources/Textures/Backmen/Markers/jobs.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "taken from TG ss13 build at commit https://github.com/tgstation/tgstation/blob/a4850faf88179baaa463ca29ab659e475bf8ed49/icons/mob/clothing/under/centcom.dmi / https://github.com/tgstation/tgstation/blob/a4850faf88179baaa463ca29ab659e475bf8ed49/icons/obj/clothing/under/centcom.dmi modified and added missing sprites by Kirillcas(github)",
"copyright": "taken from the game, jobicon by kirillcas(github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "jobicon"
},
{
"name": "centcom_operator"
},
Expand All @@ -24,6 +27,12 @@
},
{
"name": "centcom_intern"
},
{
"name": "prisoner"
},
{
"name": "brigmedic"
}
]
}
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 7deaa81

Please sign in to comment.