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/projectiles/guns/ballistic/revolver.dm
-4
View File
@@ -349,11 +349,7 @@
clumsy_check = 0
/obj/item/gun/ballistic/revolver/reverse/can_trigger_gun(mob/living/user)
<<<<<<< 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 ..()
if(process_fire(user, user, 0, zone_override = "head"))
user.visible_message("<span class='warning'>[user] somehow manages to shoot [user.p_them()]self in the face!</span>", "<span class='userdanger'>You somehow shoot yourself in the face! How the hell?!</span>")