diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm
index 7ecf7283..ec663996 100644
--- a/code/__HELPERS/logging.dm
+++ b/code/__HELPERS/logging.dm
@@ -82,9 +82,19 @@
diary << "\[[time_stamp()]]MISC: [text][log_end]"
//SoundScopes extra stuffs
-/proc/msg_scopes(var/msg)
- msg = "Scopes Log: [msg]"
+//I'm sending debug messages through here for when an admin log is made at the same time.
+//What's the point in making 2 recorded logs for one thing.
+/proc/msg_scopes(var/msg, tell_devs = 0)
+ if(tell_devs)
+ msg = "DEBUG: [msg]"
+ else
+ msg = "[time_stamp()]Scopes Log[tell_devs]: [msg]"
+
for(var/client/C in admins)
- if((R_DEV & C.holder.rights) && (R_MOD & C.holder.rights))
- if(C.prefs.toggles & CHAT_SCOPES_DEBUG)
- C << msg
\ No newline at end of file
+ if(R_DEV & C.holder.rights)
+ if(tell_devs)
+ if((C.prefs.toggles & CHAT_DEBUGLOGS) && !(R_MOD & C.holder.rights))
+ C << msg
+ if(R_MOD & C.holder.rights)
+ if(C.prefs.toggles & CHAT_SCOPES_DEBUG)
+ C << msg
\ No newline at end of file
diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 95798dd7..4b2afd6b 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -144,6 +144,7 @@ datum/controller/game_controller/proc/process()
world << "RUNTIMES IN ATMOS TICKER. Killing air simulation!"
world.log << "### ZAS SHUTDOWN"
message_admins("ZASALERT: unable to run [air_master.tick_progress], shutting down!")
+ msg_scopes("ZASALERT: unable to run [air_master.tick_progress], shutting down!")
log_admin("ZASALERT: unable run zone/process() -- [air_master.tick_progress]")
air_processing_killed = 1
air_master.failed_ticks = 0
diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index cf22c0bc..a1d7ea25 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -25,6 +25,7 @@
supply_shuttle.process()
feedback_add_details("admin_verb","RSupply")
message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.")
+ msg_scopes("Admin [key_name_admin(usr)] has restarted the [controller] controller.")
return
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index e0398da7..02f09088 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -430,6 +430,7 @@ client
if( !new_name || !M ) return
message_admins("Admin [key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].")
+ msg_scopes("[key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].", 1) //The 1 makes dev's see it too
M.fully_replace_character_name(M.real_name,new_name)
href_list["datumrefresh"] = href_list["rename"]
@@ -495,7 +496,7 @@ client
src.give_disease(M)
href_list["datumrefresh"] = href_list["give_spell"]
-
+
else if(href_list["give_disease2"])
if(!check_rights(R_ADMIN|R_FUN)) return
@@ -614,6 +615,7 @@ client
return
log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
message_admins("\blue [key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
+ msg_scopes("\blue [key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ", 1)
if("Type and subtypes")
var/i = 0
for(var/obj/Obj in world)
@@ -625,6 +627,7 @@ client
return
log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
message_admins("\blue [key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
+ msg_scopes("\blue [key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ", 1)
else if(href_list["explode"])
if(!check_rights(R_DEBUG|R_FUN)) return
@@ -829,7 +832,7 @@ client
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
@@ -845,7 +848,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"
@@ -854,7 +857,7 @@ client
return
else
H.verbs += verb
-
+
else if(href_list["remverb"])
if(!check_rights(R_DEBUG|R_DEV)) return
@@ -872,7 +875,7 @@ client
else
H.verbs -= verb
-
+
else if(href_list["fix_nano"])
if(!check_rights(R_DEBUG)) return
@@ -881,11 +884,11 @@ client
if(!istype(H) || !H.client)
usr << "This can only be done on mobs with clients"
return
-
-
+
+
nanomanager.send_resources(H.client)
-
+
usr << "Resource files sent"
H << "Your NanoUI Resource files have been refreshed"
@@ -930,6 +933,7 @@ client
if(amount != 0)
log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
message_admins("\blue [key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
+ msg_scopes("\blue [key_name(usr)] dealt [amount] amount of [Text] damage to [L] ", 1)
href_list["datumrefresh"] = href_list["mobToDamage"]
if(href_list["datumrefresh"])
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 1dce2e15..64c2a887 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -7,10 +7,12 @@
Debug2 = 0
message_admins("[key_name(src)] toggled debugging off.")
log_admin("[key_name(src)] toggled debugging off.")
+ log_debug("[key_name(src)] toggled debugging off.")
else
Debug2 = 1
message_admins("[key_name(src)] toggled debugging on.")
log_admin("[key_name(src)] toggled debugging on.")
+ log_debug("[key_name(src)] toggled debugging off.")
feedback_add_details("admin_verb","DG2") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -434,6 +436,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
GLOBAL_RADIO_TYPE = !GLOBAL_RADIO_TYPE // toggle
log_admin("[key_name(src)] has turned the experimental radio system [GLOBAL_RADIO_TYPE ? "on" : "off"].")
message_admins("[key_name_admin(src)] has turned the experimental radio system [GLOBAL_RADIO_TYPE ? "on" : "off"].", 0)
+ msg_scopes("[key_name_admin(src)] has turned the experimental radio system [GLOBAL_RADIO_TYPE ? "on" : "off"].", 0)
feedback_add_details("admin_verb","SRM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_areatest()
diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm
index 178a9f05..5f07d596 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -372,4 +372,5 @@
A.vars[variable] = O.vars[variable]
log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]")
- message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1)
\ No newline at end of file
+ message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1)
+ msg_scopes("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1)//Tell the devs
\ No newline at end of file
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 3b4743b7..2bf70822 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -498,4 +498,4 @@ var/list/forbidden_varedit_object_types = list(
world.log << "### VarEdit by [src]: [O.type] [variable]=[html_encode("[O.vars[variable]]")]"
log_admin("[key_name(src)] modified [original_name]'s [variable] to [O.vars[variable]]")
message_admins("[key_name_admin(src)] modified [original_name]'s [variable] to [O.vars[variable]]", 1)
-
+ msg_scopes("[key_name_admin(src)] modified [original_name]'s [variable] to [O.vars[variable]]", 1) // Tell dev's to but look at the logs
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 2256b70c..078e4228 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -993,8 +993,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
config.allow_random_events = 1
usr << "Random events enabled"
message_admins("Admin [key_name_admin(usr)] has enabled random events.", 1)
+ msg_scopes("Admin [key_name_admin(usr)] has enabled random events.", 0)
else
config.allow_random_events = 0
usr << "Random events disabled"
message_admins("Admin [key_name_admin(usr)] has disabled random events.", 1)
+ msg_scopes("Admin [key_name_admin(usr)] has disabled random events.", 0)
feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm
index ca4149cf..f93adbfe 100644
--- a/code/modules/admin/verbs/ticklag.dm
+++ b/code/modules/admin/verbs/ticklag.dm
@@ -12,6 +12,7 @@
if(newtick && newtick <= 2 && newtick > 0)
log_admin("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
message_admins("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
+ msg_scopes("[key_name(src)] has modified world.tick_lag to [newtick]", 0)
world.tick_lag = newtick
feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm
index 647d6fb7..9d88a467 100644
--- a/code/modules/events/event_manager.dm
+++ b/code/modules/events/event_manager.dm
@@ -65,3 +65,4 @@ var/scheduledEvent = null
if(ispath(type))
new type
message_admins("[key_name_admin(usr)] has triggered an event. ([type])", 1)
+ msg_scopes("[key_name_admin(usr)] has triggered an event. ([type])", 0)