From a897aea5becb9f8086c88787f840f25f9f4a8c58 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sat, 21 Aug 2021 23:49:38 +0100 Subject: [PATCH 1/3] There --- code/__DEFINES/construction.dm | 2 +- code/game/objects/items/storage/belt.dm | 1 + code/modules/power/cable.dm | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 4293b7672335..e329c4b9b693 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -72,7 +72,7 @@ //The maximum size of a stack object. #define MAX_STACK_SIZE 50 //maximum amount of cable in a coil -#define MAXCOIL 30 +#define MAXCOIL 40 //tablecrafting defines #define CAT_NONE "" diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 269b5f6101fa..ecb23516c0d7 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -38,6 +38,7 @@ /obj/item/storage/belt/utility/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 10 STR.max_w_class = WEIGHT_CLASS_NORMAL STR.max_combined_w_class = 21 STR.set_holdable(list( diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 43b7e065ec4f..4f1e4a586859 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -481,7 +481,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai item_color = "red" desc = "A coil of insulated power cable." throwforce = 0 - w_class = WEIGHT_CLASS_SMALL + w_class = WEIGHT_CLASS_TINY throw_speed = 3 throw_range = 5 materials = list(/datum/material/iron=10, /datum/material/glass=5) @@ -489,7 +489,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai slot_flags = ITEM_SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined", "flogged") singular_name = "cable piece" - full_w_class = WEIGHT_CLASS_SMALL + full_w_class = WEIGHT_CLASS_NORMAL grind_results = list(/datum/reagent/copper = 2) //2 copper per cable in the coil usesound = 'sound/items/deconstruct.ogg' From 5afe04ccf28336755434ea7cbba0dceafc6bd95b Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sat, 21 Aug 2021 23:56:27 +0100 Subject: [PATCH 2/3] Fucking Medical --- code/game/objects/items/storage/belt.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index ecb23516c0d7..778163acfb7c 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -137,6 +137,7 @@ . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_BULKY + STR.max_items = 12 STR.max_combined_w_class = 21 STR.set_holdable(list( /obj/item/healthanalyzer, From 5a6397d79dbf806632e405f75b87131ad0479bfb Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Thu, 26 Aug 2021 00:24:37 +0100 Subject: [PATCH 3/3] Apply suggestions from code review --- code/modules/power/cable.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 4f1e4a586859..43b7e065ec4f 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -481,7 +481,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai item_color = "red" desc = "A coil of insulated power cable." throwforce = 0 - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 5 materials = list(/datum/material/iron=10, /datum/material/glass=5) @@ -489,7 +489,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai slot_flags = ITEM_SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined", "flogged") singular_name = "cable piece" - full_w_class = WEIGHT_CLASS_NORMAL + full_w_class = WEIGHT_CLASS_SMALL grind_results = list(/datum/reagent/copper = 2) //2 copper per cable in the coil usesound = 'sound/items/deconstruct.ogg'