From 2f710a202f31d93a0dafbb33a000ebf759c9d3b5 Mon Sep 17 00:00:00 2001
From: if there were two guys on the moon <lunaria0eclipse@gmail.com>
Date: Sat, 29 Jun 2019 00:16:15 +0100
Subject: [PATCH] Fixes Z-level fuckery

---
 .../programs/medical/suit_sensors.dm          |  4 ++
 .../mistyLuminescence - zruntime.yml          | 37 +++++++++++++++++++
 maps/southern_cross/southern_cross_defines.dm |  4 +-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/mistyLuminescence - zruntime.yml

diff --git a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm
index 86ccaa73bc..c769fe21e2 100644
--- a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm
+++ b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm
@@ -42,6 +42,10 @@
 	for(var/z in (data["map_levels"] | T.z))  // Always show crew from the current Z even if we can't show a map
 		data["crewmembers"] += crew_repository.health_data(z)
 
+	if(!data["map_levels"].len)
+		to_chat(user, "<span class='warning'>The crew monitor doesn't seem like it'll work here.</span>")
+		return
+
 	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "crew_monitor.tmpl", "Crew Monitoring Computer", 900, 800, state = state)
diff --git a/html/changelogs/mistyLuminescence - zruntime.yml b/html/changelogs/mistyLuminescence - zruntime.yml
new file mode 100644
index 0000000000..2251dc83f8
--- /dev/null
+++ b/html/changelogs/mistyLuminescence - zruntime.yml	
@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: mistyLuminescence
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Fixes a runtime caused by attempting to use a crew monitor console while on an invalid Z-level."
+  - bugfix: "Fixes GPSes not detecting other GPSes while on an invalid Z-level. Transit Z is unaffected by this- no spying on other shuttles!"
\ No newline at end of file
diff --git a/maps/southern_cross/southern_cross_defines.dm b/maps/southern_cross/southern_cross_defines.dm
index e44bad1a49..958659c692 100644
--- a/maps/southern_cross/southern_cross_defines.dm
+++ b/maps/southern_cross/southern_cross_defines.dm
@@ -78,7 +78,7 @@
 	if (long_range && (srcz in map_levels))
 		return map_levels
 	else if (srcz == Z_LEVEL_TRANSIT)
-		return list() // Nothing on transit!
+		return list() // Nothing on these z-levels- sensors won't show, and GPSes won't see each other.
 	else if (srcz >= Z_LEVEL_STATION_ONE && srcz <= Z_LEVEL_STATION_THREE) // Station can see other decks.
 		return list(
 			Z_LEVEL_STATION_ONE,
@@ -90,7 +90,7 @@
 			Z_LEVEL_SURFACE_MINE,
 			Z_LEVEL_SURFACE_WILD)
 	else
-		return ..()
+		return list(srcz) //prevents runtimes when using CMC. any Z-level not defined above will be 'isolated' and only show to GPSes/CMCs on that same Z (e.g. CentCom).
 
 /datum/map/southern_cross/perform_map_generation()
 	// First, place a bunch of submaps. This comes before tunnel/forest generation as to not interfere with the submap.