From f23cf2f9704d4f9f3559065e5b3eb78845925db8 Mon Sep 17 00:00:00 2001 From: GriffinMan Date: Wed, 25 Sep 2024 23:27:20 -0400 Subject: [PATCH 1/5] Makes Conpouches able to hold filled sandbags --- code/game/objects/items/stacks/sandbags.dm | 4 ++-- code/game/objects/items/storage/pouch.dm | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm index 84769825a4..769f5a604b 100644 --- a/code/game/objects/items/stacks/sandbags.dm +++ b/code/game/objects/items/stacks/sandbags.dm @@ -60,7 +60,7 @@ icon = 'icons/obj/items/marine-items.dmi' icon_state = "sandbag_pile" item_state = "sandbag_pile" - w_class = SIZE_LARGE + w_class = SIZE_MEDIUM force = 9 throwforce = 15 throw_speed = SPEED_VERY_FAST @@ -70,7 +70,7 @@ stack_id = "sandbags" /obj/item/stack/sandbags/large_stack - amount = 25 + amount = 35 /obj/item/stack/sandbags/small_stack amount = 5 diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index e2398fcbe0..91764ba638 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -1186,7 +1186,9 @@ /obj/item/stack/cable_coil, /obj/item/stack/tile, /obj/item/tool/shovel/etool, + /obj/item/stack/sandbags /obj/item/stack/sandbags_empty, + /obj/item/stack/sandbags/large_stack /obj/item/device/lightreplacer, /obj/item/weapon/gun/smg/nailgun/compact, ) From 376931f4f3766dcecb93ac212d50826f6944753f Mon Sep 17 00:00:00 2001 From: GriffinMan Date: Wed, 25 Sep 2024 23:40:54 -0400 Subject: [PATCH 2/5] Fixes the numbers since I forgot tehepero --- code/game/objects/items/stacks/sandbags.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm index 769f5a604b..9bb0adb4b0 100644 --- a/code/game/objects/items/stacks/sandbags.dm +++ b/code/game/objects/items/stacks/sandbags.dm @@ -65,12 +65,12 @@ throwforce = 15 throw_speed = SPEED_VERY_FAST throw_range = 20 - max_amount = 25 + max_amount = 35 attack_verb = list("hit", "bludgeoned", "whacked") stack_id = "sandbags" /obj/item/stack/sandbags/large_stack - amount = 35 + amount = 50 /obj/item/stack/sandbags/small_stack amount = 5 From 07eb29d07526bd83267dd4deead7b79100dd4904 Mon Sep 17 00:00:00 2001 From: GriffinMan Date: Wed, 25 Sep 2024 23:56:27 -0400 Subject: [PATCH 3/5] Forgot a Comma --- code/game/objects/items/storage/pouch.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 91764ba638..6fdf9d7ce7 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -1186,7 +1186,7 @@ /obj/item/stack/cable_coil, /obj/item/stack/tile, /obj/item/tool/shovel/etool, - /obj/item/stack/sandbags + /obj/item/stack/sandbags, /obj/item/stack/sandbags_empty, /obj/item/stack/sandbags/large_stack /obj/item/device/lightreplacer, From fc501473c5a750ea347814d3c052cf04087c3e59 Mon Sep 17 00:00:00 2001 From: GriffinMan Date: Wed, 25 Sep 2024 23:59:20 -0400 Subject: [PATCH 4/5] Forgot another comma tehepero --- code/game/objects/items/storage/pouch.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 6fdf9d7ce7..b06797b2c4 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -1188,7 +1188,7 @@ /obj/item/tool/shovel/etool, /obj/item/stack/sandbags, /obj/item/stack/sandbags_empty, - /obj/item/stack/sandbags/large_stack + /obj/item/stack/sandbags/large_stack, /obj/item/device/lightreplacer, /obj/item/weapon/gun/smg/nailgun/compact, ) From 52e13a8e70b13e64d9c62a7cc0f5f81c9c2cfcc8 Mon Sep 17 00:00:00 2001 From: GriffinMan Date: Thu, 26 Sep 2024 01:00:41 -0400 Subject: [PATCH 5/5] UMC Suggestions: Max Stack to 50, remove large_stack from pouch changes. --- code/game/objects/items/stacks/sandbags.dm | 2 +- code/game/objects/items/storage/pouch.dm | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm index 9bb0adb4b0..ef8d5ed101 100644 --- a/code/game/objects/items/stacks/sandbags.dm +++ b/code/game/objects/items/stacks/sandbags.dm @@ -65,7 +65,7 @@ throwforce = 15 throw_speed = SPEED_VERY_FAST throw_range = 20 - max_amount = 35 + max_amount = 50 attack_verb = list("hit", "bludgeoned", "whacked") stack_id = "sandbags" diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index b06797b2c4..c8b88e82d3 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -1188,7 +1188,6 @@ /obj/item/tool/shovel/etool, /obj/item/stack/sandbags, /obj/item/stack/sandbags_empty, - /obj/item/stack/sandbags/large_stack, /obj/item/device/lightreplacer, /obj/item/weapon/gun/smg/nailgun/compact, )