Merge branch 'master' of https://github.com/goonstation/goonstation i…

…nto master
amylizzle · Oct 18, 2023 · 10230ee · 10230ee
2 parents 8855a60 + 290d013
commit 10230ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/code/mapSwitching.dm b/code/mapSwitching.dm
@@ -459,6 +459,7 @@ var/global/datum/mapSwitchHandler/mapSwitcher
 
 /obj/mapVoteLink
 	name = "<span style='color: green; text-decoration: underline;'>Map Vote</span>"
+	flags = NOSPLASH
 
 	Click()
 		var/client/C = usr.client

diff --git a/maps/oshan.dmm b/maps/oshan.dmm
@@ -36490,7 +36490,7 @@
 "hdz" = (
 /obj/machinery/door/airlock/pyro/alt{
 	dir = 4;
-	name = "Crematorium"
+	name = "Crew Quarters"
 	},
 /obj/mapping_helper/firedoor_spawn,
 /turf/simulated/floor,