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

Moves splat code to afterattack

Browse Source 
You may now splat cockroaches and butterflies.
This commit is contained in:
Mike Long
2016-07-14 10:44:33 -04:00
parent e44a7fb7aa
commit b23ac08a41
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/weaponry.dm
+12
View File
@@ -326,3 +326,15 @@
attack_verb = list("swatted", "smacked")
hitsound = 'sound/effects/snap.ogg'
w_class = 2
/obj/item/weapon/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)
if(proximity_flag)
if(istype(target, /mob/living/simple_animal/hostile/poison/bees/) || istype(target, /mob/living/simple_animal/butterfly) || istype(target, /mob/living/simple_animal/cockroach))
var/mob/living/simple_animal/bug = target
new /obj/effect/decal/cleanable/deadcockroach(get_turf(bug))
bug.death(1)
user << "<span class='warning'>You easily splat the [bug].</span>"
else if(istype(target, /obj/item/queen_bee/))
qdel(target)
new /obj/effect/decal/cleanable/deadcockroach(get_turf(target))
user << "<span class='warning'>You easily splat the [target].</span>"