Убрал лишние прототипы

space-sunrise · Jun 11, 2024 · a259de8 · a259de8
1 parent 331705a
commit a259de8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 93 deletions.
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
@@ -21,4 +21,5 @@
     ears: ClothingHeadsetMedical
   storage:
     back:
-    - BoxSurvivalMedical
+    - BoxSurvivalMedical
+    - RubberStampPsychologist
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -1,32 +1,3 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackIAAFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackPsychologistFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalMedical
-        - id: RubberStampPsychologist
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackBrigmedic
-  id: ClothingBackpackBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalBrigmedic
-      - id: Flash
-
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSyndie

diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -1,28 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelIAAFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelPsychologistFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalMedical
-        - id: RubberStampPsychologist
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelBrigmedic
-  id: ClothingBackpackDuffelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalBrigmedic
-      - id: Flash

diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -1,28 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelIAAFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelPsychologistFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalMedical
-        - id: RubberStampPsychologist
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelBrigmedic
-  id: ClothingBackpackSatchelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalBrigmedic
-      - id: Flash

diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml
@@ -5,7 +5,7 @@
 - type: startingGear
   id: BrigmedicBackpack
   equipment:
-    back: ClothingBackpackBrigmedicFilled
+    back: ClothingBackpackBrigmedic
 
 - type: loadout
   id: BrigmedicDuffel
@@ -14,7 +14,7 @@
 - type: startingGear
   id: BrigmedicDuffel
   equipment:
-    back: ClothingBackpackDuffelBrigmedicFilled
+    back: ClothingBackpackDuffelBrigmedic
 
 - type: loadout
   id: BrigmedicSatchel
@@ -23,7 +23,7 @@
 - type: startingGear
   id: BrigmedicSatchel
   equipment:
-    back: ClothingBackpackSatchelBrigmedicFilled
+    back: ClothingBackpackSatchelBrigmedic
 
 - type: loadout
   id: BrigmedicJumpsuit

diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Wildcards/psychologist.yml
@@ -6,7 +6,7 @@
 - type: startingGear
   id: PsychologistBackpack
   equipment:
-    back: ClothingBackpackPsychologistFilled
+    back: ClothingBackpackPsychologist
 
 - type: loadout
   id: PsychologistSatchel
@@ -15,7 +15,7 @@
 - type: startingGear
   id: PsychologistSatchel
   equipment:
-    back: ClothingBackpackSatchelPsychologistFilled
+    back: ClothingBackpackSatchelPsychologist
 
 - type: loadout
   id: PsychologistDuffel
@@ -24,4 +24,4 @@
 - type: startingGear
   id: PsychologistDuffel
   equipment:
-    back: ClothingBackpackDuffelPsychologistFilled
+    back: ClothingBackpackDuffelPsychologist
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml
@@ -43,7 +43,7 @@
   id: MagistratGear
   equipment:
     jumpsuit: MagistratUniformSuit
-    back: ClothingBackpackIAAFilled
+    back: ClothingBackpack
     shoes: ClothingShoesBootsLaceup
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesColorWhite
@@ -53,3 +53,6 @@
     head: ClothingHeadHatPwig
     pocket1: Flash
     pocket2: ClothingNeckLawyerbadge
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml
@@ -36,3 +36,7 @@
     ears: ClothingHeadsetBrigmedic
     mask: ClothingMaskSterile
     belt: ClothingBeltMedicalFilled
+  storage:
+    back:
+    - BoxSurvivalBrigmedic
+    - Flash