[MIRROR] Harvesters are more fun to play (#894)

* Harvesters are more fun to play

* resolve .rej
This commit is contained in:
CitadelStationBot
2017-05-18 07:12:29 -05:00
committed by Poojawa
parent 593a784583
commit 6617f68604
27 changed files with 211 additions and 164 deletions
+5 -6
View File
@@ -127,22 +127,21 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
/mob/dead/observer/narsie_act()
var/old_color = color
color = "#960000"
animate(src, color = old_color, time = 10)
animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL)
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 10)
/mob/dead/observer/ratvar_act()
var/old_color = color
color = "#FAE48C"
animate(src, color = old_color, time = 10)
animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL)
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 10)
/mob/dead/observer/Destroy()
GLOB.ghost_images_default -= ghostimage_default
qdel(ghostimage_default)
ghostimage_default = null
QDEL_NULL(ghostimage_default)
GLOB.ghost_images_simple -= ghostimage_simple
qdel(ghostimage_simple)
ghostimage_simple = null
QDEL_NULL(ghostimage_simple)
updateallghostimages()
return ..()