Fire alarm changes + Lamarr fix (#1342)

Fixes some incorrect messages with Lamarr.
Fire alarms now use NanoUI and blink red when triggered.
Fixes #1339 
Fixes #1218
This commit is contained in:
Lohikar
2016-12-30 03:19:00 +02:00
committed by skull132
parent 0c8bf6d1b1
commit 7d5450efd4
8 changed files with 374 additions and 390 deletions
+3 -3
View File
@@ -65,8 +65,8 @@
usr << "<span class='warning'>You kick the lab cage.</span>"
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
O << "<span class='warning'>[] kicks the lab cage.</span>"
O << "<span class='warning'>[user] kicks the lab cage.</span>"
src.health -= 2
healthcheck()
return
@@ -182,7 +182,7 @@ var/const/MAX_ACTIVE_TIME = 400
if(stat != CONSCIOUS) return
if(!sterile) L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage
L.visible_message("<span class='danger'>\[src] leaps at [L]'s face!</span>")
L.visible_message("<span class='danger'>[src] leaps at [L]'s face!</span>")
if(ishuman(L))