From c4064efdace4231ff5944f3062e826cbc71ac983 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Sat, 8 Jun 2024 00:40:30 +0300 Subject: [PATCH 1/6] fix --- .../Fills/Backpacks/StarterGear/backpack.yml | 14 +++++--------- Resources/Prototypes/Catalog/Fills/Items/belt.yml | 5 +++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 7374a0e6994..526d9a179b7 100644 --- 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/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index db8e2150dac..f2c162240c6 100644 --- 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 From 314fddbe774eab83e9887a44c261793a00e5f519 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Sat, 8 Jun 2024 01:07:28 +0300 Subject: [PATCH 2/6] fix? --- .../Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml index cf2129cc7cc..055636ab9b0 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml @@ -14,7 +14,7 @@ - type: Item sprite: ADT/Objects/Storage/weaponcasebs.rsi - type: Storage - maxItemSize: Huge + maxItemSize: Normal grid: - 0,0,1,0 - 0,1,0,1 From 00798fe1d9a037883b87817663f9eccda9e7cc0a Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Sat, 8 Jun 2024 09:53:01 +0300 Subject: [PATCH 3/6] uhhh? --- .../Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml index 055636ab9b0..7f43f28b372 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml @@ -13,6 +13,7 @@ - type: Appearance - type: Item sprite: ADT/Objects/Storage/weaponcasebs.rsi + size: Ginormous - type: Storage maxItemSize: Normal grid: From 2ce82830a9af391bad981acd6c71fa0626f653aa Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Sun, 9 Jun 2024 13:44:21 +0300 Subject: [PATCH 4/6] uh? --- .../ADT/Entities/Objects/Specific/bsweaponcase.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml index 7f43f28b372..6523e94fac0 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml @@ -20,9 +20,3 @@ - 0,0,1,0 - 0,1,0,1 - 3,0,5,1 - - type: StorageFill - contents: - - id: ADTWeaponSaberRevBlueshield - - id: ADTPowerCellLasgunRevolver - - id: ADTPowerCellLasgunRevolver - - id: ADTPowerCellLasgunRevolver From b1c6be8deabcbaa30ed708a303058cb9c57df594 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Sun, 9 Jun 2024 13:58:19 +0300 Subject: [PATCH 5/6] what if.... --- .../ADT/Entities/Objects/Specific/bsweaponcase.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml index 6523e94fac0..d08870cf799 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml @@ -20,3 +20,8 @@ - 0,0,1,0 - 0,1,0,1 - 3,0,5,1 + - type: StorageFill + contents: + - id: ADTWeaponSaberRevBlueshield + - id: ADTPowerCellLasgunRevolver + - id: ADTPowerCellLasgunRevolver From 89c0dd8c4729161b30cdd4a3914f5098e923e480 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Sun, 9 Jun 2024 14:17:43 +0300 Subject: [PATCH 6/6] hmmm.... --- .../Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml index d08870cf799..04fa68aae2e 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml @@ -19,9 +19,10 @@ grid: - 0,0,1,0 - 0,1,0,1 - - 3,0,5,1 + - 3,0,6,1 - type: StorageFill contents: - id: ADTWeaponSaberRevBlueshield - id: ADTPowerCellLasgunRevolver - id: ADTPowerCellLasgunRevolver + - id: ADTPowerCellLasgunRevolver