cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "/tg/ pref datums (part 1) (#16219)"

Browse Source 
This reverts commit faac97e352.
This commit is contained in:
ShadowLarkens
2024-08-31 12:04:15 -07:00
parent 53c34d8df3
commit 3c09f52c6a
184 changed files with 2197 additions and 4967 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+1 -1
View File
@@ -229,7 +229,7 @@
PreFire(A,user,params) //They're using the new gun system, locate what they're aiming at.
return
if(user && user.a_intent == I_HELP && user.client?.prefs?.read_preference(/datum/preference/toggle/safefiring)) //regardless of what happens, refuse to shoot if help intent is on
if(user && user.a_intent == I_HELP && user.is_preference_enabled(/datum/client_preference/safefiring)) //regardless of what happens, refuse to shoot if help intent is on
to_chat(user, "<span class='warning'>You refrain from firing your [src] as your intent is set to help.</span>")
return
code/modules/projectiles/targeting/targeting_triggers.dm
+1 -1
View File
@@ -20,7 +20,7 @@
if(!owner.checkClickCooldown())
return
owner.setClickCooldown(5) // Spam prevention, essentially.
if(owner.a_intent == I_HELP && owner.client?.prefs?.read_preference(/datum/preference/toggle/safefiring))
if(owner.a_intent == I_HELP && owner.is_preference_enabled(/datum/client_preference/safefiring))
to_chat(owner, "<span class='warning'>You refrain from firing \the [aiming_with] as your intent is set to help.</span>")
return
owner.visible_message("<span class='danger'>\The [owner] pulls the trigger reflexively!</span>")