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

more save points

Browse Source
This commit is contained in:
LetterJay
2017-12-29 00:07:36 -06:00
parent b759da8c63
commit 8a792d6ef6
40 changed files with 4 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/status_procs.dm
-6
View File
@@ -162,13 +162,10 @@
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")
@@ -186,13 +183,10 @@
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")