Miscellaneous fixes (#1349)

fixes posibrain message
fixes a runtime error with devouring
small optimisation to radios
This commit is contained in:
NanakoAC
2016-12-30 13:43:38 +02:00
committed by skull132
parent 7d5450efd4
commit 85aa8cdaba
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -109,7 +109,7 @@ var/list/ghost_traps
target << "<b>Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.</b>"
target << "<b>Use say [target.get_language_prefix()]b to speak to other artificial intelligences.</b>"
var/turf/T = get_turf(target)
T.visible_message("<span class='notice'>\The [src] chimes quietly.</span>")
T.visible_message("<span class='notice'>\The [target] chimes quietly.</span>")
var/obj/item/device/mmi/digital/posibrain/P = target.loc
if(!istype(P)) //wat
return
+1 -1
View File
@@ -170,7 +170,7 @@
break
else
devouring = null
if (victimloc != victim.loc)
if (victim && victimloc != victim.loc)
src << "<span class='danger'>[victim] moved away, you need to keep it still. Try grabbing, stunning or killing it first.</span>"
else if (ourloc != src.loc)
src << "<span class='danger'>You moved! Devouring cancelled</span>"