From a527c73f6e0541971dc63f12a096f5dde33f20dc Mon Sep 17 00:00:00 2001 From: Jaraci <57604458+Jaraci@users.noreply.github.com> Date: Tue, 25 Oct 2022 11:03:01 +0100 Subject: [PATCH] Broken windows now drop all their materials when shattered (#14861) --- code/game/objects/structures/window.dm | 14 +++----------- html/changelogs/omicega-glassbreakingtime.yml | 13 +++++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 html/changelogs/omicega-glassbreakingtime.yml diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 1d07abdd742..4da1721a0f3 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -697,18 +697,10 @@ playsound(src, /decl/sound_category/glass_break_sound, 70, 1) if(display_message) visible_message(SPAN_WARNING("\The [src] shatters!")) - if(dir == SOUTHWEST) - var/index = null - index = 0 - while(index < 2) - new shardtype(loc) - if(reinf) - new /obj/item/stack/rods(loc) - index++ - else + if(reinf) + new /obj/item/stack/rods(loc, 4) + for(var/i = 1 to 4) new shardtype(loc) - if(reinf) - new /obj/item/stack/rods(loc) qdel(src) return diff --git a/html/changelogs/omicega-glassbreakingtime.yml b/html/changelogs/omicega-glassbreakingtime.yml new file mode 100644 index 00000000000..b411fd18e7c --- /dev/null +++ b/html/changelogs/omicega-glassbreakingtime.yml @@ -0,0 +1,13 @@ +# Your name. +author: Omicega + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Reinforced windows now drop more materials when broken."