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/mining/lavaland/necropolis_chests.dm
+4
View File
@@ -656,7 +656,11 @@
playsound(user, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
/obj/item/melee/transforming/cleaving_saw/clumsy_transform_effect(mob/living/user)
<<<<<<< HEAD
if(user.disabilities & CLUMSY && prob(50))
=======
if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
to_chat(user, "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>")
user.take_bodypart_damage(10)