cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12208 from Heroman3003/tether-passage-block

Browse Source 
Tether passage blockades
This commit is contained in:
Casey
2022-02-13 01:40:47 -05:00
committed by GitHub
parent ff8faa82fb 627f18335c
commit d8b0ebf7b4
5 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/map.dm
+1
View File
@@ -9,6 +9,7 @@
#define MAP_LEVEL_XENOARCH_EXEMPT 0x080 // Z-levels exempt from xenoarch digsite generation.
#define MAP_LEVEL_PERSIST 0x100 // Z-levels where SSpersistence should persist between rounds
#define MAP_LEVEL_MAPPABLE 0x200 // Z-levels where mapping units will work fully
#define MAP_LEVEL_BELOW_BLOCKED 0x400 // Z-levels in multiz with level below not meant to be 'normally' accessible
// Misc map defines.
#define SUBMAP_MAP_EDGE_PAD 8 // Automatically created submaps are forbidden from being this close to the main map's edge. //VOREStation Edit
code/game/turfs/turf_changing.dm
+1 -1
View File
@@ -28,7 +28,7 @@
if(N == /turf/space)
var/turf/below = GetBelow(src)
if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && (!istype(below, /turf/unsimulated/wall) && !istype(below, /turf/simulated/sky))) // VOREStation Edit: Weird open space
if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && !(src.z in using_map.below_blocked_levels) && (!istype(below, /turf/unsimulated/wall) && !istype(below, /turf/simulated/sky))) // VOREStation Edit: Weird open space
N = /turf/simulated/open
var/obj/fire/old_fire = fire
code/modules/multiz/ladder_assembly_vr.dm
+2
View File
@@ -89,6 +89,8 @@
if(!T) continue
var/obj/structure/ladder_assembly/LA = locate(/obj/structure/ladder_assembly, T)
if(!LA) continue
if(direction == DOWN && (src.z in using_map.below_blocked_levels)) continue
if(direction == UP && (LA.z in using_map.below_blocked_levels)) continue
if(LA.state != CONSTRUCTION_WELDED)
to_chat(user, "<span class='warning'>\The [LA] [direction == UP ? "above" : "below"] must be secured and welded.</span>")
return
maps/tether/tether_defines.dm
+1
View File
@@ -363,6 +363,7 @@
name = "Asteroid 1"
base_turf = /turf/space
transit_chance = 33
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT|MAP_LEVEL_PERSIST|MAP_LEVEL_BELOW_BLOCKED
holomap_offset_x = TETHER_HOLOMAP_MARGIN_X + TETHER_HOLOMAP_CENTER_GUTTER + TETHER_MAP_SIZE
holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE
maps/~map_system/maps.dm
+4
View File
@@ -38,6 +38,7 @@ var/list/all_maps = list()
var/static/list/hidden_levels = list() // Z-levels who's contents are hidden, but not forbidden (gateways)
var/static/list/empty_levels = list() // Empty Z-levels that may be used for various things
var/static/list/mappable_levels = list()// List of levels where mapping or other similar devices might work fully
var/static/list/below_blocked_levels = list()// List of levels where mapping or other similar devices might work fully
// End Static Lists
// Z-levels available to various consoles, such as the crew monitor. Defaults to station_levels if unset.
@@ -312,6 +313,9 @@ var/list/all_maps = list()
if(flags & MAP_LEVEL_CONSOLES)
if (!map.map_levels) map.map_levels = list()
map.map_levels += z
if(flags & MAP_LEVEL_BELOW_BLOCKED)
if (!map.below_blocked_levels) map.below_blocked_levels = list()
map.below_blocked_levels += z
if(base_turf)
map.base_turf_by_z["[z]"] = base_turf
if(transit_chance)