From 8f163ecd7294a44061a4b4288c46de7588a25657 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Tue, 17 Dec 2024 13:00:04 +0100 Subject: [PATCH 1/4] upgraded engineering belts --- code/game/objects/items/storage/belt.dm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index b2ba7dbcbe..9c62143fe9 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -64,9 +64,23 @@ /obj/item/extinguisher/mini, /obj/item/radio, /obj/item/clothing/gloves, - /obj/item/holosign_creator, + /obj/item/holosign_creator /obj/item/forcefield_projector, - /obj/item/assembly/signaler + /obj/item/assembly/signaler, + // original ones above, new ones below + /obj/item/lightreplacer, + /obj/item/construction/rcd, + /obj/item/construction/rld, + /obj/item/construction/plumbing, + /obj/item/pipe_dispenser, + /obj/item/inducer, + /obj/item/grenade/chem_grenade/smart_metal_foam, + /obj/item/grenade/chem_grenade/metalfoam, + /obj/item/carpentry/handsaw, + /obj/item/carpentry/hammer, + /obj/item/carpentry/glue, + /obj/item/carpentry/borer, + /obj/item/carpentry/sandpaper )) STR.can_hold = can_hold From ad9e23e51e25847192867bdd991265822b978b07 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Tue, 17 Dec 2024 13:28:25 +0100 Subject: [PATCH 2/4] upgraded belts --- code/game/objects/items/storage/belt.dm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 9c62143fe9..7db2d75ada 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -49,6 +49,9 @@ /obj/item/storage/belt/utility/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 11 + STR.max_w_class = WEIGHT_CLASS_NORMAL + STR.max_combined_w_class = 24 var/static/list/can_hold = typecacheof(list( /obj/item/crowbar, /obj/item/screwdriver, @@ -148,6 +151,9 @@ . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_BULKY + STR.max_items = 11 + STR.max_w_class = WEIGHT_CLASS_NORMAL + STR.max_combined_w_class = 24 STR.can_hold = typecacheof(list( /obj/item/healthanalyzer, /obj/item/dnainjector, @@ -470,8 +476,8 @@ /obj/item/storage/belt/durathread/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) - STR.max_items = 14 - STR.max_combined_w_class = 32 + STR.max_items = 20 + STR.max_combined_w_class = 36 STR.max_w_class = WEIGHT_CLASS_NORMAL STR.can_hold = typecacheof(list( /obj/item/crowbar, @@ -492,13 +498,19 @@ /obj/item/forcefield_projector, /obj/item/assembly/signaler, /obj/item/lightreplacer, + /obj/item/pipe_dispenser, + /obj/item/inducer, + /obj/item/grenade/chem_grenade/smart_metal_foam, + /obj/item/grenade/chem_grenade/metalfoam, + /obj/item/carpentry/handsaw, + /obj/item/carpentry/hammer, + /obj/item/carpentry/glue, + /obj/item/carpentry/borer, + /obj/item/carpentry/sandpaper /obj/item/rcd_ammo, /obj/item/construction, - /obj/item/pipe_dispenser, /obj/item/stack/rods, /obj/item/stack/tile/plasteel, - /obj/item/grenade/chem_grenade/metalfoam, - /obj/item/grenade/chem_grenade/smart_metal_foam )) /obj/item/storage/belt/grenade From 86828f19fc9ee6170cba4560185ab2416c788d67 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Tue, 17 Dec 2024 23:21:21 +0100 Subject: [PATCH 3/4] commented out shit that doesn't work, made code a bit better, fixed lack of commas, changed an description and went to sleep --- code/game/objects/items/storage/belt.dm | 33 ++++++++++++------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 7db2d75ada..00023172c7 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -6,6 +6,7 @@ item_state = "utility" lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi' + w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined") max_integrity = 300 @@ -52,7 +53,7 @@ STR.max_items = 11 STR.max_w_class = WEIGHT_CLASS_NORMAL STR.max_combined_w_class = 24 - var/static/list/can_hold = typecacheof(list( + STR.can_hold = typecacheof(list( /obj/item/crowbar, /obj/item/screwdriver, /obj/item/weldingtool, @@ -67,25 +68,23 @@ /obj/item/extinguisher/mini, /obj/item/radio, /obj/item/clothing/gloves, - /obj/item/holosign_creator + /obj/item/holosign_creator, /obj/item/forcefield_projector, /obj/item/assembly/signaler, // original ones above, new ones below /obj/item/lightreplacer, - /obj/item/construction/rcd, - /obj/item/construction/rld, - /obj/item/construction/plumbing, + /obj/item/construction /obj/item/pipe_dispenser, /obj/item/inducer, /obj/item/grenade/chem_grenade/smart_metal_foam, /obj/item/grenade/chem_grenade/metalfoam, - /obj/item/carpentry/handsaw, - /obj/item/carpentry/hammer, - /obj/item/carpentry/glue, - /obj/item/carpentry/borer, - /obj/item/carpentry/sandpaper + // these seem to not exist + // /obj/item/carpentry/handsaw, + // /obj/item/carpentry/hammer, + // /obj/item/carpentry/glue, + // /obj/item/carpentry/borer, + // /obj/item/carpentry/sandpaper )) - STR.can_hold = can_hold /obj/item/storage/belt/utility/chief name = "\improper Chief Engineer's toolbelt" //"the Chief Engineer's toolbelt", because "Chief Engineer's toolbelt" is not a proper noun @@ -467,7 +466,7 @@ /obj/item/storage/belt/durathread name = "durathread toolbelt" - desc = "A toolbelt made out of durathread, it seems robust enough to hold bigger tools like RCDs or RPDs, with enough pouches to hold more gear than a normal belt." + desc = "A toolbelt made out of durathread, it seems robust enough to hold an assortment of different tools, with enough pouches to hold more gear than a normal belt." icon_state = "webbing-durathread" item_state = "webbing-durathread" resistance_flags = FIRE_PROOF @@ -502,11 +501,11 @@ /obj/item/inducer, /obj/item/grenade/chem_grenade/smart_metal_foam, /obj/item/grenade/chem_grenade/metalfoam, - /obj/item/carpentry/handsaw, - /obj/item/carpentry/hammer, - /obj/item/carpentry/glue, - /obj/item/carpentry/borer, - /obj/item/carpentry/sandpaper + // /obj/item/carpentry/handsaw, + // /obj/item/carpentry/hammer, + // /obj/item/carpentry/glue, + // /obj/item/carpentry/borer, + // /obj/item/carpentry/sandpaper, /obj/item/rcd_ammo, /obj/item/construction, /obj/item/stack/rods, From 042ef547e207945be817d6714b9cad1d626424e8 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Wed, 18 Dec 2024 10:01:50 +0100 Subject: [PATCH 4/4] fixed shit, medical stuff for dura (big cheeks) belts --- code/game/objects/items/storage/belt.dm | 49 ++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 00023172c7..a8342b87bd 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -73,7 +73,7 @@ /obj/item/assembly/signaler, // original ones above, new ones below /obj/item/lightreplacer, - /obj/item/construction + /obj/item/construction, /obj/item/pipe_dispenser, /obj/item/inducer, /obj/item/grenade/chem_grenade/smart_metal_foam, @@ -510,6 +510,53 @@ /obj/item/construction, /obj/item/stack/rods, /obj/item/stack/tile/plasteel, + /obj/item/healthanalyzer, + /obj/item/dnainjector, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/pill, + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/medspray, + /obj/item/lighter, + /obj/item/storage/fancy/cigarettes, + /obj/item/storage/pill_bottle, + /obj/item/stack/medical, + /obj/item/flashlight/pen, + /obj/item/extinguisher/mini, + /obj/item/reagent_containers/hypospray, + /obj/item/hypospray/mkii, + /obj/item/sensor_device, + /obj/item/radio, + /obj/item/clothing/gloves, + /obj/item/lazarus_injector, + /obj/item/bikehorn/rubberducky, + /obj/item/clothing/mask/surgical, + /obj/item/clothing/mask/breath, + /obj/item/clothing/mask/breath/medical, + /obj/item/surgical_drapes, //for true paramedics + /obj/item/scalpel, + /obj/item/circular_saw, + /obj/item/bonesetter, + /obj/item/surgicaldrill, + /obj/item/retractor, + /obj/item/cautery, + /obj/item/hemostat, + /obj/item/clothing/neck/stethoscope, + /obj/item/stamp, + /obj/item/clothing/glasses, + /obj/item/clothing/mask/muzzle, + /obj/item/storage/bag/chemistry, + /obj/item/storage/bag/bio, + /obj/item/reagent_containers/blood, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/gun/syringe/syndicate, + /obj/item/implantcase, + /obj/item/implant, + /obj/item/implanter, + /obj/item/pinpointer/crew, + /obj/item/reagent_containers/chem_pack, + /obj/item/stack/sticky_tape //surgical tape )) /obj/item/storage/belt/grenade