[MIRROR] Alphabetises Phobias [MDB IGNORE] (#20934)

* Alphabetises Phobias (#75150)

## About The Pull Request

Alphabetises some lists, json, and type paths related to phobias

## Why It's Good For The Game

It's neat and tidy

## Changelog
Not player facing

* Alphabetises Phobias

---------

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-05-06 02:30:38 +01:00
committed by GitHub
parent 87f61f2a1c
commit de094300d2
3 changed files with 653 additions and 659 deletions
+287 -302
View File
@@ -30,6 +30,7 @@ GLOBAL_LIST_INIT(phobia_regexes, list(
"anime" = construct_phobia_regex("anime"),
"authority" = construct_phobia_regex("authority"),
"birds" = construct_phobia_regex("birds"),
"blood" = construct_phobia_regex("blood"),
"clowns" = construct_phobia_regex("clowns"),
"conspiracies" = construct_phobia_regex("conspiracies"),
"doctors" = construct_phobia_regex("doctors"),
@@ -47,22 +48,41 @@ GLOBAL_LIST_INIT(phobia_regexes, list(
"spiders" = construct_phobia_regex("spiders"),
"strangers" = construct_phobia_regex("strangers"),
"the supernatural" = construct_phobia_regex("the supernatural"),
"blood" = construct_phobia_regex("blood"),
))
GLOBAL_LIST_INIT(phobia_mobs, list(
"spiders" = typecacheof(list(/mob/living/basic/giant_spider)),
"security" = typecacheof(list(/mob/living/simple_animal/bot/secbot)),
"aliens" = typecacheof(list(
/mob/living/carbon/alien,
/mob/living/simple_animal/slime,
)),
"anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian)),
"birds" = typecacheof(list(
/mob/living/simple_animal/chick,
/mob/living/simple_animal/chicken,
/mob/living/simple_animal/parrot,
/mob/living/simple_animal/pet/penguin,
)),
"conspiracies" = typecacheof(list(
/mob/living/simple_animal/bot/secbot,
/mob/living/simple_animal/drone,
/mob/living/simple_animal/pet/penguin,
)),
"doctors" = typecacheof(list(/mob/living/simple_animal/bot/medbot)),
"insects" = typecacheof(list(
/mob/living/basic/cockroach,
/mob/living/simple_animal/hostile/bee,
)),
"lizards" = typecacheof(list(/mob/living/simple_animal/hostile/lizard)),
"skeletons" = typecacheof(list(/mob/living/simple_animal/hostile/skeleton)),
"snakes" = typecacheof(list(/mob/living/simple_animal/hostile/retaliate/snake)),
"robots" = typecacheof(list(
/mob/living/silicon/ai,
/mob/living/silicon/robot,
/mob/living/simple_animal/bot,
/mob/living/simple_animal/drone,
"security" = typecacheof(list(/mob/living/simple_animal/bot/secbot)),
"spiders" = typecacheof(list(/mob/living/basic/giant_spider)),
"skeletons" = typecacheof(list(/mob/living/simple_animal/hostile/skeleton)),
"snakes" = typecacheof(list(/mob/living/simple_animal/hostile/retaliate/snake)),
)),
"doctors" = typecacheof(list(/mob/living/simple_animal/bot/medbot)),
"the supernatural" = typecacheof(list(
/mob/dead/observer,
/mob/living/simple_animal/bot/mulebot/paranormal,
@@ -79,200 +99,61 @@ GLOBAL_LIST_INIT(phobia_mobs, list(
/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/drone,
/mob/living/simple_animal/pet/penguin,
)),
"birds" = typecacheof(list(
/mob/living/simple_animal/chick,
/mob/living/simple_animal/chicken,
/mob/living/simple_animal/parrot,
/mob/living/simple_animal/pet/penguin,
)),
"anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian)),
"insects" = typecacheof(list(
/mob/living/basic/cockroach,
/mob/living/simple_animal/hostile/bee,
)),
))
GLOBAL_LIST_INIT(phobia_objs, list(
"snakes" = typecacheof(list(
/obj/item/rod_of_asclepius,
/obj/item/toy/plush/snakeplushie,
)),
"spiders" = typecacheof(list(/obj/structure/spider)),
"security" = typecacheof(list(
/obj/effect/client_image_holder/securitron,
/obj/item/clothing/under/rank/security/detective,
/obj/item/clothing/under/rank/security/head_of_security,
/obj/item/clothing/under/rank/security/officer,
/obj/item/clothing/under/rank/security/warden,
/obj/item/gun/energy/taser,
/obj/item/megaphone/sec,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/stamp/hos,
/obj/item/toy/figure/hos,
/obj/item/toy/figure/secofficer,
/obj/machinery/door/airlock/security,
/obj/structure/statue/gold/hos,
/obj/structure/statue/silver/sec,
/obj/structure/statue/silver/secborg,
)),
"clowns" = typecacheof(list(
/obj/item/bedsheet/clown,
/obj/item/clothing/head/chaplain/clownmitre,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/suit/chaplainsuit/clownpriest,
/obj/item/clothing/under/plasmaman/clown,
/obj/item/clothing/under/rank/civilian/clown,
/obj/item/food/cheesiehonkers,
/obj/item/food/pie/cream,
/obj/item/grown/bananapeel,
/obj/item/gun/magic/staff/honk,
/obj/item/instrument/bikehorn,
/obj/item/megaphone/clown,
/obj/item/modular_computer/pda/clown,
/obj/item/pneumatic_cannon/pie,
/obj/item/stack/ore/bananium,
/obj/item/stack/tile/mineral/bananium,
/obj/item/stamp/clown,
/obj/item/storage/backpack/clown,
/obj/item/storage/backpack/duffelbag/clown,
/obj/item/storage/backpack/ert/clown,
/obj/item/toy/crayon/rainbow,
/obj/item/toy/mecha/darkhonk,
/obj/item/toy/mecha/honk,
/obj/item/trash/cheesie,
/obj/machinery/door/airlock/bananium,
/obj/structure/falsewall/bananium,
/obj/structure/mecha_wreckage/honker,
/obj/structure/statue/bananium,
/obj/vehicle/sealed/car/clowncar,
/obj/vehicle/sealed/mecha/honker,
)),
"greytide" = (typecacheof(list(
/obj/item/clothing/under/color/grey,
/obj/item/melee/baton/security/cattleprod,
/obj/item/spear,
/obj/item/toy/figure/assistant,
/obj/structure/statue/sandstone/assistant,
)) + typecacheof(list(/obj/item/clothing/mask/gas), ignore_root_path = FALSE, only_root_path = TRUE // to match only specific items in this phobia and not subtypes, use an additional typecacheof w/ ignore_root_path set FALSE and only_root_patch set TRUE
)),
"lizards" = typecacheof(list(
/obj/item/clothing/head/costume/lizard,
/obj/item/clothing/shoes/cowboy/lizard,
/obj/item/food/kebab/tail,
/obj/item/organ/external/tail/lizard,
/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
/obj/item/toy/plush/lizard_plushie,
)),
"skeletons" = typecacheof(list(
/obj/effect/decal/remains/human,
/obj/item/clothing/suit/armor/bone,
/obj/item/food/meat/slab/human/mutant/skeleton,
/obj/item/organ/internal/tongue/bone,
/obj/item/stack/sheet/bone,
)),
"conspiracies" = typecacheof(list(
/obj/item/abductor/gizmo,
/obj/item/abductor/silencer,
"aliens" = typecacheof(list(
/obj/item/abductor,
/obj/item/cautery/alien,
/obj/item/circular_saw/alien,
/obj/item/clothing/head/helmet/abductor,
/obj/item/clothing/suit/armor/abductor/vest,
/obj/item/clothing/under/rank/captain,
/obj/item/clothing/under/rank/captain/parade,
/obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/under/rank/civilian/head_of_personnel,
/obj/item/clothing/under/rank/engineering/chief_engineer,
/obj/item/clothing/under/rank/medical/chief_medical_officer,
/obj/item/clothing/under/rank/rnd/research_director,
/obj/item/clothing/under/rank/rnd/research_director/alt,
/obj/item/clothing/under/rank/rnd/research_director/turtleneck,
/obj/item/clothing/under/rank/security/head_of_security,
/obj/item/clothing/under/rank/security/head_of_security/alt,
/obj/item/clothing/under/rank/security/head_of_security/grey,
/obj/item/clothing/under/rank/security/head_of_security/parade,
/obj/item/clothing/under/rank/security/head_of_security/parade/female,
/obj/item/clothing/under/rank/cargo/qm,
/obj/item/clothing/mask/facehugger,
/obj/item/clothing/suit/armor/abductor,
/obj/item/crowbar/abductor,
/obj/item/gun/energy/alien,
/obj/item/encryptionkey/heads,
/obj/item/radio/headset/heads,
/obj/item/megaphone/command,
/obj/item/hemostat/alien,
/obj/item/melee/baton/abductor,
/obj/item/stamp/captain,
/obj/item/stamp/ce,
/obj/item/stamp/centcom,
/obj/item/stamp/cmo,
/obj/item/stamp/hop,
/obj/item/stamp/hos,
/obj/item/stamp/rd,
/obj/item/stamp/qm,
/obj/item/storage/belt/military/abductor,
/obj/item/toy/figure/captain,
/obj/item/toy/figure/ce,
/obj/item/toy/figure/cmo,
/obj/item/toy/figure/dsquad,
/obj/item/toy/figure/hop,
/obj/item/toy/figure/hos,
/obj/item/toy/figure/rd,
/obj/item/toy/figure/qm,
/obj/item/organ/internal/body_egg/alien_embryo,
/obj/item/organ/internal/heart/gland,
/obj/item/radio/headset/abductor,
/obj/item/retractor/alien,
/obj/item/scalpel/alien,
/obj/item/screwdriver/abductor,
/obj/item/stack/sheet/mineral/abductor,
/obj/item/surgicaldrill/alien,
/obj/item/toy/toy_xeno,
/obj/item/toy/plush/abductor,
/obj/item/toy/plush/abductor/agent,
/obj/machinery/atmospherics/miner,
/obj/machinery/door/airlock/centcom,
/obj/item/weldingtool/abductor,
/obj/item/wirecutters/abductor,
/obj/item/wrench/abductor,
/obj/machinery/abductor,
/obj/structure/alien,
/obj/structure/bed/abductor,
/obj/structure/closet/abductor,
/obj/structure/statue/plasma/xeno,
/obj/structure/table_frame/abductor,
/obj/structure/table/abductor,
/obj/structure/table/optable/abductor,
)),
"robots" = typecacheof(list(
/obj/item/ai_module,
/obj/item/aicard,
/obj/item/toy/figure/borg,
/obj/item/toy/talking/ai,
/obj/machinery/computer/upload,
/obj/machinery/recharge_station,
/obj/structure/statue/diamond/ai1,
/obj/structure/statue/diamond/ai2,
/obj/structure/statue/silver/medborg,
/obj/structure/statue/silver/secborg,
"anime" = typecacheof(list(
/obj/item/clothing/head/costume/kitty/genuine,
/obj/item/clothing/mask/gas/ninja,
/obj/item/clothing/under/syndicate/ninja,
/obj/item/clothing/under/costume/schoolgirl,
/obj/item/energy_katana,
/obj/item/food/chawanmushi,
/obj/item/food/sashimi,
/obj/item/highfrequencyblade,
/obj/item/katana,
/obj/item/nullrod/claymore/katana,
/obj/item/nullrod/scythe/vibro,
/obj/item/reagent_containers/cup/glass/bottle/sake,
/obj/item/throwing_star,
/obj/item/toy/katana,
/obj/structure/mineral_door/paperframe,
/obj/structure/window/paperframe,
)),
"doctors" = typecacheof(list(
/obj/item/cautery,
/obj/item/circular_saw,
/obj/item/clothing/head/bio_hood/plague,
/obj/item/clothing/mask/gas/plaguedoctor,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit,
/obj/item/clothing/under/rank/medical,
/obj/item/healthanalyzer,
/obj/item/hemostat,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/pill/,
/obj/item/reagent_containers/syringe,
/obj/item/retractor,
/obj/item/scalpel,
/obj/item/storage/medkit,
/obj/item/storage/pill_bottle,
/obj/item/surgical_drapes,
/obj/item/surgicaldrill,
/obj/machinery/atmospherics/components/unary/cryo_cell,
/obj/machinery/dna_scannernew,
/obj/machinery/door/airlock/medical,
/obj/machinery/sleeper,
/obj/machinery/stasis,
/obj/structure/sign/departments/medbay,
)),
"authority" = typecacheof(list(
/obj/item/card/id/advanced/centcom,
/obj/item/card/id/advanced/gold,
@@ -334,7 +215,213 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/bedsheet/ce,
/obj/item/bedsheet/qm
)),
"birds" = typecacheof(list(
/obj/item/clothing/head/costume/chicken,
/obj/item/clothing/head/costume/griffin,
/obj/item/clothing/head/helmet/space/freedom,
/obj/item/clothing/mask/gas/owl_mask,
/obj/item/clothing/mask/gas/plaguedoctor,
/obj/item/clothing/shoes/griffin,
/obj/item/clothing/suit/costume/chickensuit,
/obj/item/clothing/suit/space/freedom,
/obj/item/clothing/suit/toggle/owlwings,
/obj/item/clothing/under/costume/griffin,
/obj/item/clothing/under/costume/owl,
/obj/item/food/cracker,
)),
"blood" = typecacheof(list(
/obj/effect/decal/cleanable/blood,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/syringe,
/obj/machinery/iv_drip,
)),
"clowns" = typecacheof(list(
/obj/item/bedsheet/clown,
/obj/item/clothing/head/chaplain/clownmitre,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/suit/chaplainsuit/clownpriest,
/obj/item/clothing/under/plasmaman/clown,
/obj/item/clothing/under/rank/civilian/clown,
/obj/item/food/cheesiehonkers,
/obj/item/food/pie/cream,
/obj/item/grown/bananapeel,
/obj/item/gun/magic/staff/honk,
/obj/item/instrument/bikehorn,
/obj/item/megaphone/clown,
/obj/item/modular_computer/pda/clown,
/obj/item/pneumatic_cannon/pie,
/obj/item/stack/ore/bananium,
/obj/item/stack/tile/mineral/bananium,
/obj/item/stamp/clown,
/obj/item/storage/backpack/clown,
/obj/item/storage/backpack/duffelbag/clown,
/obj/item/storage/backpack/ert/clown,
/obj/item/toy/crayon/rainbow,
/obj/item/toy/mecha/darkhonk,
/obj/item/toy/mecha/honk,
/obj/item/trash/cheesie,
/obj/machinery/door/airlock/bananium,
/obj/structure/falsewall/bananium,
/obj/structure/mecha_wreckage/honker,
/obj/structure/statue/bananium,
/obj/vehicle/sealed/car/clowncar,
/obj/vehicle/sealed/mecha/honker,
)),
"conspiracies" = typecacheof(list(
/obj/item/abductor/gizmo,
/obj/item/abductor/silencer,
/obj/item/clothing/head/helmet/abductor,
/obj/item/clothing/suit/armor/abductor/vest,
/obj/item/clothing/under/rank/captain,
/obj/item/clothing/under/rank/captain/parade,
/obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/under/rank/civilian/head_of_personnel,
/obj/item/clothing/under/rank/engineering/chief_engineer,
/obj/item/clothing/under/rank/medical/chief_medical_officer,
/obj/item/clothing/under/rank/rnd/research_director,
/obj/item/clothing/under/rank/rnd/research_director/alt,
/obj/item/clothing/under/rank/rnd/research_director/turtleneck,
/obj/item/clothing/under/rank/security/head_of_security,
/obj/item/clothing/under/rank/security/head_of_security/alt,
/obj/item/clothing/under/rank/security/head_of_security/grey,
/obj/item/clothing/under/rank/security/head_of_security/parade,
/obj/item/clothing/under/rank/security/head_of_security/parade/female,
/obj/item/clothing/under/rank/cargo/qm,
/obj/item/gun/energy/alien,
/obj/item/encryptionkey/heads,
/obj/item/radio/headset/heads,
/obj/item/megaphone/command,
/obj/item/melee/baton/abductor,
/obj/item/stamp/captain,
/obj/item/stamp/ce,
/obj/item/stamp/centcom,
/obj/item/stamp/cmo,
/obj/item/stamp/hop,
/obj/item/stamp/hos,
/obj/item/stamp/rd,
/obj/item/stamp/qm,
/obj/item/storage/belt/military/abductor,
/obj/item/toy/figure/captain,
/obj/item/toy/figure/ce,
/obj/item/toy/figure/cmo,
/obj/item/toy/figure/dsquad,
/obj/item/toy/figure/hop,
/obj/item/toy/figure/hos,
/obj/item/toy/figure/rd,
/obj/item/toy/figure/qm,
/obj/item/toy/plush/abductor,
/obj/item/toy/plush/abductor/agent,
/obj/machinery/atmospherics/miner,
/obj/machinery/door/airlock/centcom,
)),
"doctors" = typecacheof(list(
/obj/item/cautery,
/obj/item/circular_saw,
/obj/item/clothing/head/bio_hood/plague,
/obj/item/clothing/mask/gas/plaguedoctor,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit,
/obj/item/clothing/under/rank/medical,
/obj/item/healthanalyzer,
/obj/item/hemostat,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/pill/,
/obj/item/reagent_containers/syringe,
/obj/item/retractor,
/obj/item/scalpel,
/obj/item/storage/medkit,
/obj/item/storage/pill_bottle,
/obj/item/surgical_drapes,
/obj/item/surgicaldrill,
/obj/machinery/atmospherics/components/unary/cryo_cell,
/obj/machinery/dna_scannernew,
/obj/machinery/door/airlock/medical,
/obj/machinery/sleeper,
/obj/machinery/stasis,
/obj/structure/sign/departments/medbay,
)),
"greytide" = (typecacheof(list(
/obj/item/clothing/under/color/grey,
/obj/item/melee/baton/security/cattleprod,
/obj/item/spear,
/obj/item/toy/figure/assistant,
/obj/structure/statue/sandstone/assistant,
)) + typecacheof(list(/obj/item/clothing/mask/gas), ignore_root_path = FALSE, only_root_path = TRUE // to match only specific items in this phobia and not subtypes, use an additional typecacheof w/ ignore_root_path set FALSE and only_root_patch set TRUE
)),
"guns" = typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
/obj/item/gun/ballistic,
/obj/item/gun/blastcannon,
/obj/item/gun/chem,
/obj/item/gun/energy,
/obj/item/gun/grenadelauncher,
/obj/item/gun/syringe,
/obj/item/mecha_ammo,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic,
/obj/item/mecha_parts/mecha_equipment/weapon/energy,
/obj/item/storage/belt/bandolier,
/obj/item/storage/belt/holster,
/obj/machinery/porta_turret,
/obj/machinery/power/emitter,
)),
"insects" = typecacheof(list(
/obj/item/clothing/mask/animal/small/bee,
/obj/item/clothing/suit/hooded/bee_costume,
/obj/item/toy/plush/beeplushie,
/obj/item/toy/plush/moth,
/obj/structure/beebox,
)),
"lizards" = typecacheof(list(
/obj/item/clothing/head/costume/lizard,
/obj/item/clothing/shoes/cowboy/lizard,
/obj/item/food/kebab/tail,
/obj/item/organ/external/tail/lizard,
/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
/obj/item/toy/plush/lizard_plushie,
)),
"robots" = typecacheof(list(
/obj/item/ai_module,
/obj/item/aicard,
/obj/item/toy/figure/borg,
/obj/item/toy/talking/ai,
/obj/machinery/computer/upload,
/obj/machinery/recharge_station,
/obj/structure/statue/diamond/ai1,
/obj/structure/statue/diamond/ai2,
/obj/structure/statue/silver/medborg,
/obj/structure/statue/silver/secborg,
)),
"security" = typecacheof(list(
/obj/effect/client_image_holder/securitron,
/obj/item/clothing/under/rank/security/detective,
/obj/item/clothing/under/rank/security/head_of_security,
/obj/item/clothing/under/rank/security/officer,
/obj/item/clothing/under/rank/security/warden,
/obj/item/gun/energy/taser,
/obj/item/megaphone/sec,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/stamp/hos,
/obj/item/toy/figure/hos,
/obj/item/toy/figure/secofficer,
/obj/machinery/door/airlock/security,
/obj/structure/statue/gold/hos,
/obj/structure/statue/silver/sec,
/obj/structure/statue/silver/secborg,
)),
"skeletons" = typecacheof(list(
/obj/effect/decal/remains/human,
/obj/item/clothing/suit/armor/bone,
/obj/item/food/meat/slab/human/mutant/skeleton,
/obj/item/organ/internal/tongue/bone,
/obj/item/stack/sheet/bone,
)),
"snakes" = typecacheof(list(
/obj/item/rod_of_asclepius,
/obj/item/toy/plush/snakeplushie,
)),
"spiders" = typecacheof(list(/obj/structure/spider)),
"the supernatural" = typecacheof(list(
/obj/effect/floating_blade,
/obj/effect/heretic_influence,
@@ -376,120 +463,9 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/structure/destructible/eldritch_crucible,
/obj/structure/spirit_board,
)),
"aliens" = typecacheof(list(
/obj/item/abductor,
/obj/item/cautery/alien,
/obj/item/circular_saw/alien,
/obj/item/clothing/head/helmet/abductor,
/obj/item/clothing/mask/facehugger,
/obj/item/clothing/suit/armor/abductor,
/obj/item/crowbar/abductor,
/obj/item/gun/energy/alien,
/obj/item/hemostat/alien,
/obj/item/melee/baton/abductor,
/obj/item/organ/internal/body_egg/alien_embryo,
/obj/item/organ/internal/heart/gland,
/obj/item/radio/headset/abductor,
/obj/item/retractor/alien,
/obj/item/scalpel/alien,
/obj/item/screwdriver/abductor,
/obj/item/stack/sheet/mineral/abductor,
/obj/item/surgicaldrill/alien,
/obj/item/toy/toy_xeno,
/obj/item/toy/plush/abductor,
/obj/item/toy/plush/abductor/agent,
/obj/item/weldingtool/abductor,
/obj/item/wirecutters/abductor,
/obj/item/wrench/abductor,
/obj/machinery/abductor,
/obj/structure/alien,
/obj/structure/bed/abductor,
/obj/structure/closet/abductor,
/obj/structure/statue/plasma/xeno,
/obj/structure/table_frame/abductor,
/obj/structure/table/abductor,
/obj/structure/table/optable/abductor,
)),
"anime" = typecacheof(list(
/obj/item/clothing/head/costume/kitty/genuine,
/obj/item/clothing/mask/gas/ninja,
/obj/item/clothing/under/syndicate/ninja,
/obj/item/clothing/under/costume/schoolgirl,
/obj/item/energy_katana,
/obj/item/food/chawanmushi,
/obj/item/food/sashimi,
/obj/item/highfrequencyblade,
/obj/item/katana,
/obj/item/nullrod/claymore/katana,
/obj/item/nullrod/scythe/vibro,
/obj/item/reagent_containers/cup/glass/bottle/sake,
/obj/item/throwing_star,
/obj/item/toy/katana,
/obj/structure/mineral_door/paperframe,
/obj/structure/window/paperframe,
)),
"birds" = typecacheof(list(
/obj/item/clothing/head/costume/chicken,
/obj/item/clothing/head/costume/griffin,
/obj/item/clothing/head/helmet/space/freedom,
/obj/item/clothing/mask/gas/owl_mask,
/obj/item/clothing/mask/gas/plaguedoctor,
/obj/item/clothing/shoes/griffin,
/obj/item/clothing/suit/costume/chickensuit,
/obj/item/clothing/suit/space/freedom,
/obj/item/clothing/suit/toggle/owlwings,
/obj/item/clothing/under/costume/griffin,
/obj/item/clothing/under/costume/owl,
/obj/item/food/cracker,
)),
"guns" = typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
/obj/item/gun/ballistic,
/obj/item/gun/blastcannon,
/obj/item/gun/chem,
/obj/item/gun/energy,
/obj/item/gun/grenadelauncher,
/obj/item/gun/syringe,
/obj/item/mecha_ammo,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic,
/obj/item/mecha_parts/mecha_equipment/weapon/energy,
/obj/item/storage/belt/bandolier,
/obj/item/storage/belt/holster,
/obj/machinery/porta_turret,
/obj/machinery/power/emitter,
)),
"insects" = typecacheof(list(
/obj/item/clothing/mask/animal/small/bee,
/obj/item/clothing/suit/hooded/bee_costume,
/obj/item/toy/plush/beeplushie,
/obj/item/toy/plush/moth,
/obj/structure/beebox,
)),
"blood" = typecacheof(list(
/obj/effect/decal/cleanable/blood,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/syringe,
/obj/machinery/iv_drip,
)),
))
GLOBAL_LIST_INIT(phobia_turfs, list(
"space" = typecacheof(list(
/turf/open/floor/fakespace,
/turf/open/floor/holofloor/space,
/turf/open/space,
)),
"the supernatural" = typecacheof(list(
/turf/closed/wall/mineral/cult,
/turf/open/floor/cult,
)),
"aliens" = typecacheof(list(
/turf/closed/wall/mineral/abductor,
/turf/open/floor/mineral/abductor,
@@ -501,6 +477,15 @@ GLOBAL_LIST_INIT(phobia_turfs, list(
/turf/open/floor/fakepit,
/turf/open/openspace,
)),
"space" = typecacheof(list(
/turf/open/floor/fakespace,
/turf/open/floor/holofloor/space,
/turf/open/space,
)),
"the supernatural" = typecacheof(list(
/turf/closed/wall/mineral/cult,
/turf/open/floor/cult,
)),
))
GLOBAL_LIST_INIT(phobia_species, list(
+72 -72
View File
@@ -138,88 +138,20 @@
// Defined phobia types for badminry, not included in the RNG trauma pool to avoid diluting.
/datum/brain_trauma/mild/phobia/spiders
phobia_type = "spiders"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/space
phobia_type = "space"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/security
phobia_type = "security"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/clowns
phobia_type = "clowns"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/greytide
phobia_type = "greytide"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/lizards
phobia_type = "lizards"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/skeletons
phobia_type = "skeletons"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/snakes
phobia_type = "snakes"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/robots
phobia_type = "robots"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/doctors
phobia_type = "doctors"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/authority
phobia_type = "authority"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/supernatural
phobia_type = "the supernatural"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/aliens
phobia_type = "aliens"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/strangers
phobia_type = "strangers"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/birds
phobia_type = "birds"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/falling
phobia_type = "falling"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/anime
phobia_type = "anime"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/conspiracies
phobia_type = "conspiracies"
/datum/brain_trauma/mild/phobia/authority
phobia_type = "authority"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/insects
phobia_type = "insects"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/ocky_icky
phobia_type = "ocky icky"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/guns
phobia_type = "guns"
/datum/brain_trauma/mild/phobia/birds
phobia_type = "birds"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/blood
@@ -230,3 +162,71 @@
if (GET_ATOM_BLOOD_DNA_LENGTH(checked))
return TRUE
return ..()
/datum/brain_trauma/mild/phobia/clowns
phobia_type = "clowns"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/conspiracies
phobia_type = "conspiracies"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/doctors
phobia_type = "doctors"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/falling
phobia_type = "falling"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/greytide
phobia_type = "greytide"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/guns
phobia_type = "guns"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/insects
phobia_type = "insects"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/lizards
phobia_type = "lizards"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/ocky_icky
phobia_type = "ocky icky"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/robots
phobia_type = "robots"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/security
phobia_type = "security"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/skeletons
phobia_type = "skeletons"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/snakes
phobia_type = "snakes"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/space
phobia_type = "space"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/spiders
phobia_type = "spiders"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/strangers
phobia_type = "strangers"
random_gain = FALSE
/datum/brain_trauma/mild/phobia/supernatural
phobia_type = "the supernatural"
random_gain = FALSE
+294 -285
View File
@@ -1,29 +1,125 @@
{
"spiders": [
"spider",
"web",
"arachnid"
"aliens": [
"abductee",
"abductor",
"alien",
"ayy lmao",
"ayys",
"facehugger",
"greys",
"jelly",
"lusty",
"mothership",
"resin",
"slime",
"xeno",
"xenobiology",
"xenomorph"
],
"space": [
"space",
"star",
"universe",
"void",
"galaxy",
"spess"
"anime": [
"~",
"anime",
"baka",
"best girl",
"catgirl",
"catgirls",
"cosplay",
"desu",
"dubs",
"husbando",
"katana",
"manga",
"neet",
"ninja",
"nya",
"nyaa",
"ora",
"otaku",
"season two when",
"subs",
"sugoi",
"uguu",
"waifu",
"weeb",
"worst girl"
],
"security": [
"sec",
"security",
"shitcurity",
"baton",
"taser",
"beepsky",
"authority": [
"admiral",
"cap",
"captain",
"ce",
"centcom",
"centcom",
"chief",
"cmo",
"comdom",
"command",
"condom",
"head",
"heads",
"hop",
"hos",
"brig",
"gulag"
"nanotrasen",
"qm",
"quarter master",
"quartermaster",
"rd",
"research director"
],
"birds": [
"avian",
"aviary",
"beak",
"bird",
"birdemic",
"chick",
"claw",
"cracker",
"eagle",
"feather",
"flap",
"fowl",
"griffin",
"ka kaw",
"kakaw",
"ki ki ya ya",
"kiki yaya",
"owl",
"peck",
"poly",
"vox",
"wing"
],
"blood": [
"bled",
"bleed",
"bleeding",
"blood",
"bloodloss",
"bloody",
"dialysis",
"gib",
"gibbed",
"gibs",
"gore",
"hemorrhage",
"hemorrhaged",
"hemorrhaging",
"iv",
"transfusion"
],
"clowns": [
"banana",
"clown",
"honk",
"slip",
"slipped",
"slipping"
],
"conspiracies": [
@@ -66,13 +162,38 @@
"xeno"
],
"clowns": [
"banana",
"clown",
"honk",
"slip",
"slipped",
"slipping"
"doctors": [
"chem",
"chemist",
"chemistry",
"chief medical officer",
"cloning",
"cmo",
"cryo",
"doc",
"geneticist",
"genetics",
"healing",
"md",
"medicine",
"nurse",
"sleeper",
"viro",
"virologist",
"virology"
],
"falling": [
"chasm",
"fall",
"fell",
"hang in there",
"hold on",
"hole",
"i'll catch you",
"let go",
"pit",
"slip"
],
"greytide": [
@@ -86,6 +207,76 @@
"viva"
],
"guns": [
"10mm",
"357",
"45",
"9mm",
"ammo",
"armory",
"ballistic",
"beam",
"buckshot",
"bulldog",
"bullet",
"c20",
"cannon",
"carbine",
"cartridge",
"casing",
"dart",
"deagle",
"emitter",
"firearm",
"fired",
"gun",
"handgun",
"hitscan",
"incendiary",
"l6",
"laser",
"lmg",
"m1911",
"mag",
"magazine",
"mateba",
"mosin",
"musket",
"nagant",
"pistol",
"projectile",
"pulse",
"revolver",
"rifle",
"shell",
"shoot",
"shooter",
"shot",
"shotgun",
"slug",
"smg",
"sniper",
"speed loader",
"speedloader",
"turret",
"uzi",
"wt550"
],
"insects": [
"bee",
"buzz",
"cockroach",
"flutter",
"fly",
"glockroach",
"insect",
"moff",
"moth",
"roach",
"sting"
],
"lizards": [
"hiss",
"hissed",
@@ -96,6 +287,65 @@
"wagging"
],
"ocky icky": [
"admeme",
"admin",
"ahelp",
"antag",
"antagonist",
"ban",
"banned",
"click",
"discord",
"forum",
"ick ock",
"k",
"kek",
"leddit",
"moderator",
"mods",
"ocky",
"ooc",
"owo",
"pwn",
"reddit",
"round",
"rule",
"self antag",
"selfantag",
"u",
"uwa",
"uwu",
"valid",
"y"
],
"robots": [
"ai",
"android",
"artificial intelligence",
"beep",
"boop",
"borg",
"bot",
"cyborg",
"robot",
"silicon",
"silly cone"
],
"security": [
"sec",
"security",
"shitcurity",
"baton",
"taser",
"beepsky",
"hos",
"brig",
"gulag"
],
"skeletons": [
"bone",
"calcium",
@@ -118,63 +368,26 @@
"viper"
],
"robots": [
"ai",
"android",
"artificial intelligence",
"beep",
"boop",
"borg",
"bot",
"cyborg",
"robot",
"silicon",
"silly cone"
"space": [
"space",
"star",
"universe",
"void",
"galaxy",
"spess"
],
"doctors": [
"chem",
"chemist",
"chemistry",
"chief medical officer",
"cloning",
"cmo",
"cryo",
"doc",
"geneticist",
"genetics",
"healing",
"md",
"medicine",
"nurse",
"sleeper",
"viro",
"virologist",
"virology"
"spiders": [
"spider",
"web",
"arachnid"
],
"authority": [
"admiral",
"cap",
"captain",
"ce",
"centcom",
"centcom",
"chief",
"cmo",
"comdom",
"command",
"condom",
"head",
"heads",
"hop",
"hos",
"nanotrasen",
"qm",
"quarter master",
"quartermaster",
"rd",
"research director"
"strangers": [
"as (unknown)",
"unidentified",
"unknown",
"stranger"
],
"the supernatural": [
@@ -211,213 +424,9 @@
"wiz",
"wizard",
"zombie"
],
]
"aliens": [
"abductee",
"abductor",
"alien",
"ayy lmao",
"ayys",
"facehugger",
"greys",
"jelly",
"lusty",
"mothership",
"resin",
"slime",
"xeno",
"xenobiology",
"xenomorph"
],
"strangers": [
"as (unknown)",
"unidentified",
"unknown",
"stranger"
],
"birds": [
"avian",
"aviary",
"beak",
"bird",
"birdemic",
"chick",
"claw",
"cracker",
"eagle",
"feather",
"flap",
"fowl",
"griffin",
"ka kaw",
"kakaw",
"ki ki ya ya",
"kiki yaya",
"owl",
"peck",
"poly",
"vox",
"wing"
],
"falling": [
"chasm",
"fall",
"fell",
"hang in there",
"hold on",
"hole",
"i'll catch you",
"let go",
"pit",
"slip"
],
"anime": [
"~",
"anime",
"baka",
"best girl",
"catgirl",
"catgirls",
"cosplay",
"desu",
"dubs",
"husbando",
"katana",
"manga",
"neet",
"ninja",
"nya",
"nyaa",
"ora",
"otaku",
"season two when",
"subs",
"sugoi",
"uguu",
"waifu",
"weeb",
"worst girl"
],
"insects": [
"bee",
"buzz",
"cockroach",
"flutter",
"fly",
"glockroach",
"insect",
"moff",
"moth",
"roach",
"sting"
],
"ocky icky": [
"admeme",
"admin",
"ahelp",
"antag",
"antagonist",
"ban",
"banned",
"click",
"discord",
"forum",
"ick ock",
"k",
"kek",
"leddit",
"moderator",
"mods",
"ocky",
"ooc",
"owo",
"pwn",
"reddit",
"round",
"rule",
"self antag",
"selfantag",
"u",
"uwa",
"uwu",
"valid",
"y"
],
"guns": [
"10mm",
"357",
"45",
"9mm",
"ammo",
"armory",
"ballistic",
"beam",
"buckshot",
"bulldog",
"bullet",
"c20",
"cannon",
"carbine",
"cartridge",
"casing",
"dart",
"deagle",
"emitter",
"firearm",
"fired",
"gun",
"handgun",
"hitscan",
"incendiary",
"l6",
"laser",
"lmg",
"m1911",
"mag",
"magazine",
"mateba",
"mosin",
"musket",
"nagant",
"pistol",
"projectile",
"pulse",
"revolver",
"rifle",
"shell",
"shoot",
"shooter",
"shot",
"shotgun",
"slug",
"smg",
"sniper",
"speed loader",
"speedloader",
"turret",
"uzi",
"wt550"
],
"blood": [
"bled",
"bleed",
"bleeding",
"blood",
"bloodloss",
"bloody",
"dialysis",
"gib",
"gibbed",
"gibs",
"gore",
"hemorrhage",
"hemorrhaged",
"hemorrhaging",
"iv",
"transfusion"
]
}