Merge branch 'dev-sierra' into upstream-pr-35013

SierraBay · Jan 7, 2025 · bfad60f · bfad60f
2 parents ed79e10 + 94fbdbb
commit bfad60f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git 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/html/changelogs/AutoChangeLog-sierra-pr-3080.yml 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
diff --git 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
@@ -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