[MIRROR] [s]Add pacifism checks for screwdriver/bottle attacks (#7092)
* Add pacifism check for screwdriver/bottle attacks (#38416) * [s]Add pacifism checks for screwdriver/bottle attacks
This commit is contained in:
committed by
kevinz000
parent
70262537c2
commit
46b2bc0c63
@@ -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)
|
||||
|
||||
@@ -51,6 +51,9 @@
|
||||
if(user.a_intent != INTENT_HARM || !isGlass)
|
||||
return ..()
|
||||
|
||||
if(user.has_trait(TRAIT_PACIFISM))
|
||||
to_chat(user, "<span class='warning'>You don't want to harm [target]!</span>")
|
||||
return
|
||||
|
||||
force = 15 //Smashing bottles over someoen's head hurts.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user