gun freedom

code/__DEFINES/traits.dm

@@ -203,6 +203,7 @@
 
 // GUN TRAITS
 #define TRAIT_GUN_SILENCED "t_gun_silenced"
+#define TRAIT_GUN_LIGHT_DEACTIVATED "t_gun_light_deactivated"
 
 // Miscellaneous item traits.
 // Do NOT bloat this category, if needed make a new category (like shoe traits, xeno item traits...)

code/modules/projectiles/gun.dm

@@ -506,9 +506,13 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w
 
 	if(slot in list(WEAR_L_HAND, WEAR_R_HAND))
 		set_gun_user(user)
+		if(HAS_TRAIT_FROM_ONLY(src, TRAIT_GUN_LIGHT_DEACTIVATED, user))
+			force_light(on = TRUE)
+			REMOVE_TRAIT(src, TRAIT_GUN_LIGHT_DEACTIVATED, user)
 	else
 		set_gun_user(null)
-		force_light_off()
+		force_light(on = FALSE)
+		ADD_TRAIT(src, TRAIT_GUN_LIGHT_DEACTIVATED, user)
 
 	return ..()
 

code/modules/projectiles/gun_helpers.dm

@@ -938,14 +938,14 @@ DEFINES in setup.dm, referenced here.
 		return null
 	return params2turf(modifiers["screen-loc"], get_turf(user), user.client)
 
-/// If this gun has a relevant flashlight attachable attached, deactivate it
-/obj/item/weapon/gun/proc/force_light_off()
+/// If this gun has a relevant flashlight attachable attached, (de)activate it
+/obj/item/weapon/gun/proc/force_light(on)
 	var/obj/item/attachable/flashlight/torch
 	for(var/slot in attachments)
 		torch = attachments[slot]
 		if(istype(torch))
 			break
 	if(!torch)
 		return FALSE
-	torch.turn_light(toggle_on = FALSE, forced = TRUE)
+	torch.turn_light(toggle_on = on, forced = TRUE)
 	return TRUE