From 11fe1d2f1164a8ab1d4b73660f43afddeff6b5bb Mon Sep 17 00:00:00 2001 From: Skippu <37200424+SkippuSetsuna@users.noreply.github.com> Date: Thu, 23 Aug 2018 09:10:37 -0500 Subject: [PATCH] Added anime to the list of phobias in phobia.dm, and traumas.dm. (#39840) * Added "anime" to phobia.json. * Added anime and other weeb items to the traumas.dm * Update traumas.dm * added sashimi and sake under phobia_objs = list in traumas.dm * Added throwing stars under phobia_objs in traumas.dm * Added more phrases under "anime" added ninja and uguu, I was dumb and had a bracket facing the wrong way. * Missing " after anime on line 141 * Update traumas.dm * Missing / on line 142 * removed unesscary procs under phobia_objs * Update traumas.dm * Update traumas.dm --- code/controllers/subsystem/traumas.dm | 16 ++++++++++------ strings/phobia.json | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index fb92fc37ab4..834f49298d1 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") + "aliens", "strangers", "birds", "falling", "anime") phobia_words = list("spiders" = strings(PHOBIA_FILE, "spiders"), "space" = strings(PHOBIA_FILE, "space"), @@ -32,7 +32,8 @@ SUBSYSTEM_DEF(traumas) "strangers" = strings(PHOBIA_FILE, "strangers"), "conspiracies" = strings(PHOBIA_FILE, "conspiracies"), "birds" = strings(PHOBIA_FILE, "birds"), - "falling" = strings(PHOBIA_FILE, "falling") + "falling" = strings(PHOBIA_FILE, "falling"), + "anime" = strings(PHOBIA_FILE, "anime") ) phobia_mobs = list("spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)), @@ -135,9 +136,12 @@ SUBSYSTEM_DEF(traumas) /obj/item/clothing/suit/chickensuit, /obj/item/clothing/head/chicken, /obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/owl, /obj/item/clothing/mask/gas/owl_mask, /obj/item/clothing/under/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin, - /obj/item/clothing/head/helmet/space/freedom, /obj/item/clothing/suit/space/freedom)) - ) - + /obj/item/clothing/head/helmet/space/freedom, /obj/item/clothing/suit/space/freedom)), + + "anime" = typecacheof(list(/obj/item/clothing/under/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, + /obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star)) + ) + phobia_turfs = list("space" = typecacheof(list(/turf/open/space, /turf/open/floor/holofloor/space, /turf/open/floor/fakespace)), "the supernatural" = typecacheof(list(/turf/open/floor/clockwork, /turf/closed/wall/clockwork, /turf/open/floor/plasteel/cult, /turf/closed/wall/mineral/cult)), @@ -153,7 +157,7 @@ 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)) - ) + ) return ..() diff --git a/strings/phobia.json b/strings/phobia.json index 379dd1829a1..e98e0dcf05d 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -257,5 +257,19 @@ "let go", "i'll catch you", "slip" + ], +"anime": [ + "anime", + "manga", + "baka", + "desu", + "sugoi", + "katana", + "weeb", + "otaku", + "catgirl", + "catgirls", + "ninja", + "uguu" ] }