From 17ccbb4a534918123c2508840829379fca0b8b31 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 5 Feb 2018 00:53:52 -0600 Subject: [PATCH] [MIRROR] Adds tiny shards (#5299) * Adds tiny shards (#35070) * Adds tiny shards * . * . * . * . * . * . * Adds tiny shards --- .../objects/effects/decals/cleanable/misc.dm | 12 ++++++++++++ code/game/objects/structures/window.dm | 7 ++++++- icons/obj/shards.dmi | Bin 2217 -> 3402 bytes 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index d24a278b41..902b5652fd 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -25,6 +25,18 @@ . = ..() reagents.add_reagent("ash", 30) //double the amount of ash. +/obj/effect/decal/cleanable/glass + name = "tiny shards" + desc = "Back to sand." + icon = 'icons/obj/shards.dmi' + icon_state = "tiny" + +/obj/effect/decal/cleanable/glass/Initialize() + . = ..() + setDir(pick(GLOB.cardinals)) + +/obj/effect/decal/cleanable/glass/ex_act() + qdel(src) /obj/effect/decal/cleanable/dirt name = "dirt" diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 3326a2a0a8..add789c0b8 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -27,6 +27,7 @@ var/breaksound = "shatter" var/hitsound = 'sound/effects/Glasshit.ogg' var/rad_insulation = RAD_VERY_LIGHT_INSULATION + var/spawn_cleanable_shards = TRUE /obj/structure/window/examine(mob/user) ..() @@ -283,6 +284,8 @@ if(!disassembled) playsound(src, breaksound, 70, 1) if(!(flags_1 & NODECONSTRUCT_1)) + if(spawn_cleanable_shards) + new /obj/effect/decal/cleanable/glass(get_turf(src)) for(var/i in debris) var/obj/item/I = i I.forceMove(drop_location()) @@ -417,6 +420,7 @@ explosion_block = 1 glass_type = /obj/item/stack/sheet/plasmaglass rad_insulation = RAD_NO_INSULATION + spawn_cleanable_shards = FALSE /obj/structure/window/plasma/spawner/east dir = EAST @@ -610,7 +614,7 @@ new /obj/effect/temp_visual/ratvar/window(get_turf(src)) amount_of_gears = 4 for(var/i in 1 to amount_of_gears) - debris += new/obj/item/clockwork/alloy_shards/medium/gear_bit() + debris += new /obj/item/clockwork/alloy_shards/medium/gear_bit() change_construction_value(fulltile ? 2 : 1) /obj/structure/window/reinforced/clockwork/setDir(direct) @@ -672,6 +676,7 @@ decon_speed = 10 CanAtmosPass = ATMOS_PASS_YES resistance_flags = FLAMMABLE + spawn_cleanable_shards = FALSE armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) breaksound = 'sound/items/poster_ripped.ogg' hitsound = 'sound/weapons/slashmiss.ogg' diff --git a/icons/obj/shards.dmi b/icons/obj/shards.dmi index 5ae1402c368ed52ed1b85c33d55d62ee837052c9..a575ab292ff35b43c0ba64bd8c1f2262b12272e7 100644 GIT binary patch literal 3402 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