[MIRROR] guns ignoring safety on harm intent is a preference

Co-authored-by: That0nePerson <[email protected]>
SierraBay · Sep 19, 2023 · 77f1203 · 77f1203
1 parent 7f34b14
commit 77f1203
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/code/modules/client/preference_setup/global/preferences.dm b/code/modules/client/preference_setup/global/preferences.dm
@@ -217,6 +217,10 @@ var/global/list/_client_preferences_by_type
 	description = "Draw gun based on intent"
 	key = "HOLSTER_ON_INTENT"
 
+/datum/client_preference/safety_toggle_on_intent
+	description = "Ignore safety on harm intent"
+	key = "SAFETY_ON_INTENT"
+
 /datum/client_preference/show_credits
 	description = "Show End Titles"
 	key = "SHOW_CREDITS"

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -234,15 +234,11 @@
 		return
 
 	if(safety())
-		// [SIERRA-EDIT] - Mirror revert
-		// handle_click_safety(user) // SIERRA-EDIT - ORIGINAL
-		if(user.a_intent == I_HURT && user.skill_check(SKILL_WEAPONS, SKILL_EXPERIENCED))
+		if(user.a_intent == I_HURT && user.skill_check(SKILL_WEAPONS, SKILL_EXPERIENCED) && user.client?.get_preference_value(/datum/client_preference/safety_toggle_on_intent) == GLOB.PREF_YES)
 			toggle_safety(user)
 		else
 			handle_click_safety(user)
 			return
-		// [/SIERRA-EDIT]
-		return
 
 	if(world.time < next_fire_time)
 		if (world.time % 3) //to prevent spam