cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 14:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split up and rename var/flags (#17794)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers.dm
+5 -5
View File
@@ -80,7 +80,7 @@
return
if(fragile && (speed >= fragile))
shatter()
if(flags && NOREACT)
if(atom_flags && ATOM_FLAG_NO_REACT)
return
if(!reagents)
return
@@ -99,7 +99,7 @@
var/obj/item/reagent_containers/food/snacks/dipped = W
dipped.attempt_apply_coating(src, user)
return
if(!(W.flags & NOBLUDGEON) && (user.a_intent == I_HURT) && fragile && (W.force > fragile))
if(!(W.item_flags & ITEM_FLAG_NO_BLUDGEON) && (user.a_intent == I_HURT) && fragile && (W.force > fragile))
if(do_after(user, 1 SECOND, src))
if(!QDELETED(src))
visible_message(SPAN_WARNING("[user] smashes [src] with \a [W]!"))
@@ -129,9 +129,9 @@
if(standard_splash_obj(user, target))
return
if(istype(target, /obj/))
var/obj/O = target
if(!(O.flags & NOBLUDGEON) && reagents)
if(istype(target, /obj/item))
var/obj/item/O = target
if(!(O.item_flags & ITEM_FLAG_NO_BLUDGEON) && reagents)
reagents.apply_force(O.force)
return ..()