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

[MIRROR] Pacifists can no longer swat bugs (#4721)

Browse Source 
* Pacifists can no longer swat bugs (#58177)

Co-authored-by: Thunder12345 <stewart@ critar.demon.co.uk>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Pacifists can no longer swat bugs

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: Thunder12345 <stewart@ critar.demon.co.uk>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-04-07 15:53:36 +02:00
committed by GitHub
parent 2a1e08a71b
commit fbab6ba7d5
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weaponry.dm
+8 -7
View File
@@ -733,13 +733,14 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
. = ..()
if(proximity_flag)
if(is_type_in_typecache(target, strong_against))
new /obj/effect/decal/cleanable/insectguts(target.drop_location())
to_chat(user, "<span class='warning'>You easily splat the [target].</span>")
if(istype(target, /mob/living/))
var/mob/living/bug = target
bug.death(1)
else
qdel(target)
if(!HAS_TRAIT(user, TRAIT_PACIFISM))
new /obj/effect/decal/cleanable/insectguts(target.drop_location())
to_chat(user, "<span class='warning'>You easily splat [target].</span>")
if(isliving(target))
var/mob/living/bug = target
bug.gib()
else
qdel(target)
/obj/item/proc/can_trigger_gun(mob/living/user)
if(!user.can_use_guns(src))