Merge pull request Simple-Station#3 from Eagle-0/saltern-updates

Saltern Redux, Interdyne hand-me-downs
FoxxoTrystan · Apr 30, 2024 · c10d283 · c10d283
2 parents c1287b8 + 1618f20
commit c10d283
Show file tree

Hide file tree

Showing 8 changed files with 2,331 additions and 1,955 deletions.
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -24,7 +24,7 @@
       - id: BoxPDAPrisoner # Delta-V
       - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
       - id: BoxEncryptionKeyPrisoner #Delta-V
-      
+
 - type: entity
   id: LockerWardenFilled
   suffix: Filled
@@ -295,3 +295,26 @@
     contents:
     - id: WeaponLaserCarbine
       amount: 3
+
+#Syndicate Station Gorlex Security
+- type: entity
+  parent: GunSafe
+  id: GunSafeC20
+  name: c-20r safe
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingBackpackDuffelSyndicateFilledSMG
+      amount: 2
+
+- type: entity
+  parent: GunSafe
+  id: GunSafePistolViper
+  name: viper safe
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolViper
+      amount: 4
+    - id: MagazinePistol
+      amount: 8
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/scrubs.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/scrubs.yml
@@ -63,3 +63,8 @@
     sprite: DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi
+  - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
+    tags:
+    - Skirt
+    - ClothMade
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -23,8 +23,9 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 30
-  - type: Tag
+  - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
     tags:
+    - Skirt
     - ClothMade
     - WhitelistChameleon
 

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -18,15 +18,15 @@
 - type: startingGear
   id: ChemistGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitChemistry
+    jumpsuit: UniformScrubsColorCybersun
     back: ClothingBackpackChemistryFilled
-    shoes: ClothingShoesColorWhite
+    shoes: ClothingShoesColorBlack
     outerClothing: ClothingOuterCoatLabChem
     id: ChemistryPDA
     ears: ClothingHeadsetMedical
     belt: ChemBag
     pocket1: HandLabeler
     # the purple glasses?
-  innerClothingSkirt: ClothingUniformJumpskirtChemistry
+  innerClothingSkirt: UniformScrubsColorCybersun
   satchel: ClothingBackpackSatchelChemistryFilled
   duffelbag: ClothingBackpackDuffelChemistryFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -20,13 +20,14 @@
 - type: startingGear
   id: DoctorGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitMedicalDoctor
+    jumpsuit: UniformScrubsColorCybersun
     back: ClothingBackpackMedicalFilled
-    shoes: ClothingShoesColorWhite
-    outerClothing: ClothingOuterCoatLab
+    shoes: ClothingShoesColorBlack
+    outerClothing: ClothingOuterCoatCybersunWindbreaker
     id: MedicalPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
-  innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor
+    head: ClothingHeadHatSurgcapCybersun
+  innerClothingSkirt: UniformScrubsColorCybersun
   satchel: ClothingBackpackSatchelMedicalFilled
   duffelbag: ClothingBackpackDuffelMedicalFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -19,9 +19,9 @@
 - type: startingGear
   id: MedicalInternGear
   equipment:
-    jumpsuit: UniformScrubsColorBlue # DeltaV - Intern starts with blue scrubs
+    jumpsuit: UniformScrubsColorCybersun # Syndicate Station - Interns start with cybersun scrubs
     back: ClothingBackpackMedicalFilled
-    shoes: ClothingShoesColorWhite
+    shoes: ClothingShoesColorBlack
     id: MedicalInternPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -27,14 +27,15 @@
 - type: startingGear
   id: ParamedicGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitParamedic
+    jumpsuit: UniformScrubsColorCybersun
     back: ClothingBackpackParamedicFilledDV # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/backpack.yml
-    shoes: ClothingShoesColorBlue
+    shoes: ClothingShoesColorBlack
     id: ParamedicPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalEMTFilled
     pocket1: HandheldGPSBasic # DeltaV - Give Paramedics useful tools on spawn
     pocket2: HandheldCrewMonitor # DeltaV - Give Paramedics useful tools on spawn
-  innerClothingSkirt: ClothingUniformJumpskirtParamedic
+    head: ClothingHeadHatSurgcapCybersun
+  innerClothingSkirt: UniformScrubsColorCybersun
   satchel: ClothingBackpackSatchelParamedicFilledDV # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/satchel.yml
   duffelbag: ClothingBackpackDuffelParamedicFilledDV # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/duffelbag.yml