[MIRROR] Kills BOTH /poison paths by turning poisonous into an element. (+fantasty prefix, sanity on attackingtarget signal, and more) (#5586)

* Kills BOTH /poison paths by turning poisonous into an element. (+fantasty prefix, sanity on attackingtarget signal, and more) (#58882)

* Kills BOTH /poison paths by turning poisonous into an element. (+fantasty prefix, sanity on attackingtarget signal, and more)

* AAAAAAAA

* Update spellbook.dm

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-05-10 15:12:34 +01:00
committed by GitHub
co-authored by tralezab Gandalf
parent c8c2931552
commit 01a2d62e9e
49 changed files with 333 additions and 252 deletions
+1 -1
View File
@@ -416,7 +416,7 @@
bite_consumption = 20
food_reagents = list(/datum/reagent/consumable/honey = 10, /datum/reagent/toxin = 5, /datum/reagent/medicine/strange_reagent = 1)
tastes = list("buzzing" = 1, "honey" = 1, "regret" = 1)
spawned_mob = /mob/living/simple_animal/hostile/poison/bees
spawned_mob = /mob/living/simple_animal/hostile/bee
/obj/item/food/stewedsoymeat
name = "stewed soy meat"
@@ -44,7 +44,7 @@
name = "Buzzkill grenade"
desc = "The label reads: \"WARNING: DEVICE WILL RELEASE LIVE SPECIMENS UPON ACTIVATION. SEAL SUIT BEFORE USE.\" It is warm to the touch and vibrates faintly."
icon_state = "holy_grenade"
spawner_type = /mob/living/simple_animal/hostile/poison/bees/toxin
spawner_type = /mob/living/simple_animal/hostile/bee/toxin
deliveryamt = 10
/obj/item/grenade/spawnergrenade/clown
+1 -1
View File
@@ -732,7 +732,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/melee/flyswatter/Initialize()
. = ..()
strong_against = typecacheof(list(
/mob/living/simple_animal/hostile/poison/bees/,
/mob/living/simple_animal/hostile/bee/,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/hostile/cockroach,
/obj/item/queen_bee,