diff --git a/code/_helpers/game.dm b/code/_helpers/game.dm index d130d82175a..1210ba9f3e8 100644 --- a/code/_helpers/game.dm +++ b/code/_helpers/game.dm @@ -242,7 +242,7 @@ if(ear) // Ghostship is magic: Ghosts can hear radio chatter from anywhere if(speaker_coverage[ear] || (istype(M, /mob/dead/observer) && (M.client) && (M.client.prefs.toggles & CHAT_GHOSTRADIO))) - . |= M // Since we're already looping through mobs, why bother using |= ? This only slows things down. + . += M return . #define SIGN(X) ((X<0)?-1:1) diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm index 7cae383b78d..3387383a83a 100644 --- a/code/modules/ghosttrap/trap.dm +++ b/code/modules/ghosttrap/trap.dm @@ -109,7 +109,7 @@ var/list/ghost_traps target << "Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm." target << "Use say [target.get_language_prefix()]b to speak to other artificial intelligences." var/turf/T = get_turf(target) - T.visible_message("\The [src] chimes quietly.") + T.visible_message("\The [target] chimes quietly.") var/obj/item/device/mmi/digital/posibrain/P = target.loc if(!istype(P)) //wat return diff --git a/code/modules/mob/living/devour.dm b/code/modules/mob/living/devour.dm index 257fc751297..c68c4f99006 100644 --- a/code/modules/mob/living/devour.dm +++ b/code/modules/mob/living/devour.dm @@ -170,7 +170,7 @@ break else devouring = null - if (victimloc != victim.loc) + if (victim && victimloc != victim.loc) src << "[victim] moved away, you need to keep it still. Try grabbing, stunning or killing it first." else if (ourloc != src.loc) src << "You moved! Devouring cancelled"