From 11fda03cc468f94b708c49c908d8f64fdd78fc8d Mon Sep 17 00:00:00 2001 From: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com> Date: Mon, 20 Jul 2020 16:27:55 -0500 Subject: [PATCH] Insect phobia (#52261) * Add insect phobia applies to moths, flies, and cockroaches * Adds bee content --- code/controllers/subsystem/traumas.dm | 15 ++++++++++----- code/datums/brain_damage/phobia.dm | 4 ++++ strings/phobia.json | 13 +++++++++++++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 16b77638af2..f6953ef5917 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(traumas) //phobia types is to pull from randomly for brain traumas, e.g. conspiracies is for special assignment only phobia_types = sortList(list("spiders", "space", "security", "clowns", "greytide", "lizards", "skeletons", "snakes", "robots", "doctors", "authority", "the supernatural", - "aliens", "strangers", "birds", "falling", "anime")) + "aliens", "strangers", "birds", "falling", "anime", "insects")) phobia_regexes = list("spiders" = construct_phobia_regex("spiders"), "space" = construct_phobia_regex("space"), @@ -33,7 +33,8 @@ SUBSYSTEM_DEF(traumas) "conspiracies" = construct_phobia_regex("conspiracies"), "birds" = construct_phobia_regex("birds"), "falling" = construct_phobia_regex("falling"), - "anime" = construct_phobia_regex("anime") + "anime" = construct_phobia_regex("anime"), + "insects" = construct_phobia_regex("insects") ) phobia_mobs = list("spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)), @@ -51,7 +52,8 @@ SUBSYSTEM_DEF(traumas) /mob/living/simple_animal/pet/penguin)), "birds" = typecacheof(list(/mob/living/simple_animal/parrot, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken, /mob/living/simple_animal/pet/penguin)), - "anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian)) + "anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian)), + "insects" = typecacheof(list(/mob/living/simple_animal/hostile/cockroach, /mob/living/simple_animal/hostile/poison/bees)) ) phobia_objs = list("snakes" = typecacheof(list(/obj/item/rod_of_asclepius, /obj/item/toy/plush/snakeplushie)), @@ -140,7 +142,9 @@ SUBSYSTEM_DEF(traumas) "anime" = typecacheof(list(/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi, /obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja, /obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/vibro_weapon, - /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe)) + /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe)), + + "insects" = typecacheof(list(/obj/item/toy/plush/moth, /obj/item/toy/plush/beeplushie, /obj/item/clothing/mask/rat/bee, /obj/item/clothing/suit/hooded/bee_costume, /obj/structure/beebox)) ) phobia_turfs = list("space" = typecacheof(list(/turf/open/space, /turf/open/floor/holofloor/space, /turf/open/floor/fakespace)), @@ -157,7 +161,8 @@ SUBSYSTEM_DEF(traumas) "the supernatural" = typecacheof(list(/datum/species/golem/runic)), "aliens" = typecacheof(list(/datum/species/abductor, /datum/species/jelly, /datum/species/pod, /datum/species/shadow)), - "anime" = typecacheof(list(/datum/species/human/felinid)) + "anime" = typecacheof(list(/datum/species/human/felinid)), + "insects" = typecacheof(list(/datum/species/fly, /datum/species/moth)) ) return ..() diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index f35af4f1ca9..f23e08f8d13 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -195,3 +195,7 @@ /datum/brain_trauma/mild/phobia/conspiracies phobia_type = "conspiracies" random_gain = FALSE + +/datum/brain_trauma/mild/phobia/insects + phobia_type = "insects" + random_gain = FALSE diff --git a/strings/phobia.json b/strings/phobia.json index 72eeb39373e..440057928e8 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -284,5 +284,18 @@ "neet", "ora", "~" + ], +"insects": [ + "fly", + "moth", + "buzz", + "flutter", + "insect", + "moff", + "roach", + "cockroach", + "glockroach", + "bee", + "sting" ] }