cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +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/game/objects/items.dm
+6 -6
View File
@@ -234,7 +234,7 @@
if(armor[type])
AddComponent(/datum/component/armor, armor)
break
if(flags & HELDMAPTEXT)
if(item_flags & ITEM_FLAG_HELD_MAP_TEXT)
set_initial_maptext()
check_maptext()
@@ -520,7 +520,7 @@
/obj/item/proc/pickup(mob/user)
pixel_x = 0
pixel_y = 0
if(flags & HELDMAPTEXT)
if(item_flags & ITEM_FLAG_HELD_MAP_TEXT)
addtimer(CALLBACK(src, PROC_REF(check_maptext)), 1) // invoke async does not work here
do_pickup_animation(user)
@@ -710,7 +710,7 @@ var/list/global/slot_flags_enumeration = list(
// override for give shenanigans
/obj/item/proc/on_give(var/mob/giver, var/mob/receiver)
if(flags & HELDMAPTEXT)
if(item_flags & ITEM_FLAG_HELD_MAP_TEXT)
check_maptext()
//This proc is executed when someone clicks the on-screen UI button. To make the UI button show, set the 'icon_action_button' to the icon_state of the image of the button in screen1_action.dmi
@@ -784,7 +784,7 @@ var/list/global/slot_flags_enumeration = list(
M.eye_blurry += rand(3,4)
/obj/item/proc/protects_eyestab(var/obj/stab_item, var/stabbed = FALSE) // if stabbed is set to true if we're being stabbed and not just checking
if((item_flags & THICKMATERIAL) && (body_parts_covered & EYES))
if((item_flags & ITEM_FLAG_THICK_MATERIAL) && (body_parts_covered & EYES))
return TRUE
return FALSE
@@ -1177,12 +1177,12 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
/obj/item/throw_at()
..()
if(flags & HELDMAPTEXT)
if(item_flags & ITEM_FLAG_HELD_MAP_TEXT)
check_maptext()
/obj/item/dropped(var/mob/user)
..()
if(flags & HELDMAPTEXT)
if(item_flags & ITEM_FLAG_HELD_MAP_TEXT)
check_maptext()
// used to check whether the item is capable of popping things like balloons, inflatable barriers, or cutting police tape.