Lavaland code review fixes - also integrates flyswatter and cat toy

This commit is contained in:
Mark van Alphen
2019-04-20 00:24:58 +02:00
parent 5452d4e8df
commit c878f8e36e
18 changed files with 91 additions and 181 deletions
@@ -193,4 +193,4 @@
icon = 'icons/effects/blood.dmi'
icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
anchored = 1
anchored = TRUE
+5 -1
View File
@@ -61,12 +61,16 @@
/obj/effect/mapping_helpers/Initialize(mapload)
..()
return late ? INITIALIZE_HINT_LATELOAD : qdel(src) // INITIALIZE_HINT_QDEL <-- Doesn't work
//needs to do its thing before spawn_rivers() is called
INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
/obj/effect/mapping_helpers/no_lava
icon_state = "no_lava"
/obj/effect/mapping_helpers/no_lava/New()
/obj/effect/mapping_helpers/no_lava/Initialize(mapload)
. = ..()
var/turf/T = get_turf(src)
T.flags |= NO_LAVA_GEN
@@ -247,9 +247,9 @@
transform = size_matrix //scale the bleed overlay's size based on the target's icon size
var/matrix/M = transform
if(shrink)
M = size_matrix*0.1
M = size_matrix * 0.1
else
M = size_matrix*2
M = size_matrix * 2
animate(src, alpha = 20, transform = M, time = duration, flags = ANIMATION_PARALLEL)
/obj/effect/temp_visual/bleed/explode