diff --git a/code/WorkInProgress/buildmode.dm b/code/WorkInProgress/buildmode.dm
index e59a419c..d228ce4d 100644
--- a/code/WorkInProgress/buildmode.dm
+++ b/code/WorkInProgress/buildmode.dm
@@ -150,13 +150,13 @@
objholder = /obj/structure/closet
alert("That path is not allowed.")
else
- if(ispath(objholder,/mob) && !check_rights(R_DEBUG,0))
+ if(ispath(objholder,/mob) && !check_rights(R_DEBUG|R_DEV,0))
objholder = /obj/structure/closet
if(3)
var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine")
master.buildmode.varholder = input(usr,"Enter variable name:" ,"Name", "name")
- if(master.buildmode.varholder in locked && !check_rights(R_DEBUG,0))
+ if(master.buildmode.varholder in locked && !check_rights(R_DEBUG|R_DEV,0))
return 1
var/thetype = input(usr,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
if(!thetype) return 1
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 013a712c..9af503b5 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -416,7 +416,7 @@ client
//~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records).
else if(href_list["rename"])
- if(!check_rights(R_VAREDIT)) return
+ if(!check_rights(R_VAREDIT|R_DEV)) return
var/mob/M = locate(href_list["rename"])
if(!istype(M))
@@ -431,7 +431,7 @@ client
href_list["datumrefresh"] = href_list["rename"]
else if(href_list["varnameedit"] && href_list["datumedit"])
- if(!check_rights(R_VAREDIT)) return
+ if(!check_rights(R_VAREDIT|R_DEV)) return
var/D = locate(href_list["datumedit"])
if(!istype(D,/datum) && !istype(D,/client))
@@ -441,7 +441,7 @@ client
modify_variables(D, href_list["varnameedit"], 1)
else if(href_list["varnamechange"] && href_list["datumchange"])
- if(!check_rights(R_VAREDIT)) return
+ if(!check_rights(R_VAREDIT|R_DEV)) return
var/D = locate(href_list["datumchange"])
if(!istype(D,/datum) && !istype(D,/client))
@@ -451,7 +451,7 @@ client
modify_variables(D, href_list["varnamechange"], 0)
else if(href_list["varnamemass"] && href_list["datummass"])
- if(!check_rights(R_VAREDIT)) return
+ if(!check_rights(R_VAREDIT|R_DEV)) return
var/atom/A = locate(href_list["datummass"])
if(!istype(A))
@@ -812,10 +812,10 @@ client
usr << "Mob doesn't know that language."
else if(href_list["addverb"])
- if(!check_rights(R_DEBUG)) return
-
+ if(!check_rights(R_DEBUG|R_DEV)) return
+
var/mob/living/H = locate(href_list["addverb"])
-
+
if(!istype(H))
usr << "This can only be done to instances of type /mob/living"
return
@@ -831,7 +831,7 @@ client
possibleverbs += typesof(/mob/living/silicon/proc,/mob/living/silicon/ai/proc,/mob/living/silicon/ai/verb)
possibleverbs -= H.verbs
possibleverbs += "Cancel" // ...And one for the bottom
-
+
var/verb = input("Select a verb!", "Verbs",null) as anything in possibleverbs
if(!H)
usr << "Mob doesn't exist anymore"
@@ -840,9 +840,9 @@ client
return
else
H.verbs += verb
-
+
else if(href_list["remverb"])
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
var/mob/H = locate(href_list["remverb"])
@@ -858,7 +858,7 @@ client
else
H.verbs -= verb
-
+
else if(href_list["regenerateicons"])
if(!check_rights(0)) return
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 13e91914..8612e530 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -112,9 +112,9 @@ var/global/normal_ooc_colour = "#002eb8"
return
if(!holder)
- if(!ooc_allowed)
+/* if(!ooc_allowed)
src << "\red OOC is globally muted"
- return
+ return */
if(!dooc_allowed && (mob.stat == DEAD))
usr << "\red OOC for dead mobs has been turned off."
return
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 0b39fe5d..86fa0f52 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -652,7 +652,7 @@ var/global/floorIsLava = 0
dat += "
"
- if(check_rights(R_DEBUG,0))
+ if(check_rights(R_DEBUG|R_DEV,0))
dat += {"
Security Level Elevated
@@ -840,7 +840,7 @@ var/global/floorIsLava = 0
set desc="Delay the game start/end"
set name="Delay"
- if(!check_rights(R_SERVER)) return
+ if(!check_rights(R_SERVER|R_DEV)) return
if (!ticker || ticker.current_state != GAME_STATE_PREGAME)
ticker.delay_end = !ticker.delay_end
log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 9a7e2a0d..5f8becc5 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2349,7 +2349,7 @@
world << text("A secret has been activated by []!", usr.key)
else if(href_list["secretscoder"])
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
switch(href_list["secretscoder"])
if("spawn_objects")
diff --git a/code/modules/admin/verbs/SDQL.dm b/code/modules/admin/verbs/SDQL.dm
index d8626da4..96bb0df2 100644
--- a/code/modules/admin/verbs/SDQL.dm
+++ b/code/modules/admin/verbs/SDQL.dm
@@ -5,7 +5,7 @@
/client/proc/SDQL_query(query_text as message)
set category = "Admin"
- if(!check_rights(R_DEBUG)) //Shouldn't happen... but just to be safe.
+ if(!check_rights(R_DEBUG|R_DEV)) //Shouldn't happen... but just to be safe.
message_admins("\red ERROR: Non-admin [usr.key] attempted to execute a SDQL query!")
log_admin("Non-admin [usr.key] attempted to execute a SDQL query!")
diff --git a/code/modules/admin/verbs/SDQL_2.dm b/code/modules/admin/verbs/SDQL_2.dm
index 549447da..54611749 100644
--- a/code/modules/admin/verbs/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL_2.dm
@@ -2,7 +2,7 @@
/client/proc/SDQL2_query(query_text as message)
set category = "Admin"
- if(!check_rights(R_DEBUG)) //Shouldn't happen... but just to be safe.
+ if(!check_rights(R_DEBUG|R_DEV)) //Shouldn't happen... but just to be safe.
message_admins("\red ERROR: Non-admin [usr.key] attempted to execute a SDQL query!")
log_admin("Non-admin [usr.key] attempted to execute a SDQL query!")
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 1a9ce0a7..2528dd0b 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -1,7 +1,7 @@
/client/proc/Debug2()
set category = "Debug"
set name = "Debug-Game"
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
if(Debug2)
Debug2 = 0
@@ -29,7 +29,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
set category = "Debug"
set name = "Advanced ProcCall"
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
spawn(0)
var/target = null
@@ -407,7 +407,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
set name = "Assume direct control"
set desc = "Direct intervention"
- if(!check_rights(R_DEBUG|R_ADMIN)) return
+ if(!check_rights(R_DEBUG|R_ADMIN|R_DEV)) return
if(M.ckey)
if(alert("This mob is being controlled by [M.ckey]. Are you sure you wish to assume control of it? [M.ckey] will be made a ghost.",,"Yes","No") != "Yes")
return
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index b2af8359..f490cd3e 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -134,7 +134,7 @@
set name = "Reload Admins"
set category = "Debug"
- if(!check_rights(R_SERVER)) return
+ if(!check_rights(R_SERVER|R_DEV)) return
message_admins("[usr] manually reloaded admins")
load_admins()
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index c1c7d2b3..4df2bd8b 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -125,20 +125,20 @@ var/intercom_range_display_status = 0
feedback_add_details("admin_verb","mIRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
var/list/debug_verbs = list (
- /client/proc/do_not_use_these
- ,/client/proc/camera_view
+ /client/proc/do_not_use_these
+ ,/client/proc/camera_view
,/client/proc/sec_camera_report
- ,/client/proc/intercom_view
- ,/client/proc/air_status
- ,/client/proc/Cell
- ,/client/proc/atmosscan
- ,/client/proc/powerdebug
+ ,/client/proc/intercom_view
+ ,/client/proc/air_status
+ ,/client/proc/Cell
+ ,/client/proc/atmosscan
+ ,/client/proc/powerdebug
,/client/proc/count_objects_on_z_level
,/client/proc/count_objects_all
,/client/proc/cmd_assume_direct_control
,/client/proc/jump_to_dead_group
,/client/proc/startSinglo
- ,/client/proc/ticklag
+ ,/client/proc/ticklag
,/client/proc/cmd_admin_grantfullaccess
,/client/proc/kaboom
,/client/proc/splash
@@ -168,7 +168,7 @@ var/list/debug_verbs = list (
set category = "Debug"
set name = "Debug verbs"
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
verbs += debug_verbs
@@ -178,7 +178,7 @@ var/list/debug_verbs = list (
set category = "Debug"
set name = "Hide Debug verbs"
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
verbs -= debug_verbs
@@ -194,7 +194,7 @@ var/list/debug_verbs = list (
testZAScolors_zones += Z
if(recurse_level > 10)
return
- var/icon/yellow = new('icons/misc/debug_group.dmi', "yellow")
+ var/icon/yellow = new('icons/misc/debug_group.dmi', "yellow")
for(var/turf/T in Z.contents)
images += image(yellow, T, "zasdebug", TURF_LAYER)
@@ -203,13 +203,13 @@ var/list/debug_verbs = list (
if(connected in testZAScolors_zones)
continue
recurse_zone(connected,recurse_level+1)
-
+
/client/proc/testZAScolors()
set category = "ZAS"
set name = "Check ZAS connections"
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
testZAScolors_remove()
var/turf/location = get_turf(usr)
@@ -219,10 +219,10 @@ var/list/debug_verbs = list (
return
var/icon/red = new('icons/misc/debug_group.dmi', "red") //created here so we don't have to make thousands of these.
- var/icon/green = new('icons/misc/debug_group.dmi', "green")
- var/icon/blue = new('icons/misc/debug_group.dmi', "blue")
+ var/icon/green = new('icons/misc/debug_group.dmi', "green")
+ var/icon/blue = new('icons/misc/debug_group.dmi', "blue")
- if(!usedZAScolors)
+ if(!usedZAScolors)
usr << "ZAS Test Colors"
usr << "Green = Zone you are standing in"
usr << "Blue = Connected zone to the zone you are standing in"
@@ -235,7 +235,7 @@ var/list/debug_verbs = list (
images += image(green, T,"zasdebug", TURF_LAYER)
testZAScolors_turfs += T
for(var/zone/Z in location.zone.connected_zones)
- testZAScolors_zones += Z
+ testZAScolors_zones += Z
for(var/turf/T in Z.contents)
images += image(blue, T,"zasdebug",TURF_LAYER)
testZAScolors_turfs += T
diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm
index 8bb4b053..178a9f05 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -5,7 +5,7 @@
var/method = 0 //0 means strict type detection while 1 means this type and all subtypes (IE: /obj/item with this set to 1 will set it to ALL itms)
- if(!check_rights(R_VAREDIT)) return
+ if(!check_rights(R_VAREDIT|R_DEV)) return
if(A && A.type)
if(typesof(A.type))
@@ -24,7 +24,7 @@
/client/proc/massmodify_variables(var/atom/O, var/var_name = "", var/method = 0)
- if(!check_rights(R_VAREDIT)) return
+ if(!check_rights(R_VAREDIT|R_DEV)) return
var/list/locked = list("vars", "key", "ckey", "client")
@@ -52,7 +52,7 @@
var/dir
if(variable == "holder" || (variable in locked))
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
if(isnull(var_value))
usr << "Unable to determine variable type."
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 563bf3a7..3b4743b7 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -126,7 +126,7 @@ var/list/forbidden_varedit_object_types = list(
L += var_value
/client/proc/mod_list(var/list/L)
- if(!check_rights(R_VAREDIT)) return
+ if(!check_rights(R_VAREDIT|R_DEV)) return
if(!istype(L,/list)) src << "Not a List."
@@ -147,7 +147,7 @@ var/list/forbidden_varedit_object_types = list(
var/dir
if(variable in locked)
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
if(isnull(variable))
usr << "Unable to determine variable type."
@@ -266,7 +266,7 @@ 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
+ if(!check_rights(R_VAREDIT|R_DEV)) return
var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "icon", "icon_state", "mutantrace")
@@ -285,7 +285,7 @@ var/list/forbidden_varedit_object_types = list(
return
if(param_var_name == "holder" || (param_var_name in locked))
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
variable = param_var_name
@@ -343,7 +343,7 @@ 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|R_DEV)) return
if(!autodetect_class)
diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm
index b7a02e38..ca4149cf 100644
--- a/code/modules/admin/verbs/ticklag.dm
+++ b/code/modules/admin/verbs/ticklag.dm
@@ -5,7 +5,7 @@
set name = "Set Ticklag"
set desc = "Sets a new tick lag. Recommend you don't mess with this too much! Stable, time-tested ticklag value is 0.9"
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG|R_DEV)) return
var/newtick = input("Sets a new tick lag. Please don't mess with this too much! The stable, time-tested ticklag value is 0.9","Lag of Tick", world.tick_lag) as num|null
//I've used ticks of 2 before to help with serious singulo lags