Merge branch 'master' into PVE-compliant-attachies

cmss13-devs · Nov 1, 2024 · ed78cd9 · ed78cd9
2 parents b5b0d94 + 7f41c0b
commit ed78cd9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -76,8 +76,8 @@
 	new /obj/item/clothing/shoes/black(src)
 
 /obj/structure/closet/secure_closet/platoon_sergeant
-	name = "platoon sergeant locker"
-	desc = "A secure storage unit for the platoon sergeant."
+	name = "section sergeant locker"
+	desc = "A secure storage unit for the section sergeant."
 	req_one_access = list(ACCESS_MARINE_LEADER)
 
 /obj/structure/closet/secure_closet/platoon_sergeant/Initialize()

diff --git a/html/changelogs/AutoChangeLog-pr-532.yml b/html/changelogs/AutoChangeLog-pr-532.yml
@@ -0,0 +1,5 @@
+author: "Max-023"
+delete-after: True
+changes:
+  - bugfix: "section sergeant lockers now listing the appropriate job titles"
+  - spellcheck: "addressed some outdated descriptions with the section sergeant locker."
diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -3206,11 +3206,11 @@
 "alc" = (
 /obj/structure/closet/secure_closet/marine_personal{
 	pixel_x = -7;
-	job = "Platoon Sergeant"
+	job = "Section Sergeant"
 	},
 /obj/structure/closet/secure_closet/marine_personal{
 	pixel_x = 8;
-	job = "Platoon Corpsman"
+	job = "Corpsman"
 	},
 /turf/open/floor/almayer/plate,
 /area/golden_arrow/cryo_cells)