cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dumpdavidson/-tg-station into monkeyize

Browse Source 
Conflicts:
	code/game/dna.dm
	code/game/gamemodes/changeling/changeling_powers.dm
This commit is contained in:
dumpdavidson
2013-05-24 15:40:07 +02:00
parent 25b96f1fc2 7d0c5f1054
commit 6cd1b87782
131 changed files with 9613 additions and 9356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/modifyvariables.dm
+19 -3
View File
@@ -130,7 +130,9 @@ var/list/forbidden_varedit_object_types = list(
if(!istype(L,/list)) src << "Not a List."
var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine", "poo", "icon", "icon_state")
var/list/locked = list("vars", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine", "poo")
var/list/ckey_edit = list("key", "ckey")
var/list/icon_edit = list("icon", "icon_state", "overlays", "underlays")
var/list/names = sortList(L)
var/variable = input("Which var?","Var") as null|anything in names + "(ADD VAR)"
@@ -148,6 +150,10 @@ var/list/forbidden_varedit_object_types = list(
if(variable in locked)
if(!check_rights(R_DEBUG)) return
if(variable in ckey_edit)
if(!check_rights(R_SPAWN|R_DEBUG)) return
if(variable in icon_edit)
if(!check_rights(R_FUN|R_DEBUG)) return
if(isnull(variable))
usr << "Unable to determine variable type."
@@ -268,7 +274,9 @@ var/list/forbidden_varedit_object_types = list(
/client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
if(!check_rights(R_VAREDIT)) return
var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "icon", "icon_state", "mutantrace")
var/list/locked = list("vars", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "mutantrace")
var/list/ckey_edit = list("key", "ckey")
var/list/icon_edit = list("icon", "icon_state", "overlays", "underlays")
for(var/p in forbidden_varedit_object_types)
if( istype(O,p) )
@@ -290,6 +298,10 @@ var/list/forbidden_varedit_object_types = list(
if(param_var_name == "holder" || (param_var_name in locked))
if(!check_rights(R_DEBUG)) return
if(param_var_name in ckey_edit)
if(!check_rights(R_SPAWN|R_DEBUG)) return
if(param_var_name in icon_edit)
if(!check_rights(R_FUN|R_DEBUG)) return
variable = param_var_name
@@ -347,7 +359,11 @@ var/list/forbidden_varedit_object_types = list(
var_value = O.vars[variable]
if(variable == "holder" || (variable in locked))
if(!check_rights(R_DEBUG)) return
if(!check_rights(R_DEBUG)) return
if(variable in ckey_edit)
if(!check_rights(R_SPAWN|R_DEBUG)) return
if(variable in icon_edit)
if(!check_rights(R_FUN|R_DEBUG)) return
if(!autodetect_class)