diff --git a/html/changelogs/mattatlas-.yml b/html/changelogs/mattatlas-.yml new file mode 100644 index 00000000000..6d44d2551d1 --- /dev/null +++ b/html/changelogs/mattatlas-.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# 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: "People no longer get shoved into the overmap zlevel when falling out of space." diff --git a/maps/_common/mapsystem/map.dm b/maps/_common/mapsystem/map.dm index 68ddd6f1a13..9e93c970d62 100644 --- a/maps/_common/mapsystem/map.dm +++ b/maps/_common/mapsystem/map.dm @@ -11,7 +11,6 @@ var/list/sealed_levels = list() // Z-levels that don't allow random transit at edge var/list/restricted_levels = list() // Z-levels that dont allow ghosts to randomly move around var/list/empty_levels = null // Empty Z-levels that may be used for various things (currently used by bluespace jump) - var/list/meteor_levels = list() //What z-levels the meteors can hit var/list/map_levels // Z-levels available to various consoles, such as the crew monitor. Defaults to station_levels if unset. diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm index 92d5415cae1..2a090907a45 100644 --- a/maps/aurora/code/aurora.dm +++ b/maps/aurora/code/aurora.dm @@ -16,7 +16,6 @@ player_levels = list(2, 3, 4, 5, 6, 7, 8) restricted_levels = list() accessible_z_levels = list("2" = 60, "6" = 20, "7" = 20) - meteor_levels = list(6) base_turf_by_z = list( "1" = /turf/space, "2" = /turf/space, diff --git a/maps/runtime/code/runtime.dm b/maps/runtime/code/runtime.dm index 8872cb70f98..114cef75a98 100644 --- a/maps/runtime/code/runtime.dm +++ b/maps/runtime/code/runtime.dm @@ -13,7 +13,6 @@ contact_levels = list(1, 2, 3) player_levels = list(1, 2, 3) accessible_z_levels = list(1, 2, 3) - meteor_levels = list(1, 2, 3) overmap_event_areas = 10 diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm index c73b6789532..c65ecc0ffa3 100644 --- a/maps/sccv_horizon/code/sccv_horizon.dm +++ b/maps/sccv_horizon/code/sccv_horizon.dm @@ -9,10 +9,10 @@ station_levels = list(1, 2, 3) admin_levels = list(4) contact_levels = list(1, 2, 3) - player_levels = list(1, 2, 3, 5, 6) + player_levels = list(1, 2, 3, 5) restricted_levels = list() - accessible_z_levels = list(1, 2, 3) - empty_levels = list(6) + accessible_z_levels = list("1" = 5, "2" = 5, "3" = 5, "5" = 75) + empty_levels = list(5) base_turf_by_z = list( "1" = /turf/space, "2" = /turf/space,