cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1429 from Yoshax/safetyfiring

Browse Source 
Adds a new verb/preference to toggle requirting help intent to fire weapons
This commit is contained in:
Datraen
2016-04-19 11:44:53 -04:00
parent a723202207 ff96d27a85
commit a3df9e6eba
4 changed files with 99 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/client/preference_setup/global/setting_datums.dm
View File

@@ -17,7 +17,7 @@ var/list/_client_preferences_by_type
if(ispath(preference))
return get_client_preference_by_type(preference)
return get_client_preference_by_key(preference)
/proc/get_client_preference_by_key(var/preference)
if(!_client_preferences_by_key)
_client_preferences_by_key = list()
@@ -131,6 +131,12 @@ var/list/_client_preferences_by_type
key = "SHOW_PROGRESS"
enabled_description = "Show"
disabled_description = "Hide"
/datum/client_preference/safefiring
description = "Safe gun firing."
key = "SAFE_FIRING"
enabled_description = "Safe"
disabled_description = "Dangerous"
/********************
* Staff Preferences *
********************/
@@ -139,10 +145,10 @@ var/list/_client_preferences_by_type
/datum/client_preference/mod/may_toggle(var/mob/preference_mob)
return check_rights(R_MOD|R_ADMIN, 0, preference_mob)
/datum/client_preference/debug/may_toggle(var/mob/preference_mob)
return check_rights(R_DEBUG|R_ADMIN, 0, preference_mob)
/datum/client_preference/mod/show_attack_logs
description = "Attack Log Messages"
key = "CHAT_ATTACKLOGS"
@@ -176,4 +182,4 @@ var/list/_client_preferences_by_type
description = "Radio chatter"
key = "CHAT_RADIO"
enabled_description = "Show"
disabled_description = "Hide"
disabled_description = "Hide"