From ee9a63178e2ce6aa03be72871dddb02363cdde79 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 12 Apr 2021 23:09:06 +0200 Subject: [PATCH] [MIRROR] Adds a phobia of guns (#4851) * Adds a phobia of guns (#58308) * Adds a phobia of guns Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com> --- code/controllers/subsystem/traumas.dm | 9 ++++- code/datums/brain_damage/phobia.dm | 4 ++ strings/phobia.json | 55 +++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index ed7542bf3c0..1f9716f6142 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", "insects")) + "aliens", "strangers", "birds", "falling", "anime", "insects", "guns")) phobia_regexes = list("spiders" = construct_phobia_regex("spiders"), "space" = construct_phobia_regex("space"), @@ -36,6 +36,7 @@ SUBSYSTEM_DEF(traumas) "anime" = construct_phobia_regex("anime"), "insects" = construct_phobia_regex("insects"), "ocky icky" = construct_phobia_regex("ocky icky"), + "guns" = construct_phobia_regex("guns"), ) phobia_mobs = list("spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)), @@ -169,6 +170,12 @@ SUBSYSTEM_DEF(traumas) /obj/item/clothing/head/helmet/space/freedom, /obj/item/clothing/suit/space/freedom )), + "guns" = typecacheof(list(/obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/syringe, /obj/item/gun/chem, + /obj/item/gun/blastcannon, /obj/item/gun/grenadelauncher, /obj/machinery/porta_turret, /obj/machinery/power/emitter, + /obj/item/ammo_casing, /obj/item/storage/belt/bandolier, /obj/item/storage/belt/holster, /obj/item/ammo_box, + /obj/item/mecha_ammo, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic, /obj/item/mecha_parts/mecha_equipment/weapon/energy + )), + "insects" = typecacheof(list(/obj/item/toy/plush/moth, /obj/item/toy/plush/beeplushie, /obj/item/clothing/mask/animal/rat/bee, /obj/item/clothing/suit/hooded/bee_costume, /obj/structure/beebox)), "anime" = typecacheof(list(/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/food/sashimi, /obj/item/food/chawanmushi, diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index f36a589416a..945b17d4741 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -209,3 +209,7 @@ /datum/brain_trauma/mild/phobia/ocky_icky phobia_type = "ocky icky" random_gain = FALSE + +/datum/brain_trauma/mild/phobia/guns + phobia_type = "guns" + random_gain = FALSE diff --git a/strings/phobia.json b/strings/phobia.json index 4cfee4a24ea..afb2b3e9dd8 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -331,5 +331,60 @@ "uwu", "valid", "y" + ], +"guns": [ + "ballistic", + "firearm", + "laser", + "shooter", + "projectile", + "emitter", + "pulse", + "beam", + "hitscan", + "gun", + "pistol", + "handgun", + "turret", + "sniper", + "rifle", + "shotgun", + "carbine", + "mosin", + "nagant", + "smg", + "lmg", + "m1911", + "357", + "45", + "9mm", + "10mm", + "uzi", + "revolver", + "mateba", + "bulldog", + "wt550", + "c20", + "deagle", + "l6", + "musket", + "cannon", + "shot", + "shoot", + "fired", + "ammo", + "bullet", + "magazine", + "mag", + "speed loader", + "speedloader", + "cartridge", + "casing", + "slug", + "buckshot", + "incendiary", + "shell", + "dart", + "armory" ] }