Merge pull request #19304 from lordpidey/flyswatters

Flyswatters
This commit is contained in:
oranges
2016-07-17 11:51:57 +12:00
committed by GitHub
6 changed files with 41 additions and 2 deletions
+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
*/