replaces atom.initialized with ATOM_INITIALIZED

refactors atom/var/flags to atom_flags and area_flags
moves NOBLOODY, NOBLUDGEON, and PHORONGUARD to item_flags instead of atom_flags
corrects various misapplied flags
This commit is contained in:
spookerton
2022-10-18 09:36:36 +01:00
parent 650ee09942
commit 3abdbbaa1c
150 changed files with 414 additions and 431 deletions
+3 -3
View File
@@ -7,7 +7,7 @@
unacidable = 1
simulated = 0
invisibility = 101
flags = SLANDMARK_FLAG_AUTOSET // We generally want to use current area/turf as base.
atom_flags = SLANDMARK_FLAG_AUTOSET // We generally want to use current area/turf as base.
//ID of the landmark
var/landmark_tag
@@ -30,7 +30,7 @@
. = INITIALIZE_HINT_LATELOAD
// Even if this flag is set, hardcoded values take precedence.
if(flags & SLANDMARK_FLAG_AUTOSET)
if(atom_flags & SLANDMARK_FLAG_AUTOSET)
if(ispath(base_area))
var/area/A = locate(base_area)
if(!istype(A))
@@ -123,7 +123,7 @@
/obj/effect/shuttle_landmark/automatic
name = "Navpoint"
landmark_tag = "navpoint"
flags = SLANDMARK_FLAG_AUTOSET
atom_flags = SLANDMARK_FLAG_AUTOSET
/obj/effect/shuttle_landmark/automatic/Initialize()
landmark_tag += "-[x]-[y]-[z]-[random_id("landmarks",1,9999)]"
+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.flags & SLANDMARK_FLAG_ZERO_G)
if(destination.atom_flags & SLANDMARK_FLAG_ZERO_G)
var/area/new_area = get_area(destination)
new_grav = new_area.has_gravity
for(var/area/our_area in shuttle_area)
+1 -1
View File
@@ -215,4 +215,4 @@
return //do nothing for now
/obj/effect/shuttle_landmark/transit
flags = SLANDMARK_FLAG_ZERO_G|SLANDMARK_FLAG_AUTOSET
atom_flags = SLANDMARK_FLAG_ZERO_G|SLANDMARK_FLAG_AUTOSET