This commit is contained in:
silicons
2020-12-26 22:28:41 -08:00
parent 57065d995e
commit 5266ae1437
5 changed files with 6 additions and 8 deletions
@@ -41,7 +41,6 @@
for(var/y in L2)
var/turf/tile = locate(text2num(x), text2num(y), actual_z)
if(!tile)
to_chat(world, "DEBUG: aborting due to no turf ([x] [y] [actual_z])")
continue
var/list/objects = data[z][x][y]
for(var/_L in objects)
@@ -54,10 +53,8 @@
path = text2path(_L)
objdata = objects[_L]
if(!path)
to_chat(world, "DEBUG: Aborting: No path ([x] [y] [actual_z])")
continue
if(!IsValidDebrisLocation(tile, allowed_turf_typecache, allowed_z_cache, path, TRUE))
to_chat(world, "DEBUG: Aborting: Invalid location ([x] [y] [actual_z])")
continue
var/obj/effect/decal/cleanable/instantiated = new path(tile)
if(objdata)
@@ -71,7 +71,7 @@
/obj/effect/decal/cleanable/blood/tracks/PersistenceLoad(list/data)
. = ..()
if(data["dir"])
setDir(data["dir"])
setDir(text2num(data["dir"]))
/obj/effect/decal/cleanable/trail_holder //not a child of blood on purpose
name = "blood"
@@ -92,7 +92,7 @@
/obj/effect/decal/cleanable/trail_holder/PersistenceLoad(list/data)
. = ..()
if(data["dir"])
setDir(data["dir"])
setDir(text2num(data["dir"]))
if(data["color"])
fixed_color = TRUE
add_atom_colour(data["color"], FIXED_COLOUR_PRIORITY)
@@ -138,7 +138,7 @@
/obj/effect/decal/cleanable/blood/footprints/PersistenceLoad(list/data)
. = ..()
if(data["dir"])
setDir(data["dir"])
setDir(text2num(data["dir"]))
/obj/effect/decal/cleanable/blood/footprints/Crossed(atom/movable/O)
if(ishuman(O))
@@ -83,7 +83,7 @@
/obj/effect/decal/cleanable/dirt/PersistenceLoad(list/data)
. = ..()
if(data["alpha"])
alpha = data["alpha"]
alpha = text2num(data["alpha"])
/obj/effect/decal/cleanable/dirt/Initialize()
. = ..()
+1 -1
View File
@@ -48,7 +48,7 @@
name = data["name"]
if(do_icon_rotate && data["rotation"])
var/matrix/M = matrix()
M.Turn(data["rotation"])
M.Turn(text2num(data["rotation"]))
transform = M
if(data["paint_color"])
paint_colour = data["paint_color"]
@@ -2,6 +2,7 @@
name = "remains"
gender = PLURAL
icon = 'icons/effects/blood.dmi'
persistent = TRUE
/obj/effect/decal/remains/acid_act()
visible_message("<span class='warning'>[src] dissolve[gender==PLURAL?"":"s"] into a puddle of sizzling goop!</span>")