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

[MIRROR] [s]Add pacifism checks for screwdriver/bottle attacks (#7092)

Browse Source 
* Add pacifism check for screwdriver/bottle attacks (#38416)

* [s]Add pacifism checks for screwdriver/bottle attacks
This commit is contained in:
CitadelStationBot
2018-06-15 04:42:35 -05:00
committed by kevinz000
parent 70262537c2
commit 46b2bc0c63
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/tools/screwdriver.dm
+3
View File
@@ -75,6 +75,9 @@
return ..()
if(user.zone_selected != BODY_ZONE_PRECISE_EYES && user.zone_selected != BODY_ZONE_HEAD)
return ..()
if(user.has_trait(TRAIT_PACIFISM))
to_chat(user, "<span class='warning'>You don't want to harm [M]!</span>")
return
if(user.has_trait(TRAIT_CLUMSY) && prob(50))
M = user
return eyestab(M,user)