From 143d293e68dc65ce7e08c454cebebfc8582b8f1f Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sun, 10 Aug 2014 04:50:00 +0100 Subject: [PATCH] Updates - Debugs for SoundScopes - Some more change log - Mice now have A 5 minute spawn timer after first mouse death - Grav Gen uses more power - Last vote timer for staff --- Scopes Files/gravitygenerator.dm | 2 +- code/__HELPERS/logging.dm | 12 ++++++++++-- code/controllers/voting.dm | 7 +++++++ code/game/gamemodes/autotraitor/autotraitor.dm | 17 +++++++++++------ code/modules/admin/admin_verbs.dm | 18 +++++++++++++++++- code/modules/mob/dead/observer/observer.dm | 6 ++++-- code/modules/mob/mob_movement.dm | 9 +++++++++ code/setup.dm | 1 + html/changelog.html | 10 +++++++++- 9 files changed, 69 insertions(+), 13 deletions(-) diff --git a/Scopes Files/gravitygenerator.dm b/Scopes Files/gravitygenerator.dm index a679c25f..7ab64aea 100644 --- a/Scopes Files/gravitygenerator.dm +++ b/Scopes Files/gravitygenerator.dm @@ -140,7 +140,7 @@ var/list/gravity_field_generators = list() // We will keep track of this by addi /obj/machinery/gravity_field_generator/main icon_state = "on_8" idle_power_usage = 0 - active_power_usage = 3000 + active_power_usage = 12000 power_channel = ENVIRON sprite_number = 8 use_power = 1 diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm index 5d140979..7ecf7283 100644 --- a/code/__HELPERS/logging.dm +++ b/code/__HELPERS/logging.dm @@ -6,7 +6,7 @@ // in the logs. ascii character 13 = CR /var/global/log_end= world.system_type == UNIX ? ascii2text(13) : "" - + /proc/error(msg) world.log << "## ERROR: [msg][log_end]" @@ -79,4 +79,12 @@ diary << "\[[time_stamp()]]PDA: [text][log_end]" /proc/log_misc(text) - diary << "\[[time_stamp()]]MISC: [text][log_end]" + diary << "\[[time_stamp()]]MISC: [text][log_end]" + +//SoundScopes extra stuffs +/proc/msg_scopes(var/msg) + msg = "Scopes Log: [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 diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 648c2cad..0d27d567 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -1,6 +1,7 @@ var/datum/controller/vote/vote = new() var/global/list/round_voters = list() //Keeps track of the individuals voting for a given round, for use in forcedrafting. +var/global/last_vote_time = 0 datum/controller/vote var/initiator = null @@ -180,6 +181,7 @@ datum/controller/vote log_game("Rebooting due to restart vote") world.Reboot() + last_vote_time = world.time return . proc/submit_vote(var/ckey, var/vote) @@ -234,6 +236,11 @@ datum/controller/vote mode = vote_type initiator = initiator_key started_time = world.time + var/timedifference = world.time - last_vote_time + var/timedifference_text + timedifference_text = time2text(timedifference,"mm:ss") + for(var/client/C in admins) + C << "Time since last vote: [timedifference_text]" var/text = "[capitalize(mode)] vote started by [initiator]." if(mode == "custom") text += "\n[question]" diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index 9c05dba2..f9eacc88 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -80,7 +80,7 @@ if(emergency_shuttle.departed) return //message_admins("Performing AutoTraitor Check") - log_debug("Doing AFK traitor check") + msg_scopes("Doing AFK traitor check") var/scopesdebug = 0 //tempory marker 4464-45 var/playercount = 0 var/traitorcount = 0 @@ -100,9 +100,11 @@ if(istype(player, "/mob/living/silicon/robot/drone")) possible_traitors -= player scopesdebug++ + msg_scopes("possible_traitors [possible_traitors.len]") + if(scopesdebug) //4464-45 - log_debug("Drones Found: [scopesdebug]") + msg_scopes("Drones Found: [scopesdebug]") //message_admins("Live Players: [playercount]") //message_admins("Live Traitors: [traitorcount]") @@ -114,16 +116,18 @@ var/list/old_afk_traitors = afk_traitor_count for(var/mob/living/player in traitors) + msg_scopes("Checking [player.ckey]") if(player.client.is_afk() && !(player in afk_traitor_count)) + msg_scopes("[player.ckey] is afk") afk_traitor_count += player for(var/mob/living/player in afk_traitor_count) //Need to make it so it registers if someone has come back -- SoundScopes if(player in old_afk_traitors) continue - log_debug("Traitors are afk, forcing a new traitor") + msg_scopes("Traitors are afk, forcing a new traitor") need_new_traitor = 1 - log_debug("afk_traitor_count = [afk_traitor_count.len] : old count: [old_afk_traitors.len]") + msg_scopes("afk_traitor_count = [afk_traitor_count.len] : old count: [old_afk_traitors.len]") // var/r = rand(5) // var/target_traitors = 1 @@ -142,14 +146,15 @@ message_admins("Making a new Traitor.") if(!possible_traitors.len) if(need_new_traitor) - log_debug("No potential traitors. Cancelling new traitor.") + msg_scopes("No potential traitors. Cancelling new traitor.") message_admins("No potential traitors. Cancelling new traitor.") traitorcheckloop() return var/mob/living/newtraitor = pick(possible_traitors) + msg_scopes("[newtraitor.real_name] has been picked with the job of [newtraitor.mind.assigned_role]") //message_admins("[newtraitor.real_name] is the new Traitor.") if(need_new_traitor) - log_debug("Traitor forced and selected") + msg_scopes("Traitor forced and selected") if (!config.objectives_disabled) forge_traitor_objectives(newtraitor.mind) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 0e870f21..454bf874 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -139,7 +139,8 @@ var/list/admin_verbs_dev = list( /client/proc/SDQL2_query, /client/proc/cmd_dev_say, /client/proc/cmd_dev_bst, - /client/proc/cmd_dev_reset_gravity + /client/proc/cmd_dev_reset_gravity, + /client/proc/togglescopeslogs ) var/list/admin_verbs_spawn = list( /datum/admins/proc/spawn_atom, /*allows us to spawn instances*/ @@ -916,3 +917,18 @@ var/list/admin_verbs_mod = list( set_security_level(SEC_LEVEL_DELTA) delta_level:active = 1 delta_level.activate() + +//SoundScopes extra messages, most of which will be almost useless >_> +/client/proc/togglescopeslogs() + set name = "Toggle Scopes Debug" + set category = "Preferences" + set desc = "SoundScopes Advanced debug logs, this will create spam for yourself" + + if(!check_rights(R_DEV)) return + if(!check_rights(R_MOD)) return + + prefs.toggles ^= CHAT_SCOPES_DEBUG + if (prefs.toggles & CHAT_SCOPES_DEBUG) + usr << "You now will get advanced debug logs" + else + usr << "You now won't get advanced debug logs" diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index e11c7b95..3c656706 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -172,6 +172,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp resting = 1 var/mob/dead/observer/ghost = ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly. + if(istype(src, /mob/living/simple_animal/mouse)) + ghost.client.time_died_as_mouse = world.time return @@ -386,9 +388,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/verb/analyze_air() set name = "Analyze Air" set category = "Ghost" - + if(!istype(usr, /mob/dead/observer)) return - + // Shamelessly copied from the Gas Analyzers if (!( istype(usr.loc, /turf) )) return diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 4b349f16..261df980 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -470,8 +470,17 @@ /mob/proc/float(var/on) if(on) + if(!real_name) + msg_scopes("[name] was made to float") + else + msg_scopes("[real_name] was made to float") animate(src, pixel_y = 2, time = 10, loop = -1) floating = 1 else + if(!real_name) + msg_scopes("[name] was made to float") + else + msg_scopes("[real_name] was made to float") + msg_scopes("[real_name] was told to stop floating") animate(src, pixel_y = initial(pixel_y), time = 10) floating = 0 \ No newline at end of file diff --git a/code/setup.dm b/code/setup.dm index 70a91b6d..34a05b19 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -636,6 +636,7 @@ var/list/liftable_structures = list(\ #define CHAT_DEBUGLOGS 2048 #define CHAT_LOOC 4096 #define CHAT_GHOSTRADIO 8192 +#define CHAT_SCOPES_DEBUG 16384 #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC) diff --git a/html/changelog.html b/html/changelog.html index 7ae785bf..d1ff83fb 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -64,6 +64,11 @@ should be listed in the changelog upon commit though. Thanks. -->
  • Auto-traitor now listens to traitor bans
  • Engineer Apprentice access
  • Bluespace Techs no longer go unknown when ghosted
    • +
  • Fixed sprited on armory lockers
    • +
  • Wielding weapons no longer leaves 2 sprites on the mob
    • +
  • Disposals
    • +
  • Mice now have a respawn timer
    • +
  • Sign language
  • Deep-fat fryer
  • Welderbomb delay
  • Roll up sleves
    • @@ -72,10 +77,13 @@ should be listed in the changelog upon commit though. Thanks. -->
  • New drinks
  • Zipties added to ERT loadout
  • Action Icon for wieledable weapons
    • +
  • New Undershirts
    • +
  • Recycler
    • +
  • Faxes can be sent through request consoles
  • Shotguns require 2 hands to be fired
  • Delta level when called by an admin destroys the station
  • Map changes
    • -
  • New icons
    • +
  • New sprites for various things
  • Messages now appear when you roll your jumpsuit