Adds flyswatters.

They are availible in beekeeping crates.
They instantly kill bees, and deal large damage to flypeople, and negligible damage to non-flypeople.
This commit is contained in:
Mike Long
2016-07-12 19:47:03 -04:00
parent 7100277ca3
commit f1a1cafed4
7 changed files with 29 additions and 2 deletions
+12 -1
View File
@@ -313,4 +313,15 @@
/obj/item/weapon/melee/baseball_bat/attack(mob/living/target, mob/living/user)
. = ..()
var/atom/throw_target = get_edge_target_turf(target, user.dir)
target.throw_at(throw_target, rand(1,2), 7, user)
target.throw_at(throw_target, rand(1,2), 7, user)
/obj/item/weapon/melee/flyswatter
name = "Flyswatter"
desc = "Useful for killing insects of all sizes."
icon = 'icons/obj/weapons.dmi'
icon_state = "flyswatter"
item_state = "flyswatter"
force = 1
throwforce = 1
attack_verb = list("swatted", "smacked")
w_class = 2
+2 -1
View File
@@ -1036,7 +1036,8 @@
/obj/item/honey_frame,
/obj/item/queen_bee/bought,
/obj/item/clothing/head/beekeeper_head,
/obj/item/clothing/suit/beekeeper_suit)
/obj/item/clothing/suit/beekeeper_suit,
/obj/item/weapon/melee/flyswatter)
crate_name = "beekeeping starter crate"
/datum/supply_pack/organic/hydroponics/beekeeping_suits
@@ -623,6 +623,11 @@
"<span class='userdanger'>You throw up on the floor!</span>")
..()
/datum/species/fly/check_weakness(obj/item/weapon, mob/living/attacker)
if(istype(weapon,/obj/item/weapon/melee/flyswatter))
return 29 //Flyswatters deal 30x damage to flypeople.
return 0
/*
SKELETONS
*/
@@ -243,6 +243,12 @@
return 1
return 0
/mob/living/simple_animal/hostile/poison/bees/attacked_by(obj/item/I, mob/living/user)
. = ..()
if(istype(I, /obj/item/weapon/melee/flyswatter))
user << "<span class='warning'>You easily splat the [src].</span>"
new /obj/effect/decal/cleanable/deadcockroach(get_turf(src))
Destroy()
/obj/item/queen_bee
name = "queen bee"
@@ -276,6 +282,10 @@
name = queen.name
else
user << "<span class='warning'>You don't have enough units of that chemical to modify the bee's DNA!</span>"
if(istype(I,/obj/item/weapon/melee/flyswatter))
user << "<span class='warning'>You easily splat the [src].</span>"
new /obj/effect/decal/cleanable/deadcockroach(get_turf(src))
Destroy()
..()
Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB