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
+3 -2
View File
@@ -135,7 +135,7 @@ By design, d1 is the smallest direction and d2 is the highest
if(user.a_intent != I_HELP)
return
if(W.flags & CONDUCT)
if(W.obj_flags & OBJ_FLAG_CONDUCTABLE)
shock(user, 50, 0.7)
if(d1 == 12 || d2 == 12)
@@ -482,7 +482,8 @@ By design, d1 is the smallest direction and d2 is the highest
throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
recyclable = TRUE
flags = HELDMAPTEXT|CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
item_flags = ITEM_FLAG_HELD_MAP_TEXT
slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
stacktype = /obj/item/stack/cable_coil
+2 -2
View File
@@ -474,7 +474,7 @@
return
to_chat(user, SPAN_WARNING("You stick \the [W] into the light socket!"))
if(has_power() && (W.flags & CONDUCT))
if(has_power() && (W.obj_flags & OBJ_FLAG_CONDUCTABLE))
spark(src, 3)
if(prob(75))
electrocute_mob(user, get_area(src), src, rand(0.7,1.0))
@@ -482,7 +482,7 @@
/obj/machinery/light/proc/smash_check(var/obj/O, var/mob/living/user, var/others_text, var/self_text, var/only_break)
if(prob(1 + O.force * 5))
user.visible_message(SPAN_WARNING("\The [user] [others_text] \the [src]!"), SPAN_WARNING("You hit \the [src], and it [self_text]!"), SPAN_WARNING("You hear a tinkle of breaking glass!"))
if(!stat && (O.flags & CONDUCT))
if(!stat && (O.obj_flags & OBJ_FLAG_CONDUCTABLE))
if(prob(12))
electrocute_mob(user, get_area(src), src, 0.3)
if(only_break)
+1 -1
View File
@@ -469,7 +469,7 @@
board_path = "/obj/item/circuitboard/portgen/fusion"
anchored = TRUE
flags = OPENCONTAINER
atom_flags = ATOM_FLAG_OPEN_CONTAINER
var/coolant_volume = 360
var/coolant_use = 0.2
+1 -1
View File
@@ -34,7 +34,7 @@
to_chat(src, "<span class = 'warning'>The [S] pulls \the [hand] from your grip!</span>")
apply_damage(current_size * 3, DAMAGE_RADIATION, damage_flags = DAMAGE_FLAG_DISPERSED)
if(shoes)
if(shoes.item_flags & NOSLIP) return 0
if(shoes.item_flags & ITEM_FLAG_NO_SLIP) return 0
..()
/obj/singularity_act()
@@ -8,7 +8,7 @@
unacidable = 1
use_power = POWER_USE_OFF
light_range = 4
flags = PROXMOVE
movable_flags = MOVABLE_FLAG_PROXMOVE
var/obj/machinery/field_generator/FG1 = null
var/obj/machinery/field_generator/FG2 = null
var/has_shocked = 0 //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.