cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-30 16:47:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

move landmark flags to a landmark_flags var

Browse Source
This commit is contained in:
spookerton
2022-10-18 09:36:41 +01:00
parent ffba11e5ab
commit a5e55778da
7 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/ships/landable.dm
+2 -2
View File
@@ -84,7 +84,7 @@
/obj/effect/shuttle_landmark/ship
name = "Open Space"
landmark_tag = "ship"
atom_flags = LANDMARK_REMOVES_GRAVITY // *Not* AUTOSET, these must be world.turf and world.area for lazy loading to work.
landmark_flags = LANDMARK_REMOVES_GRAVITY // *Not* AUTOSET, these must be world.turf and world.area for lazy loading to work.
var/shuttle_name
var/list/visitors // landmark -> visiting shuttle stationed there
@@ -117,7 +117,7 @@
//
/obj/effect/shuttle_landmark/visiting_shuttle
atom_flags = LANDMARK_CREATES_SAFE_SITE | LANDMARK_REMOVES_GRAVITY
landmark_flags = LANDMARK_CREATES_SAFE_SITE | LANDMARK_REMOVES_GRAVITY
var/obj/effect/shuttle_landmark/ship/core_landmark
/obj/effect/shuttle_landmark/visiting_shuttle/Initialize(mapload, obj/effect/shuttle_landmark/ship/master, _name)
code/modules/shuttles/landmarks.dm
+4 -3
View File
@@ -7,7 +7,8 @@
unacidable = 1
simulated = 0
invisibility = 101
atom_flags = LANDMARK_CREATES_SAFE_SITE // We generally want to use current area/turf as base.
var/landmark_flags = LANDMARK_CREATES_SAFE_SITE // We generally want to use current area/turf as base.
//ID of the landmark
var/landmark_tag
@@ -30,7 +31,7 @@
. = INITIALIZE_HINT_LATELOAD
// Even if this flag is set, hardcoded values take precedence.
if(atom_flags & LANDMARK_CREATES_SAFE_SITE)
if(landmark_flags & LANDMARK_CREATES_SAFE_SITE)
if(ispath(base_area))
var/area/A = locate(base_area)
if(!istype(A))
@@ -123,7 +124,7 @@
/obj/effect/shuttle_landmark/automatic
name = "Navpoint"
landmark_tag = "navpoint"
atom_flags = LANDMARK_CREATES_SAFE_SITE
landmark_flags = LANDMARK_CREATES_SAFE_SITE
/obj/effect/shuttle_landmark/automatic/Initialize()
landmark_tag += "-[x]-[y]-[z]-[random_id("landmarks",1,9999)]"
code/modules/shuttles/shuttle.dm
+1 -1
View File
@@ -290,7 +290,7 @@
// If shuttle has no internal gravity, update our gravity with destination gravity
if((flags & SHUTTLE_FLAGS_ZERO_G))
var/new_grav = 1
if(destination.atom_flags & LANDMARK_REMOVES_GRAVITY)
if(destination.landmark_flags & LANDMARK_REMOVES_GRAVITY)
var/area/new_area = get_area(destination)
new_grav = new_area.has_gravity
for(var/area/our_area in shuttle_area)
code/modules/shuttles/shuttle_autodock.dm
+1 -1
View File
@@ -215,4 +215,4 @@
return //do nothing for now
/obj/effect/shuttle_landmark/transit
atom_flags = LANDMARK_REMOVES_GRAVITY|LANDMARK_CREATES_SAFE_SITE
landmark_flags = LANDMARK_REMOVES_GRAVITY | LANDMARK_CREATES_SAFE_SITE