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-17 15:23:31 +01:00
parent 650ee09942
commit 3abdbbaa1c
150 changed files with 414 additions and 431 deletions
+1 -2
View File
@@ -150,7 +150,7 @@
return
//window placing end
else if((W.flags & NOCONDUCT) || !shock(user, 70))
else if((W.atom_flags & NOCONDUCT) || !shock(user, 70))
user.setClickCooldown(user.get_attack_speed(W))
user.do_attack_animation(src)
playsound(src, 'sound/effects/grillehit.ogg', 80, 1)
@@ -286,4 +286,3 @@
health -= damage
spawn(1) healthcheck()
return 1
+2 -2
View File
@@ -8,7 +8,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
icon_state = "cart"
anchored = 0
density = 1
flags = OPENCONTAINER
atom_flags = OPENCONTAINER
climbable = TRUE
//copypaste sorry
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
@@ -304,7 +304,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
icon_state = "pussywagon"
anchored = 1
density = 1
flags = OPENCONTAINER
atom_flags = OPENCONTAINER
//copypaste sorry
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
var/obj/item/storage/bag/trash/mybag = null
+3 -3
View File
@@ -7,13 +7,13 @@
climbable = 1
anchored = 1
var/solidledge = 1
flags = ON_BORDER
atom_flags = ON_BORDER
layer = STAIRS_LAYER
icon_state = "ledge"
/obj/structure/ledge_corner
icon_state = "ledge-corner"
flags = 0
atom_flags = 0
name = "rock ledge"
desc = "An easily scaleable rocky ledge."
icon = 'icons/obj/ledges.dmi'
@@ -82,4 +82,4 @@
if(occupied)
to_chat(user, "<span class='danger'>You can't climb there, there's \a [occupied] in the way.</span>")
return 0
return 1
return 1
+1 -1
View File
@@ -7,7 +7,7 @@
climbable = 1
w_class = ITEMSIZE_NORMAL
pressure_resistance = 5
flags = OPENCONTAINER
atom_flags = OPENCONTAINER
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket)
+2 -2
View File
@@ -8,7 +8,7 @@
climbable = 1
layer = WINDOW_LAYER
anchored = 1
flags = ON_BORDER
atom_flags = ON_BORDER
icon_state = "railing0"
var/broken = FALSE
var/health = 70
@@ -326,5 +326,5 @@
if(istype(O,/obj/structure))
var/obj/structure/S = O
if(S.climbable) continue
if(O && O.density && !(O.flags & ON_BORDER && !(turn(O.dir, 180) & dir)))
if(O && O.density && !(O.atom_flags & ON_BORDER && !(turn(O.dir, 180) & dir)))
return O
+2 -2
View File
@@ -9,7 +9,7 @@
layer = WINDOW_LAYER
pressure_resistance = 4*ONE_ATMOSPHERE
anchored = 1.0
flags = ON_BORDER
atom_flags = ON_BORDER
var/maxhealth = 14.0
var/maximal_heat = T0C + 100 // Maximal heat before this window begins taking damage from fire
var/damage_per_fire_tick = 2.0 // Amount of damage per fire tick. Regular windows are not fireproof so they might as well break quickly.
@@ -262,7 +262,7 @@
hit(50)
return
if(W.flags & NOBLUDGEON) return
if(W.item_flags & NOBLUDGEON) return
if(W.is_screwdriver())
if(reinf && state >= 1)