времени больше нет, доделаю завтра

space-sunrise · Jan 12, 2025 · 165b08d · 165b08d
1 parent fff6ea4
commit 165b08d
Show file tree

Hide file tree

Showing 5 changed files with 275 additions and 46 deletions.
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -1230,6 +1230,16 @@
   loadouts:
   - ChiefMedicalOfficerCloak
   - ChiefMedicalOfficerMantle
+# Sunrise-start
+  - Sunrise-ScarfBlue
+  - Sunrise-ScarfRed
+  - Sunrise-ScarfOrange
+  - Sunrise-ScarfGreen
+  - Sunrise-ScarfLightBlue 
+  - Sunrise-ScarfCyan
+  - Sunrise-ScarfBlue
+  - Sunrise-Stethoscope
+# Sunrise-end
 
 - type: loadoutGroup
   id: ChiefMedicalOfficerShoes
@@ -1289,14 +1299,31 @@
   minLimit: 0
   loadouts:
   - LatexGloves
+# Sunrise-start
+  - Sunrise-WhiteGloves
+  - Sunrise-RedGloves
+  - Sunrise-GreenGloves
+  - Sunrise-TealGloves
+  - Sunrise-GlovesNitrileRed
+  - Sunrise-GlovesNitrileGreen
+# Sunrise-end
   - NitrileGloves
 
 - type: loadoutGroup
   id: MedicalMask
   name: loadout-group-medical-mask
   minLimit: 0
   loadouts:
+# Sunrise-start
+  - Sunrise-MedicalSterileRed
+  - Sunrise-MedicalSterileGreen
+# Sunrise-end
   - SterileMask
+# Sunrise-start
+  - Sunrise-MedicalMaskRed
+  - Sunrise-MedicalMaskGreen
+  - Sunrise-MedicalMask
+# Sunrise-end
 
 - type: loadoutGroup
   id: MedicalInternJumpsuit

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -647,9 +647,15 @@
   groups:
   - GroupTankHarness
   - ChiefMedicalOfficerHead
-  - MedicalMask
+#  - MedicalMask   #Sunrise-edit
+# Sunrise-start
+  - SunriseChiefMedicalOfficerMask
+# Sunrise-end
   - ChiefMedicalOfficerJumpsuit
-  - MedicalGloves
+# Sunrise-start
+  - SunriseChiefMedicalOfficerGloves
+# Sunrise-end
+#  - MedicalGloves  #Sunrise-edit
   - MedicalBackpack
   - ChiefMedicalOfficerOuterClothing
   - ChiefMedicalOfficerNeck
@@ -728,10 +734,11 @@
   - GroupTankHarness
   # Sunrise-start
   - SunriseChemistHead
+  - SunriseChemistMask
   # Sunrise-end
-  - MedicalMask
+#  - MedicalMask   #Sunrise-edit
   - ChemistJumpsuit
-#    - MedicalGloves
+#    - MedicalGloves #Sunrise-edit
   # Sunrise-start
   - SunriseChemistGloves
   # Sunrise-end
@@ -740,7 +747,9 @@
   # Sunrise-start
   - SunriseChemistNeck
   # Sunrise-end
-  - MedicalShoes
+  - SunriseChemistShoes
+  # Sunrise-end
+#  - MedicalShoes #Sunrise-edit
   - SurvivalMedical
   - Trinkets
   - GroupSpeciesBreathToolMedical
@@ -757,9 +766,12 @@
   groups:
   - GroupTankHarness
   - ParamedicHead
-  - MedicalMask
+#  - MedicalMask   #Sunrise-edit
+  # Sunrise-start
+  - SunriseParamedicMask
+  # Sunrise-end
   - ParamedicJumpsuit
-#  - MedicalGloves
+#  - MedicalGloves #Sunrise-edit
   # Sunrise-start
   - SunriseParamedicGloves
   # Sunrise-end
@@ -820,6 +832,7 @@
   groups:
   # Sunrise-start
   - SunrisePsychologistHead
+  - MedicalMask
   - SunrisePsychologistGloves
   # Sunrise-end
   - CommonBackpack # Sunrise-edit

diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/general_clothing.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/general_clothing.yml
@@ -136,6 +136,17 @@
 
 #Neck
 
+
+- type: loadout
+  id: Sunrise-ScarfBlack
+  equipment:
+    neck: ClothingNeckScarfStripedBlack
+
+- type: loadout
+  id: Sunrise-ScarfGreen
+  equipment:
+    neck: ClothingNeckScarfStripedGreen
+
 - type: loadout
   id: Sunrise-ScarfRed
   equipment:
@@ -265,6 +276,11 @@
   equipment:
     outerClothing: ClothingOuterWinterColorCyan
 
+- type: loadout
+  id: Sunrise-WinterColorBlack
+  equipment:
+    outerClothing: ClothingOuterWinterColorBlack
+
 #Shoes
 
 - type: loadout
@@ -312,7 +328,12 @@
   equipment:
     shoes: ClothingShoesLeather
 
-#gloves
+# Gloves
+
+- type: loadout
+  id: Sunrise-BlackGloves
+  equipment:
+    gloves: ClothingHandsGlovesColorBlack
 
 - type: loadout
   id: Sunrise-RedGloves

diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/medical.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/medical.yml
@@ -170,7 +170,6 @@
   equipment:
     mask: ClothingMaskBreathMedicalBlack
 
-
 - type: loadout
   id: Sunrise-MedicalMaskBlue
   equipment:
@@ -197,7 +196,7 @@
     mask: ClothingMaskSterileOrange
 
 - type: loadout
-  id: Sunrise-MedicalMaskBlue
+  id: Sunrise-MedicalSterileRed
   equipment:
     mask: ClothingMaskSterileRed
 
@@ -228,23 +227,6 @@
   equipment:
     gloves: ClothingHandsGlovesNitrileBlue
 
-#Head
-
-- type: loadout
-  id: Sunrise-SurgcapBlue
-  equipment:
-    Head: ClothingHeadHatSurgcapBlue
-
-- type: loadout
-  id: Sunrise-SurgcapGreen
-  equipment:
-    Head: ClothingHeadHatSurgcapGreen
-
-- type: loadout
-  id: Sunrise-SurgcapPurple
-  equipment:
-    Head: ClothingHeadHatSurgcapPurple
-