diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index a1fd15b806..05105dca1e 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 = list("spiders", "space", "security", "clowns", "greytide", "lizards", "skeletons", "snakes", "robots", "doctors", "authority", "the supernatural", - "aliens", "strangers", "birds", "falling", "anime", "mimes" + "aliens", "strangers", "birds", "falling", "anime", "mimes", "cats" ) phobia_words = list("spiders" = strings(PHOBIA_FILE, "spiders"), @@ -35,7 +35,8 @@ SUBSYSTEM_DEF(traumas) "birds" = strings(PHOBIA_FILE, "birds"), "falling" = strings(PHOBIA_FILE, "falling"), "anime" = strings(PHOBIA_FILE, "anime"), - "mimes" = strings(PHOBIA_FILE, "mimes") + "mimes" = strings(PHOBIA_FILE, "mimes"), + "cats" = strings(PHOBIA_FILE, "cats") ) phobia_mobs = list("spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)), @@ -54,7 +55,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)), + "cats"= typecacheof(list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/hostile/cat_butcherer)) ) @@ -152,7 +154,10 @@ SUBSYSTEM_DEF(traumas) /obj/item/storage/backpack/mime, /obj/item/reagent_containers/food/snacks/grown/banana/mime, /obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime, /obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime, - /obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)) + /obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)), + + "cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty, + /obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)) ) phobia_turfs = list("space" = typecacheof(list(/turf/open/space, /turf/open/floor/holofloor/space, /turf/open/floor/fakespace)), @@ -170,7 +175,8 @@ SUBSYSTEM_DEF(traumas) "the supernatural" = typecacheof(list(/datum/species/golem/clockwork, /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)), + "cats" = typecacheof(list(/datum/species/human/felinid)) ) return ..() diff --git a/strings/phobia.json b/strings/phobia.json index 3f56751333..e1ae1f4e13 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -257,6 +257,19 @@ "fowl" ], +"cats": [ + "mew", + "nya", + "moew", + "feline", + "cat", + "neko", + "viola", + "kitty", + "purr", + "headpat" + ], + "falling": [ "hold on", "hang in there", @@ -297,4 +310,4 @@ "ora", "~" ] -} \ No newline at end of file +}