Skip to content

Commit

Permalink
Merge branch 'DeltaV-Station:master' into quickfix
Browse files Browse the repository at this point in the history
  • Loading branch information
TadJohnson00 authored Oct 8, 2023
2 parents 3e6c389 + 8339ecc commit 22ef350
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
parent: BaseSignDirectional
id: SignDirectionalLogistics
name: logistics sign
description: A direction sign, pointing out which way the Logistics department is.
components:
- type: Sprite
sprite: DeltaV/Structures/Wallmounts/signs.rsi
state: direction_logi

- type: entity
parent: BaseSignDirectional
id: SignDirectionalMail
name: mailroom sign
description: A direction sign, pointing out which way the mailroom is.
components:
- type: Sprite
sprite: DeltaV/Structures/Wallmounts/signs.rsi
state: direction_mail
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
- type: entity
parent: ClothingHeadsetScience
id: ClothingHeadsetRD
name: rd headset
name: mysta headset # DeltaV - Epistemics Department replacing Science
description: Lamarr used to love chewing on this...
components:
- type: ContainerFill
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
- type: startingGear
id: MedicalInternGear
equipment:
jumpsuit: ClothingUniformJumpsuitColorWhite
jumpsuit: UniformScrubsColorBlue # DeltaV - Intern starts with blue scrubs
back: ClothingBackpackMedicalFilled
shoes: ClothingShoesColorWhite
id: MedicalInternPDA
ears: ClothingHeadsetMedical
belt: ClothingBeltMedicalFilled
innerclothingskirt: ClothingUniformJumpskirtColorWhite
# innerclothingskirt: ClothingUniformJumpskirtColorWhite #Delta V
satchel: ClothingBackpackSatchelMedicalFilled
duffelbag: ClothingBackpackDuffelMedicalFilled
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,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "direction_logi",
"directions": 4
},
{
"name": "direction_mail",
"directions": 4
}
]
}

0 comments on commit 22ef350

Please sign in to comment.