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 11:45:45 -05: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/modules/mob/status_procs.dm
+15 -1
View File
@@ -1,7 +1,7 @@
//Here are the procs used to modify status effects of a mob.
//The effects include: stun, knockdown, unconscious, sleeping, resting, jitteriness, dizziness, ear damage,
// eye damage, eye_blind, eye_blurry, druggy, BLIND disability, and NEARSIGHT disability.
// eye damage, eye_blind, eye_blurry, druggy, DISABILITY_BLIND disability, and DISABILITY_NEARSIGHT disability.
/////////////////////////////////// STUN ////////////////////////////////////
@@ -162,6 +162,13 @@
var/blind_minimum = 0
if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND))
blind_minimum = 1
<<<<<<< HEAD
=======
if(isliving(src))
var/mob/living/L = src
if(L.has_disability(DISABILITY_BLIND))
blind_minimum = 1
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
eye_blind = max(eye_blind+amount, blind_minimum)
if(!eye_blind)
clear_alert("blind")
@@ -179,6 +186,13 @@
var/blind_minimum = 0
if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND))
blind_minimum = 1
<<<<<<< HEAD
=======
if(isliving(src))
var/mob/living/L = src
if(L.has_disability(DISABILITY_BLIND))
blind_minimum = 1
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
eye_blind = blind_minimum
if(!eye_blind)
clear_alert("blind")