Fixes guns slowing down while worn on a belt (#11976)

* no worn slowdown * Update code/modules/mob/living/carbon/human/inventory.dm
BeeStation · Dec 9, 2024 · ca1c8fc · ca1c8fc
1 parent e41354b
commit ca1c8fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm
@@ -33,6 +33,7 @@
 #define ISWEAPON				(1<<15) //! If this item should hit living mobs when used on harm intent
 #define EXAMINE_SKIP			(1<<16) //! Examine will not read out this item
 #define ISCARVABLE			    (1<<17) //! Examine will not read out this item
+#define NO_WORN_SLOWDOWN		(1<<18)	//! Doesn't slow you down while worn, which is only useful in combination with SLOWS_WHILE_IN_HAND
 
 // Flags for the clothing_flags var on /obj/item/clothing
 

diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
@@ -156,6 +156,8 @@
 	. = ..()
 	for(var/sloties in get_all_slots() - list(l_store, r_store, s_store))
 		var/obj/item/thing = sloties
+		if (thing?.item_flags & NO_WORN_SLOWDOWN)
+			continue
 		. += thing?.slowdown
 
 /mob/living/carbon/human/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, was_thrown = FALSE, silent = FALSE)

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -11,7 +11,7 @@
 	worn_icon_state = "gun"
 	flags_1 =  CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
-	item_flags = SLOWS_WHILE_IN_HAND
+	item_flags = SLOWS_WHILE_IN_HAND | NO_WORN_SLOWDOWN
 	custom_materials = list(/datum/material/iron=2000)
 	w_class = WEIGHT_CLASS_LARGE
 	throwforce = 5