From 44a321dada4237e680eda425c6daf9cecde25507 Mon Sep 17 00:00:00 2001 From: ktlwjec <122807629+ktlwjec0@users.noreply.github.com> Date: Thu, 24 Oct 2024 20:28:38 +0100 Subject: [PATCH 01/39] rad and fire closet (#11610) --- .../objects/items/stacks/sheets/mineral/metals_recipes.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/mineral/metals_recipes.dm b/code/game/objects/items/stacks/sheets/mineral/metals_recipes.dm index cbdcd75572126..26ba53a24befd 100644 --- a/code/game/objects/items/stacks/sheets/mineral/metals_recipes.dm +++ b/code/game/objects/items/stacks/sheets/mineral/metals_recipes.dm @@ -48,9 +48,9 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new /datum/stack_recipe_list("closets", list( \ new/datum/stack_recipe("closet", /obj/structure/closet, 2, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ new/datum/stack_recipe("emergency closet", /obj/structure/closet/emcloset/empty, 2, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ - new/datum/stack_recipe("fire closet", /obj/structure/closet/radiation/empty, 2, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ - new/datum/stack_recipe("radiation closet", /obj/structure/closet/firecloset/empty, 2, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ - new/datum/stack_recipe("tool closet", /obj/structure/closet/toolcloset/empty, 2, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ + new/datum/stack_recipe("fire closet", /obj/structure/closet/firecloset/empty, 2, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ + new/datum/stack_recipe("radiation closet", /obj/structure/closet/radiation/empty, 2, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ + new/datum/stack_recipe("tool closet", /obj/structure/closet/toolcloset/empty, 2, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ new/datum/stack_recipe("wardrobe closet", /obj/structure/closet/wardrobe/empty, 2, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ new/datum/stack_recipe("bomb closet", /obj/structure/closet/bombcloset/empty, 2, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \ )), From e60ffc985912e1ba31d7df4271cfb28a7ef91ec9 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:37:08 -0500 Subject: [PATCH 02/39] Automatic changelog generation for PR #11610 [ci skip] --- html/changelogs/AutoChangeLog-pr-11610.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11610.yml diff --git a/html/changelogs/AutoChangeLog-pr-11610.yml b/html/changelogs/AutoChangeLog-pr-11610.yml new file mode 100644 index 0000000000000..53c1dc6a8b668 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11610.yml @@ -0,0 +1,4 @@ +author: ktlwjec +delete-after: true +changes: + - bugfix: Radiation and fire closet build results work as expected. From fe33c0ad8212ce345809d166772ada1aa5e08f3f Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Thu, 24 Oct 2024 20:04:08 +0000 Subject: [PATCH 03/39] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-11610.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11610.yml diff --git a/html/changelog.html b/html/changelog.html index 824064b570813..39e5f0ecf4f75 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

24 October 2024

+

ktlwjec updated:

+ +

23 October 2024

rkz, Ghommie, GoldenAlpharex, Sealed101 updated: