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

[MIRROR] Fixes some pacifism oversights (#260)

Browse Source 
* Fixes some pacifism oversights (#52820)

* Fixes some pacifism oversights

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-08-10 23:15:20 +01:00
committed by GitHub
co-authored by ArcaneDefence
parent c5fd3ba39c
commit 0b5b2b16dd
6 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/necropolis_chests.dm
+3
View File
@@ -1181,6 +1181,9 @@
var/turf/T = get_turf(target)
if(!T || timer > world.time)
return
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "<span class='warning'>You can't bring yourself to fire \the [src]! You don't want to risk harming anyone...</span>")
return
calculate_anger_mod(user)
timer = world.time + CLICK_CD_MELEE //by default, melee attacks only cause melee blasts, and have an accordingly short cooldown
if(proximity_flag)