mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-16 13:12:22 +00:00
Fixes Z-level fuckery
This commit is contained in:
@@ -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
|
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)
|
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)
|
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
|
||||||
if(!ui)
|
if(!ui)
|
||||||
ui = new(user, src, ui_key, "crew_monitor.tmpl", "Crew Monitoring Computer", 900, 800, state = state)
|
ui = new(user, src, ui_key, "crew_monitor.tmpl", "Crew Monitoring Computer", 900, 800, state = state)
|
||||||
|
|||||||
37
html/changelogs/mistyLuminescence - zruntime.yml
Normal file
37
html/changelogs/mistyLuminescence - zruntime.yml
Normal file
@@ -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!"
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
if (long_range && (srcz in map_levels))
|
if (long_range && (srcz in map_levels))
|
||||||
return map_levels
|
return map_levels
|
||||||
else if (srcz == Z_LEVEL_TRANSIT)
|
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.
|
else if (srcz >= Z_LEVEL_STATION_ONE && srcz <= Z_LEVEL_STATION_THREE) // Station can see other decks.
|
||||||
return list(
|
return list(
|
||||||
Z_LEVEL_STATION_ONE,
|
Z_LEVEL_STATION_ONE,
|
||||||
@@ -90,7 +90,7 @@
|
|||||||
Z_LEVEL_SURFACE_MINE,
|
Z_LEVEL_SURFACE_MINE,
|
||||||
Z_LEVEL_SURFACE_WILD)
|
Z_LEVEL_SURFACE_WILD)
|
||||||
else
|
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()
|
/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.
|
// First, place a bunch of submaps. This comes before tunnel/forest generation as to not interfere with the submap.
|
||||||
|
|||||||
Reference in New Issue
Block a user