From 16a23eadecf5c491c48edbc291e1166e81191328 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 18 Oct 2020 15:57:07 +0300 Subject: [PATCH 1/2] Merge pull request #9235 from VOREStation/upstream-merge-7726 [MIRROR] Fix most borosilicate shards disappearing instantly after being made --- code/game/objects/items/weapons/material/shards.dm | 2 +- html/changelogs/Meghan Rossi - borosilicate shard fix.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Meghan Rossi - borosilicate shard fix.yml diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 19eaf7f776..cbf03b4535 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -152,4 +152,4 @@ ..(loc, "steel") /obj/item/weapon/material/shard/phoron/New(loc) - ..(loc, "phglass") + ..(loc, "borosilicate glass") diff --git a/html/changelogs/Meghan Rossi - borosilicate shard fix.yml b/html/changelogs/Meghan Rossi - borosilicate shard fix.yml new file mode 100644 index 0000000000..491d3380aa --- /dev/null +++ b/html/changelogs/Meghan Rossi - borosilicate shard fix.yml @@ -0,0 +1,4 @@ +author: Meghan-Rossi +delete-after: True +changes: + - bugfix: "Fixed borosilicate glass not producing shards in most situations." \ No newline at end of file