From b35398f71b8464080fdad98533467573d52efabd Mon Sep 17 00:00:00 2001 From: Mike Long Date: Tue, 12 Jul 2016 20:28:55 -0400 Subject: [PATCH] Changes destroy to qdels Changes flyswatter sound to snap.ogg --- code/game/objects/items/weapons/weaponry.dm | 1 + code/modules/mob/living/simple_animal/hostile/bees.dm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index fed9b968cb9..23b8c8bed37 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -324,4 +324,5 @@ force = 1 throwforce = 1 attack_verb = list("swatted", "smacked") + hitsound = 'sound/effects/snap.ogg' w_class = 2 diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index fb66cae015a..790568a1de1 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -248,7 +248,7 @@ if(istype(I, /obj/item/weapon/melee/flyswatter)) user << "You easily splat the [src]." new /obj/effect/decal/cleanable/deadcockroach(get_turf(src)) - Destroy() + qdel(src) /obj/item/queen_bee name = "queen bee" @@ -285,7 +285,7 @@ if(istype(I,/obj/item/weapon/melee/flyswatter)) user << "You easily splat the [src]." new /obj/effect/decal/cleanable/deadcockroach(get_turf(src)) - Destroy() + qdel(src) ..()