Map syncs 1 - Code syncs

This commit is contained in:
deathride58
2017-10-23 12:56:26 -04:00
parent 930f6405b2
commit c1bd7bc6ba
7 changed files with 22 additions and 7 deletions
@@ -9,7 +9,7 @@
desc = "Ashes to ashes, dust to dust, and into space."
icon = 'icons/obj/objects.dmi'
icon_state = "ash"
mergeable_decal = 0
mergeable_decal = FALSE
/obj/effect/decal/cleanable/ash/Initialize()
. = ..()
@@ -67,7 +67,7 @@
gender = NEUTER
icon = 'icons/effects/effects.dmi'
icon_state = "molten"
mergeable_decal = 0
mergeable_decal = FALSE
/obj/effect/decal/cleanable/molten_object/large
name = "big gooey grey mass"
@@ -144,7 +144,7 @@
desc = "The shredded remains of what appears to be clothing."
icon_state = "shreds"
gender = PLURAL
mergeable_decal = 0
mergeable_decal = FALSE
/obj/effect/decal/cleanable/shreds/ex_act(severity, target)
if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion.