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/projectiles/pins.dm
+4
View File
@@ -129,7 +129,11 @@
// A gun with ultra-honk pin is useful for clown and useless for everyone else.
/obj/item/device/firing_pin/clown/ultra/pin_auth(mob/living/user)
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
<<<<<<< HEAD
if(!(user.disabilities & CLUMSY) && !(user.mind && user.mind.assigned_role == "Clown"))
=======
if(!(user.has_disability(DISABILITY_CLUMSY)) && !(user.mind && user.mind.assigned_role == "Clown"))
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
return 0
return 1