From 67998453d423a1c640bf46218ba81e827002d85c Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Mon, 6 Jan 2025 20:22:04 +0000 Subject: [PATCH 1/2] [MIRROR] Add canon deaths to the chapel's memorial MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Созрел вопрос --- html/changelogs/AutoChangeLog-sierra-pr-3055.yml | 2 +- maps/torch/structures/signs.dm | 10 ++++++++++ maps/torch/torch3_deck3.dmm | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/html/changelogs/AutoChangeLog-sierra-pr-3055.yml b/html/changelogs/AutoChangeLog-sierra-pr-3055.yml index 30420185a376c..e3d6c11b5a40c 100644 --- a/html/changelogs/AutoChangeLog-sierra-pr-3055.yml +++ b/html/changelogs/AutoChangeLog-sierra-pr-3055.yml @@ -5,7 +5,7 @@ changes: Dumping the entire magazine at once onto the ground by using it in your active hand is still instant.} - {rscadd: You can now transfer bullets between magazines of matching caliburs by - using magazines on eachother. Have a bunch of partials you want to repack? That's + using magazines on eachother. Have a bunch of partials you want to repack. That's a lot easier now.} - {rscadd: 'Clicking on a pile of bullets on the ground with a magazine or ammobox will now load bullets from the pile into the magazine/box. This intentionally diff --git a/maps/torch/structures/signs.dm b/maps/torch/structures/signs.dm index 2ea5f93f5c483..8a01404ce5dd1 100644 --- a/maps/torch/structures/signs.dm +++ b/maps/torch/structures/signs.dm @@ -46,6 +46,16 @@ ) +/obj/structure/sign/memorial/torch + fallen = list( + "Senior Explorer Paula Wojciak | Expeditionary Corps", + "Senior Explorer Ziva Karim-Kirilisav | Expeditionary Corps", + "Petty Officer Third Class Tatyanna Svetka | Fleet", + "Lieutenant Adrian Schmidt | Expeditionary Corps", + "Ensign Brock Bunten | Expeditionary Corps" + ) + + /obj/structure/sign/memorial/use_tool(obj/item/tool, mob/user, list/click_params) // Dog Tags - Add dog tag if (istype(tool, /obj/item/clothing/accessory/badge/solgov/tags)) diff --git a/maps/torch/torch3_deck3.dmm b/maps/torch/torch3_deck3.dmm index d6bc880cf5406..31a004a0b129c 100644 --- a/maps/torch/torch3_deck3.dmm +++ b/maps/torch/torch3_deck3.dmm @@ -17930,7 +17930,7 @@ /turf/simulated/floor/reinforced/oxygen, /area/thruster/d3starboard) "SK" = ( -/obj/structure/sign/memorial, +/obj/structure/sign/memorial/torch, /obj/structure/sign/double/solgovflag/left{ pixel_x = -16; pixel_y = 32 From 94fbdbb96850e736b2c8a0decc7c1987a2106d00 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Tue, 7 Jan 2025 09:06:48 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A7=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6=D0=BB?= =?UTF-8?q?=D0=BE=D0=B3=20=D0=B4=D0=BB=D1=8F=20PR=20#3080=20[ci=20skip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/changelogs/AutoChangeLog-sierra-pr-3080.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-3080.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-3080.yml b/html/changelogs/AutoChangeLog-sierra-pr-3080.yml new file mode 100644 index 0000000000000..afe1cb1d25275 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-3080.yml @@ -0,0 +1,5 @@ +author: SierraKomodo +changes: + - {tweak: The chapel's memorial stone now lists the names of all the current canon + deaths.} +delete-after: true