NEW BOO SYSTEM!

Conflicts:
	code/datums/spell.dm
	code/modules/mob/dead/observer/observer.dm
This commit is contained in:
Rob Nelson
2014-01-19 05:22:20 -05:00
committed by ZomgPonies
parent ef2586a3e7
commit cd2c20a6fe
9 changed files with 166 additions and 32 deletions
+10 -4
View File
@@ -24,6 +24,7 @@
anchored = 1
use_power = 0
req_access = list(access_engine_equip)
var/spooky=0
var/area/area
var/areastring = null
var/obj/item/weapon/cell/cell
@@ -165,7 +166,7 @@
icon_state = "[basestate]-nocover"
else if (stat & BROKEN)
icon_state = "apc-b"
else if(emagged || malfai)
else if(emagged || malfai || spooky)
icon_state = "apcemag"
else if(wiresexposed)
icon_state = "apcewires"
@@ -187,8 +188,15 @@
update_icon()
updating_icon = 0
//attack with an item - open/close cover, insert cell, or (un)lock interface
/obj/machinery/power/apc/proc/spookify()
if(spooky) return // Fuck you we're already spooky
spooky=1
update_icon()
spawn(10)
spooky=0
update_icon()
//attack with an item - open/close cover, insert cell, or (un)lock interface
/obj/machinery/power/apc/attackby(obj/item/W, mob/user)
if (istype(user, /mob/living/silicon) && get_dist(src,user)>1)
@@ -836,7 +844,6 @@
if(!area.requires_power)
return
/*
if (equipment > 1) // off=0, off auto=1, on=2, on auto=3
use_power(src.equip_consumption, EQUIP)
@@ -985,7 +992,6 @@
area.poweralert(0, src)
// update icon & area power if anything changed
if(last_lt != lighting || last_eq != equipment || last_en != environ)
queue_icon_update()
update()
-1
View File
@@ -448,7 +448,6 @@
flickering = 0
// ai attack - make lights flicker, because why not
/obj/machinery/light/attack_ai(mob/user)
src.flicker(1)
return