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

save point - a lot of shit to fix

Browse Source
This commit is contained in:
LetterJay
2017-12-27 07:03:40 -06:00
parent 164db7ae9b c84a8cc9e1
commit 2e6b034493
39 changed files with 11 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/kitchen.dm
-8
View File
@@ -44,11 +44,7 @@
forkload = null
else if(user.zone_selected == "eyes")
<<<<<<< HEAD
if(user.disabilities & CLUMSY && prob(50))
=======
if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
M = user
return eyestab(M,user)
else
@@ -74,11 +70,7 @@
/obj/item/kitchen/knife/attack(mob/living/carbon/M, mob/living/carbon/user)
if(user.zone_selected == "eyes")
<<<<<<< HEAD
if(user.disabilities & CLUMSY && prob(50))
=======
if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
M = user
return eyestab(M,user)
else