Reminder: Yell at Leshana for not tagging edited code.

This commit is contained in:
Unknown
2019-03-27 20:03:23 -04:00
parent e105a047e1
commit a22ada82f1
2 changed files with 25 additions and 78 deletions

View File

@@ -242,8 +242,6 @@
/proc/isLeap(y)
return ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0))
<<<<<<< HEAD
=======
//Takes a string and a datum
//The string is well, obviously the string being checked
@@ -283,4 +281,3 @@
return strtype
return copytext(strtype, delim_pos)
>>>>>>> bfaaffb... Adds a better debug controller verb that can target all controllers/processes/mc/failsafe/config/etc (#5852)

View File

@@ -68,80 +68,6 @@
set name = "Debug Controller"
set desc = "Debug the various subsystems/controllers for the game (be careful!)"
<<<<<<< HEAD
if(!holder) return
switch(controller)
if("Master")
debug_variables(master_controller)
feedback_add_details("admin_verb","DMC")
if("Ticker")
debug_variables(ticker)
feedback_add_details("admin_verb","DTicker")
if("Ticker Process")
debug_variables(tickerProcess)
feedback_add_details("admin_verb","DTickerProcess")
if("Air")
debug_variables(air_master)
feedback_add_details("admin_verb","DAir")
if("Jobs")
debug_variables(job_master)
feedback_add_details("admin_verb","DJobs")
if("Radio")
debug_variables(radio_controller)
feedback_add_details("admin_verb","DRadio")
if("Supply")
debug_variables(supply_controller)
feedback_add_details("admin_verb","DSupply")
if("Emergency Shuttle")
debug_variables(emergency_shuttle)
feedback_add_details("admin_verb","DEmergency")
if("Configuration")
debug_variables(config)
feedback_add_details("admin_verb","DConf")
if("pAI")
debug_variables(paiController)
feedback_add_details("admin_verb","DpAI")
if("Cameras")
debug_variables(cameranet)
feedback_add_details("admin_verb","DCameras")
if("Transfer Controller")
debug_variables(transfer_controller)
feedback_add_details("admin_verb","DAutovoter")
if("Gas Data")
debug_variables(gas_data)
feedback_add_details("admin_verb","DGasdata")
if("Plants")
debug_variables(plant_controller)
feedback_add_details("admin_verb", "DPlants")
if("Alarm")
debug_variables(alarm_manager)
feedback_add_details("admin_verb", "DAlarm")
message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
return
/client/proc/debug_process_scheduler()
set category = "Debug"
set name = "Debug Process Scheduler"
set desc = "Debug the process scheduler itself. For vulpine use only."
if(!check_rights(R_DEBUG)) return
if(config.debugparanoid && !check_rights(R_ADMIN)) return
debug_variables(processScheduler)
feedback_add_details("admin_verb", "DProcSchd")
message_admins("Admin [key_name_admin(usr)] is debugging the process scheduler.")
/client/proc/debug_process(controller in processScheduler.nameToProcessMap)
set category = "Debug"
set name = "Debug Process Controller"
set desc = "Debug one of the periodic loop background task controllers for the game (be careful!)"
if(!check_rights(R_DEBUG)) return
if(config.debugparanoid && !check_rights(R_ADMIN)) return
var/datum/controller/process/P = processScheduler.nameToProcessMap[controller]
debug_variables(P)
feedback_add_details("admin_verb", "DProcCtrl")
message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
=======
if(!holder)
return
var/list/options = list()
@@ -186,4 +112,28 @@
feedback_add_details("admin_verb", "DebugController")
message_admins("Admin [key_name_admin(mob)] is debugging the [pick] controller.")
debug_variables(D)
>>>>>>> bfaaffb... Adds a better debug controller verb that can target all controllers/processes/mc/failsafe/config/etc (#5852)
//VOREStation Edit Begin
/client/proc/debug_process_scheduler()
set category = "Debug"
set name = "Debug Process Scheduler"
set desc = "Debug the process scheduler itself. For vulpine use only."
if(!check_rights(R_DEBUG)) return
if(config.debugparanoid && !check_rights(R_ADMIN)) return
debug_variables(processScheduler)
feedback_add_details("admin_verb", "DProcSchd")
message_admins("Admin [key_name_admin(usr)] is debugging the process scheduler.")
/client/proc/debug_process(controller in processScheduler.nameToProcessMap)
set category = "Debug"
set name = "Debug Process Controller"
set desc = "Debug one of the periodic loop background task controllers for the game (be careful!)"
if(!check_rights(R_DEBUG)) return
if(config.debugparanoid && !check_rights(R_ADMIN)) return
var/datum/controller/process/P = processScheduler.nameToProcessMap[controller]
debug_variables(P)
feedback_add_details("admin_verb", "DProcCtrl")
message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
//VOREStation Edit End