Fix corvax backpacks and loadouts (#2285)

space-syndicate · Jun 18, 2024 · cc732bc · cc732bc
1 parent 3a547cc
commit cc732bc
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 111 deletions.
diff --git a/...s/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/backpack.ftl b/...s/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/backpack.ftl
diff --git a/.../Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/duffelbag.ftl b/.../Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/duffelbag.ftl
diff --git a/...es/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/satchel.ftl b/...es/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/satchel.ftl
diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml
diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml
diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Back/backpacks.yml
@@ -8,8 +8,7 @@
     sprite: Corvax/Back/Backpacks/military.rsi
   - type: Storage
     grid:
-    - 0,0,6,3 # TODO: Change this
-    maxItemSize: Huge
+    - 0,0,8,4
 
 - type: entity
   parent: ClothingBackpack
@@ -21,7 +20,7 @@
     sprite: Corvax/Back/Backpacks/deathsquad-backpack.rsi
   - type: Storage
     grid:
-    - 0,0,6,3 # TODO: Change this
+    - 0,0,13,7
     maxItemSize: Huge
 
 - type: entity

diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Back/duffel.yml
@@ -8,8 +8,7 @@
     sprite: Corvax/Back/Duffels/military.rsi
   - type: Storage
     grid:
-    - 0,0,6,3 # TODO: Change this
-    maxItemSize: Huge
+    - 0,0,8,4
 
 - type: entity
   parent: ClothingBackpackDuffel

diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Back/satchel.yml
@@ -8,8 +8,7 @@
     sprite: Corvax/Back/Satchels/military.rsi
   - type: Storage
     grid:
-    - 0,0,6,3 # TODO: Change this
-    maxItemSize: Huge
+    - 0,0,8,4
 
 - type: entity
   parent: ClothingBackpackSatchel

diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Wildcards/psychologist.yml
diff --git a/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml b/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml
@@ -4,12 +4,3 @@
   minLimit: 0
   maxLimit: 5
   loadouts: []
-
-- type: loadoutGroup
-  id: PsychologistBackpack
-  name: loadout-group-psychologist-backpack
-  loadouts:
-  - PsychologistBackpack
-  - PsychologistSatchel
-  - PsychologistDuffel
-
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -421,7 +421,7 @@
 - type: roleLoadout
   id: JobPsychologist
   groups:
-  - PsychologistBackpack # Corvax-MRP
+  - MedicalBackpack
   - Glasses
   - Trinkets
   - Inventory # Corvax-Loadouts

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 # Corvax-MRP