Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into…

… BSH
AdventureTimeSS14 · Jun 9, 2024 · c7c65a3 · c7c65a3
2 parents 4e17bee + 89c0dd8
commit c7c65a3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -246,7 +246,7 @@
     - type: Sprite
       sprite: ADT/Clothing/Back/blueshield_backpack.rsi
 
-#СССП штуки 
+#СССП штуки
 - type: entity
   noSpawn: true
   parent: ADTClothingBackpackOR40L
@@ -309,15 +309,13 @@
         - id: CombatMedipen
           amount: 3
         - id: OmnizineChemistryBottle
-          amount: 2
         - id: EphedrineChemistryBottle
-          amount: 2
         - id: ADTCombatHypo
         - id: DoubleEmergencyOxygenTankFilled
         - id: Zipties
-          amount: 3
+          amount: 2
         - id: ADTMagazineSR3M
-          amount: 4
+          amount: 3
         - id: MagazineBoxLightRifleRubber
 
 - type: entity
@@ -333,13 +331,11 @@
         - id: CombatMedipen
           amount: 2
         - id: OmnizineChemistryBottle
-          amount: 2
         - id: EphedrineChemistryBottle
-          amount: 2
         - id: ADTCombatHypo
         - id: DoubleEmergencyOxygenTankFilled
         - id: Zipties
-          amount: 3
+          amount: 2
         - id: ADTMagazineUSSPLMG
           amount: 2
 
@@ -360,7 +356,7 @@
           amount: 2
         - id: SyndiHypo
         - id: OmnizineChemistryBottle
-          amount: 4     
+          amount: 4
 
 - type: entity
   id: ADTWardrobeKBSFilled

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml
@@ -13,12 +13,13 @@
   - type: Appearance
   - type: Item
     sprite: ADT/Objects/Storage/weaponcasebs.rsi
+    size: Ginormous
   - type: Storage
-    maxItemSize: Huge
+    maxItemSize: Normal
     grid:
     - 0,0,1,0
     - 0,1,0,1
-    - 3,0,5,1
+    - 3,0,6,1
   - type: StorageFill
     contents:
       - id: ADTWeaponSaberRevBlueshield

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -154,6 +154,11 @@
         amount: 2
       - id: OmnizineChemistryBottle
       - id: MedkitCombatFilled
+  - type: Storage
+    maxItemSize: Large
+    defaultStorageOrientation: Vertical
+    grid:
+    - 0,0,7,1
 
 - type: entity
   parent: ClothingBeltWand