Split up and rename var/flags (#17794)

* Split up and rename `var/flags`

* Various fixes

* CL

* Don't rename Phoron Guard phoron preset

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
Cody Brittain
2023-11-22 16:27:51 +00:00
committed by GitHub
co-authored by Cody Brittain
parent 4b9303a1e9
commit 06601c9ec3
335 changed files with 763 additions and 674 deletions
@@ -5,7 +5,7 @@
density = TRUE
throwpass = TRUE //You can throw objects over this, despite its density.
layer = BELOW_OBJ_LAYER
flags = ON_BORDER
atom_flags = ATOM_FLAG_CHECKS_BORDER
var/stack_type //The type of stack the barricade dropped when disassembled if any.
var/stack_amount = 5 //The amount of stack dropped when disassembled at full health
@@ -776,7 +776,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140)
w_class = ITEMSIZE_SMALL
item_state = "electronic"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
/obj/item/device/cratescanner/proc/print_contents(targetname, targetcontents, targetloc)
+2 -2
View File
@@ -8,7 +8,7 @@
icon_state = "grille"
density = TRUE
anchored = TRUE
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
explosion_resistance = 1
layer = 2.98
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
@@ -215,7 +215,7 @@
return
//window placing end
else if(!(W.flags & CONDUCT) || !shock(user, 70))
else if(!(W.obj_flags & OBJ_FLAG_CONDUCTABLE) || !shock(user, 70))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.do_attack_animation(src)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+1 -1
View File
@@ -10,7 +10,7 @@
anchored = FALSE
density = TRUE
climbable = TRUE
flags = OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
build_amt = 15
slowdown = 0
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "mopbucket"
density = 1
w_class = ITEMSIZE_NORMAL
flags = OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
var/bucketsize = 600 //about 2x the size relative to a regular bucket.
+2 -2
View File
@@ -9,7 +9,7 @@
layer = OBJ_LAYER
anchored = FALSE
flags = ON_BORDER
atom_flags = ATOM_FLAG_CHECKS_BORDER
obj_flags = OBJ_FLAG_ROTATABLE|OBJ_FLAG_MOVES_UNSUPPORTED
build_amt = 2
@@ -300,7 +300,7 @@
return FALSE
for(var/atom/A in destination_turf.contents - src)
if(A.density && !(A.flags & ON_BORDER))
if(A.density && !(A.atom_flags & ATOM_FLAG_CHECKS_BORDER))
to_chat(user, SPAN_DANGER("You can't climb there, the way is blocked."))
return FALSE
+1 -1
View File
@@ -57,7 +57,7 @@
matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50)
recyclable = TRUE
w_class = ITEMSIZE_TINY
flags = NOBLUDGEON
atom_flags = ITEM_FLAG_NO_BLUDGEON
var/datum/weakref/thrall = null
var/time_counter = 0
var/closed = FALSE
@@ -18,7 +18,7 @@
density = 0
dir = NORTH
w_class = ITEMSIZE_NORMAL
flags = ON_BORDER
atom_flags = ATOM_FLAG_CHECKS_BORDER
var/obj/item/airlock_electronics/electronics = null
@@ -271,7 +271,7 @@
if (obstacle == src)
continue
if((obstacle.flags & ON_BORDER) && obstacle.dir == targetdir)
if((obstacle.atom_flags & ATOM_FLAG_CHECKS_BORDER) && obstacle.dir == targetdir)
to_chat(usr, SPAN_WARNING("You can't turn the windoor assembly that way, there's already something there!"))
return
+5 -5
View File
@@ -14,7 +14,7 @@
w_class = ITEMSIZE_NORMAL
layer = WINDOW_PANE_LAYER
anchored = TRUE
flags = ON_BORDER
atom_flags = ATOM_FLAG_CHECKS_BORDER
obj_flags = OBJ_FLAG_ROTATABLE|OBJ_FLAG_MOVES_UNSUPPORTED
var/hitsound = 'sound/effects/glass_hit.ogg'
var/maxhealth = 14
@@ -258,7 +258,7 @@
grab_smash_attack(G, DAMAGE_BRUTE)
return
if(W.flags & NOBLUDGEON)
if(W.item_flags & ITEM_FLAG_NO_BLUDGEON)
return
if(W.isscrewdriver() && user.a_intent != I_HURT)
@@ -538,7 +538,7 @@
icon = 'icons/obj/smooth/shuttle_window.dmi'
icon_state = "shuttle_window"
basestate = "window"
flags = 0
atom_flags = 0
obj_flags = null
maxhealth = 40
reinf = TRUE
@@ -614,7 +614,7 @@
/obj/structure/window/full
name = "window"
desc = "You aren't supposed to see this."
flags = 0
atom_flags = 0
obj_flags = null
dir = 5
maxhealth = 28 // Two glass panes worth of health, since that's the minimum you need to break through to get to the other side.
@@ -665,7 +665,7 @@
grab_smash_attack(G, DAMAGE_BRUTE)
return
if(W.flags & NOBLUDGEON)
if(W.item_flags & ITEM_FLAG_NO_BLUDGEON)
return
if(W.isscrewdriver() && user.a_intent != I_HURT)