From 1e02b0756a3d7d42761aac3aa12939e466896305 Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Sun, 1 May 2022 12:05:51 +0200 Subject: [PATCH 1/2] Adds belt slot flag to proto-kinetic machete and subtypes Must be medium sized or smaller to prevent wearing greaves/gauntlets on your belt. --- code/modules/mining/kinetic_crusher.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm index 7effaf60d98..bf1ab82d722 100644 --- a/code/modules/mining/kinetic_crusher.dm +++ b/code/modules/mining/kinetic_crusher.dm @@ -230,7 +230,7 @@ desc = "A modified design of a proto-kinetic crusher, it is still little more of a combination of various mining tools cobbled together \ and kit-bashed into a high-tech cleaver on a stick - with a handguard and a goliath hide grip. While it is still of little use to any \ but the most skilled and/or suicidal miners against local fauna, it's an elegant weapon for a more civilized hunter." - + look gary there i am - hatterhat */ @@ -258,6 +258,11 @@ update_item_state = FALSE +/obj/item/weapon/kinetic_crusher/machete/Initialize() //Making sure you can't store gauntlets/greaves on your belts. + if(w_class < ITEMSIZE_HUGE) + slot_flags = SLOT_BELT + + /obj/item/weapon/kinetic_crusher/machete/gauntlets // did someone say single target damage name = "\improper proto-kinetic gear" @@ -381,6 +386,7 @@ thrown_bonus = 50 // 135 but you drop your knife because you threw it + //destablizing force /obj/item/projectile/destabilizer name = "destabilizing force" From e96f1adfb15a189d03d9a93bc0e9b2d5af7e62c0 Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Mon, 2 May 2022 02:10:49 +0200 Subject: [PATCH 2/2] Adjusts implementation per Novacat's request. --- code/modules/mining/kinetic_crusher.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm index bf1ab82d722..043dfe81885 100644 --- a/code/modules/mining/kinetic_crusher.dm +++ b/code/modules/mining/kinetic_crusher.dm @@ -256,11 +256,9 @@ backstab_bonus = 40 // 100 thrown_bonus = 20 // 120 update_item_state = FALSE + slot_flags = SLOT_BELT - -/obj/item/weapon/kinetic_crusher/machete/Initialize() //Making sure you can't store gauntlets/greaves on your belts. - if(w_class < ITEMSIZE_HUGE) - slot_flags = SLOT_BELT + /obj/item/weapon/kinetic_crusher/machete/gauntlets @@ -280,6 +278,7 @@ detonation_damage = 37 // 75 backstab_bonus = 55 // 130 var/obj/item/offhand/crushergauntlets/offhand + slot_flags = null /obj/item/weapon/kinetic_crusher/machete/gauntlets/equipped() . = ..()