cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 08:36:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mickyan
2018-06-13 09:22:26 +02:00
committed by Tad Hardesty
parent 50467ef837
commit eb9fa0d8f5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+3
View File
@@ -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.