diff --git a/code/game/events/Events/ElectricalStorm.dm b/code/game/events/Events/ElectricalStorm.dm index 1e7ec6f2966..a9174a1f9d7 100644 --- a/code/game/events/Events/ElectricalStorm.dm +++ b/code/game/events/Events/ElectricalStorm.dm @@ -84,11 +84,11 @@ proc BlowLight() //Blow out a light fixture var/obj/machinery/light/Light = null - var/insanity = 0 + var/failed_attempts = 0 while (Light == null || Light.status != 0) Light = pick(Lights) - insanity++ - if (insanity >= Lights.len) + failed_attempts++ + if (failed_attempts >= 10) return spawn(0) //Overload the light, spectacularly. @@ -98,12 +98,12 @@ Light.broken() DisruptAPC() - var/insanity = 0 + var/failed_attempts = 0 var/obj/machinery/power/apc/APC while (!APC || !APC.operating) APC = pick(APCs) - insanity++ - if (insanity >= APCs.len) + failed_attempts++ + if (failed_attempts >= 10) return if (prob(40)) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 5bda8305e71..1fe28172088 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -93,7 +93,7 @@ rcd light flash thingy on matter drain /datum/AI_Module/small/blackout module_name = "Blackout" mod_pick_name = "blackout" - uses = 3 + uses = 1 /client/proc/blackout() set category = "Malfunction" @@ -246,7 +246,7 @@ rcd light flash thingy on matter drain already = 1 if (!already) usr.verbs += /client/proc/interhack - src.temp = "Hacks the status upgrade from Cent. Com, removing any information about malfunctioning electrical systems." + src.temp = "Tricks the station's automated diagnosis suite for a while, giving you more time until you are revealed." usr:current_modules += new /datum/AI_Module/small/interhack src.processing_time -= 15 else src.temp = "This module is only needed once." diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index a933ea28480..deff8194d9d 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -62,6 +62,13 @@ */ spawn (rand(waittime_l, waittime_h)) send_intercept() + sleep(10*60*5) // 5 minutes + if(intercept_hacked) + sleep(10 * 60 * 20) // 30 minutes + command_alert("Diagnosis suite failure detected. Running backup diagnosis tool.", "Anomaly Alert") + sleep(100) + command_alert("AI unit diagnosis failed. Unable to detect morality cores. Disabling of unit recommended.", "Anomaly Alert") + ..() diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 71917f6f60e..2443b1d6fee 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1895,10 +1895,9 @@ id = H.wear_id if(!id) - usr << "Player has wear_id, but no id exists." + usr << "ERROR: Inform the coders that an [H.name] had wear_id but no ID on their ID slot." dat += "ERROR" - - if(isnull(id.assignment)) + else if(isnull(id.assignment)) usr << "ERROR: Inform the coders that an [id.name] was checked for its assignment variable." dat += "ERROR" else