Merge pull request #6310 from Citadel-Station-13/upstream-merge-36430

[MIRROR] Bird and Chasm phobias
2018-04-09 16:34:46 -05:00
parent 120457d8fd 373ab8224a
commit 5e7c47c9eb
2 changed files with 58 additions and 6 deletions
@@ -11,9 +11,10 @@ SUBSYSTEM_DEF(traumas)
 #define PHOBIA_FILE "phobia.json"

 /datum/controller/subsystem/traumas/Initialize()
+	//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")
+						"aliens", "strangers", "birds", "falling")

 	phobia_words = list("spiders"   = strings(PHOBIA_FILE, "spiders"),
 						"space"     = strings(PHOBIA_FILE, "space"),
@@ -29,7 +30,9 @@ SUBSYSTEM_DEF(traumas)
 						"the supernatural"	= strings(PHOBIA_FILE, "the supernatural"),
 						"aliens"	= strings(PHOBIA_FILE, "aliens"),
 						"strangers"	= strings(PHOBIA_FILE, "strangers"),
-						"conspiracies" = strings(PHOBIA_FILE, "conspiracies")
+						"conspiracies" = strings(PHOBIA_FILE, "conspiracies"),
+						"birds" = strings(PHOBIA_FILE, "birds"),
+						"falling" = strings(PHOBIA_FILE, "falling")
 					   )

 	phobia_mobs = list("spiders"  = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)),
@@ -44,7 +47,10 @@ SUBSYSTEM_DEF(traumas)
 					   /mob/living/simple_animal/hostile/clockwork, /mob/living/simple_animal/drone/cogscarab,
 					   /mob/living/simple_animal/revenant, /mob/living/simple_animal/shade)),
 					   "aliens"   = typecacheof(list(/mob/living/carbon/alien, /mob/living/simple_animal/slime)),
-					   "conspiracies" = typecacheof(list(/mob/living/simple_animal/bot/secbot, /mob/living/simple_animal/bot/ed209, /mob/living/simple_animal/drone))
+					   "conspiracies" = typecacheof(list(/mob/living/simple_animal/bot/secbot, /mob/living/simple_animal/bot/ed209, /mob/living/simple_animal/drone,
+					   /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))
 					   )

 	phobia_objs = list("snakes" = typecacheof(list(/obj/item/rod_of_asclepius)),
@@ -91,7 +97,8 @@ SUBSYSTEM_DEF(traumas)
 						/obj/item/storage/firstaid, /obj/item/storage/pill_bottle, /obj/item/device/healthanalyzer,
 						/obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper,
 						/obj/machinery/dna_scannernew, /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/item/surgical_drapes,
-						/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw)),
+						/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw,
+						/obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/plaguedoctorhat, /obj/item/clothing/mask/gas/plaguedoctor)),

 						"authority"   = typecacheof(list(/obj/item/clothing/under/rank/captain,  /obj/item/clothing/under/rank/head_of_personnel,
 						/obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/rank/research_director,
@@ -122,14 +129,21 @@ SUBSYSTEM_DEF(traumas)
 						/obj/item/clothing/head/helmet/abductor, /obj/structure/bed/abductor, /obj/structure/table_frame/abductor,
 						/obj/structure/table/abductor, /obj/structure/table/optable/abductor, /obj/structure/closet/abductor, /obj/item/organ/heart/gland,
 						/obj/machinery/abductor, /obj/item/crowbar/abductor, /obj/item/screwdriver/abductor, /obj/item/weldingtool/abductor,
-						/obj/item/wirecutters/abductor, /obj/item/wrench/abductor, /obj/item/stack/sheet/mineral/abductor))
+						/obj/item/wirecutters/abductor, /obj/item/wrench/abductor, /obj/item/stack/sheet/mineral/abductor)),
+						
+						"birds" = typecacheof(list(/obj/item/clothing/mask/gas/plaguedoctor, /obj/item/reagent_containers/food/snacks/cracker,
+						/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))
 					   )

 	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)),
 						"aliens" = typecacheof(list(/turf/open/floor/plating/abductor, /turf/open/floor/plating/abductor2,
-						/turf/open/floor/mineral/abductor, /turf/closed/wall/mineral/abductor))
+						/turf/open/floor/mineral/abductor, /turf/closed/wall/mineral/abductor)),
+						"falling" = typecacheof(list(/turf/open/chasm, /turf/open/floor/fakepit))
 						)

 	phobia_species = list("lizards"   = typecacheof(list(/datum/species/lizard)),
@@ -219,5 +219,43 @@
 		"as (unknown)",
 		"unknown",
 		"stranger danger"
+	],
+
+"birds": [
+		"birdemic",
+		"bird",
+		"beak",
+		"poly",
+		"wing",
+		"claw",
+		"peck",
+		"cracker",
+		"kiki yaya",
+		"ki ki ya ya",
+		"vox",
+		"flap",
+		"feather",
+		"avian",
+		"aviary",
+		"owl",
+		"griffin",
+		"kakaw",
+		"ka kaw",
+		"eagle",
+		"chick",
+		"fowl"
+	],
+
+"falling": [
+		"hold on",
+		"hang in there",
+		"chasm",
+		"pit",
+		"hole",
+		"fall",
+		"fell",
+		"let go",
+		"i'll catch you",
+		"slip"
 	]
 }