From 3f40f7556eeaa220bd5606e9888a3104f2e8348b Mon Sep 17 00:00:00 2001 From: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com> Date: Tue, 14 Feb 2023 18:30:12 +0000 Subject: [PATCH] [NO GBP] Maintainer requested changes to the locker/closet grammar PR (#73412) ## About The Pull Request San requested changes to #73331 however the PR got merged before I had an opportunity to update my PR, this PR should contain the requested changes/reverts. ## Why It's Good For The Game Should have been in the previous PR but was not. ## Changelog :cl: spellcheck: Head of staff lockers and prison cell lockers have had their proper noun status returned. /:cl: --- _maps/map_files/Deltastation/DeltaStation2.dmm | 6 +++--- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 6 +++--- _maps/map_files/KiloStation/KiloStation.dmm | 12 ++++++------ _maps/map_files/MetaStation/MetaStation.dmm | 6 +++--- .../crates_lockers/closets/secure/security.dm | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index fd04602299d..13d04998e15 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -47223,7 +47223,7 @@ "luD" = ( /obj/structure/closet/secure_closet/brig{ id = "brig2"; - name = "cell 2 locker" + name = "Cell 2 locker" }, /obj/machinery/light/small/directional/north, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -47251,7 +47251,7 @@ "lvk" = ( /obj/structure/closet/secure_closet/brig{ id = "brig1"; - name = "cell 1 locker" + name = "Cell 1 locker" }, /obj/machinery/light/small/directional/north, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -90607,7 +90607,7 @@ "weh" = ( /obj/structure/closet/secure_closet/brig{ id = "cargocell"; - name = "cargo cell locker" + name = "Cargo Cell locker" }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index f7d0d9cfdc3..a803dfbfca4 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -33469,7 +33469,7 @@ /obj/machinery/light/small/directional/south, /obj/structure/closet/secure_closet/brig{ id = "Cell 2"; - name = "cell 2 locker" + name = "Cell 2 locker" }, /obj/structure/cable, /turf/open/floor/iron/smooth, @@ -54258,7 +54258,7 @@ /obj/machinery/light/small/directional/south, /obj/structure/closet/secure_closet/brig{ id = "Cell 1"; - name = "cell 1 locker" + name = "Cell 1 locker" }, /obj/structure/cable, /turf/open/floor/iron/smooth, @@ -61205,7 +61205,7 @@ /obj/machinery/light/small/directional/south, /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; - name = "cell 3 locker" + name = "Cell 3 locker" }, /obj/structure/cable, /turf/open/floor/iron/smooth, diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 04e86737e6a..4cd6527c45d 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -43081,7 +43081,7 @@ }, /obj/structure/closet/secure_closet/brig{ id = "Cell 5"; - name = "cell 5 locker" + name = "Cell 5 locker" }, /turf/open/floor/iron, /area/station/security/brig) @@ -43614,7 +43614,7 @@ }, /obj/structure/closet/secure_closet/brig{ id = "Cell 6"; - name = "cell 6 locker" + name = "Cell 6 locker" }, /turf/open/floor/iron, /area/station/security/brig) @@ -48231,7 +48231,7 @@ }, /obj/structure/closet/secure_closet/brig{ id = "Cell 2"; - name = "cell 2 locker" + name = "Cell 2 locker" }, /turf/open/floor/iron, /area/station/security/brig) @@ -58477,7 +58477,7 @@ }, /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; - name = "cell 3 locker" + name = "Cell 3 locker" }, /turf/open/floor/iron, /area/station/security/brig) @@ -59685,7 +59685,7 @@ }, /obj/structure/closet/secure_closet/brig{ id = "Cell 1"; - name = "cell 1 locker" + name = "Cell 1 locker" }, /turf/open/floor/iron, /area/station/security/brig) @@ -65915,7 +65915,7 @@ }, /obj/structure/closet/secure_closet/brig{ id = "Cell 4"; - name = "cell 4 locker" + name = "Cell 4 locker" }, /turf/open/floor/iron, /area/station/security/brig) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b7a97b57ae0..146b2c89e89 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1204,7 +1204,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; - name = "cell 3 locker" + name = "Cell 3 locker" }, /obj/structure/cable, /turf/open/floor/iron, @@ -24491,7 +24491,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig{ id = "Cell 2"; - name = "cell 2 locker" + name = "Cell 2 locker" }, /obj/structure/cable, /turf/open/floor/iron, @@ -57625,7 +57625,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig{ id = "Cell 1"; - name = "cell 1 locker" + name = "Cell 1 locker" }, /obj/structure/cable, /turf/open/floor/iron, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index ee020176e9e..b99bbea5dd4 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -74,7 +74,7 @@ new /obj/item/pinpointer/nuke(src) /obj/structure/closet/secure_closet/warden - name = "\proper warden's locker" + name = "warden's locker" req_access = list(ACCESS_ARMORY) icon_state = "warden"