From 5266ae1437e062384189321b70f247f7f686ea9a Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 26 Dec 2020 22:28:41 -0800 Subject: [PATCH] okay --- code/controllers/subsystem/persistence/cleanable_debris.dm | 3 --- code/game/objects/effects/decals/cleanable/humans.dm | 6 +++--- code/game/objects/effects/decals/cleanable/misc.dm | 2 +- code/game/objects/effects/decals/crayon.dm | 2 +- code/game/objects/effects/decals/remains.dm | 1 + 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/code/controllers/subsystem/persistence/cleanable_debris.dm b/code/controllers/subsystem/persistence/cleanable_debris.dm index e2da6114a6..63e7c7a2e8 100644 --- a/code/controllers/subsystem/persistence/cleanable_debris.dm +++ b/code/controllers/subsystem/persistence/cleanable_debris.dm @@ -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) diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 5206279d42..bec00aa944 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -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)) diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 2bd79edfb4..0f7d7c185d 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -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() . = ..() diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index ad9abe10b1..a0590b7180 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -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"] diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index 87337a526c..34019ba897 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -2,6 +2,7 @@ name = "remains" gender = PLURAL icon = 'icons/effects/blood.dmi' + persistent = TRUE /obj/effect/decal/remains/acid_act() visible_message("[src] dissolve[gender==PLURAL?"":"s"] into a puddle of sizzling goop!")