diff --git a/baystation12.dme b/baystation12.dme index ad8fb0bba94..f55c6d2cf01 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -370,7 +370,6 @@ #include "code\game\syndicate_shuttle.dm" #include "code\game\syndicate_specops_shuttle.dm" #include "code\game\throwing.dm" -#include "code\game\topic.dm" #include "code\game\turf.dm" #include "code\game\vials.dm" #include "code\game\vote.dm" diff --git a/code/WorkInProgress/detective_work.dm b/code/WorkInProgress/detective_work.dm index 424a23c2e41..48e741c7295 100644 --- a/code/WorkInProgress/detective_work.dm +++ b/code/WorkInProgress/detective_work.dm @@ -757,7 +757,7 @@ proc/blood_incompatible(donor,receiver) afterattack(atom/A as obj|turf|area, mob/user as mob) if(istype(A)) - user.visible_message("[user] starts to wipe the prints off of [A] with \the [src]!") + user.visible_message("[user] starts to wipe the prints and blood off of [A] with \the [src]!") if(do_after(user,30)) user.visible_message("[user] finishes wiping away the evidence!") A.clean_blood() diff --git a/code/game/events/Events/PowerOffline.dm b/code/game/events/Events/PowerOffline.dm index a8e03dcacd0..c02518c1aba 100644 --- a/code/game/events/Events/PowerOffline.dm +++ b/code/game/events/Events/PowerOffline.dm @@ -1,8 +1,8 @@ /datum/event/power_offline Announce() for(var/obj/machinery/power/apc/a in world) - if(!a.crit) - if(istype(a.area, /area/engine)) + if(!a.crit && a.z == 1) + if(istype(a.area, /area/engine) || istype(a.area, /area/toxins/xenobiology)) continue a.eventoff = 1 a.update() diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 686339aa6a6..412a8e497ad 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -23,7 +23,7 @@ for(var/rep in replacechars) msg = dd_replacetext(msg, rep, "") world << msg*/ - send2adminirc("#bs12admin","HELP: [src.key]: [msg]") + send2adminirc("#bs12admin","HELP: \"[src.key]: [msg]\"") if(tension_master) tension_master.new_adminhelp() return