Merge pull request #1315 from DexeeXI/map-title-fix

Bug Fix Pass Again
Monkestation · Feb 29, 2024 · 85cbb0b · 85cbb0b
2 parents 62543e3 + a9ae8e8
commit 85cbb0b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/_maps/~monkestation/RandomBars/Icebox/MaidCafe.dmm b/_maps/~monkestation/RandomBars/Icebox/MaidCafe.dmm
@@ -93,12 +93,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood/large,
 /area/station/commons/lounge)
-"mu" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood/large,
-/area/station/commons/lounge)
 "mC" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -880,7 +874,7 @@ zS
 zS
 VG
 zS
-mu
+zS
 zS
 Bx
 if

diff --git a/_maps/~monkestation/RandomEngines/MetaStation/singularity.dmm b/_maps/~monkestation/RandomEngines/MetaStation/singularity.dmm
@@ -603,11 +603,10 @@
 /turf/open/floor/iron/dark,
 /area/station/engineering/supermatter/room)
 "Rw" = (
-/obj/structure/grille,
 /obj/machinery/camera/emp_proof/directional/west{
 	c_tag = "Singularity Engine #4"
 	},
-/turf/open/space/basic,
+/turf/open/floor/plating/airless,
 /area/station/engineering/supermatter/room)
 "Sh" = (
 /obj/effect/turf_decal/stripes/line,

diff --git a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm
@@ -78,6 +78,7 @@
 
 /datum/job/cargo_technician
 	alt_titles = list(
+		"Cargo Technician",
 		"Warehouse Technician",
 		"Deck Worker",
 		"Mailman",
@@ -258,6 +259,7 @@
 
 /datum/job/quartermaster
 	alt_titles = list(
+		"Quartermaster",
 		"Union Requisitions Officer",
 		"Deck Chief",
 		"Warehouse Supervisor",
@@ -312,6 +314,7 @@
 
 /datum/job/shaft_miner
 	alt_titles = list(
+		"Shaft Miner",
 		"Union Miner",
 		"Excavator",
 		"Spelunker",