cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +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/structures.dm
+4 -4
View File
@@ -128,7 +128,7 @@
var/obj/structure/S = O
if(S.climbable)
continue
if(O && O.density && !(O.flags & ON_BORDER)) //ON_BORDER structures are handled by the Adjacent() check.
if(O && O.density && !(O.atom_flags & ATOM_FLAG_CHECKS_BORDER)) //ATOM_FLAG_CHECKS_BORDER structures are handled by the Adjacent() check.
if(exclude_self && O == src)
continue
return O
@@ -138,7 +138,7 @@
if (!can_climb(user))
return
user.visible_message(SPAN_WARNING("[user] starts [flags & ON_BORDER ? "leaping over" : "climbing onto"] \the [src]!"))
user.visible_message(SPAN_WARNING("[user] starts [atom_flags & ATOM_FLAG_CHECKS_BORDER ? "leaping over" : "climbing onto"] \the [src]!"))
LAZYADD(climbers, user)
if(!do_after(user, 5 SECONDS, src, DO_DEFAULT | DO_USER_UNIQUE_ACT))
@@ -150,12 +150,12 @@
return
var/turf/TT = get_turf(src)
if(flags & ON_BORDER)
if(atom_flags & ATOM_FLAG_CHECKS_BORDER)
TT = get_step(get_turf(src), dir)
if(user.loc == TT)
TT = get_turf(src)
user.visible_message("<span class='warning'>[user] [flags & ON_BORDER ? "leaps over" : "climbs onto"] \the [src]!</span>")
user.visible_message("<span class='warning'>[user] [atom_flags & ATOM_FLAG_CHECKS_BORDER ? "leaps over" : "climbs onto"] \the [src]!</span>")
user.forceMove(TT)
LAZYREMOVE(climbers, user)