shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefixed all disability defines with DISABILITY_ to fix a name collision

Browse Source
This commit is contained in:
Jordan Brown
2017-12-24 15:03:30 -06:00
committed by CitadelStationBot
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm
+4
View File
@@ -110,7 +110,11 @@
if(!(BI.resistance_flags & ON_FIRE))
BI.fire_act()
continue
<<<<<<< HEAD
if(is_servant_of_ratvar(L) || (L.disabilities & BLIND) || L.null_rod_check())
=======
if(is_servant_of_ratvar(L) || (L.has_disability(DISABILITY_BLIND)) || L.null_rod_check())
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
continue
if(L.stat || L.restrained() || L.buckled || L.lying)
continue