From adeb9d95a08a6b0400c97ab1fb4ed26d85bed8d9 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Tue, 9 Aug 2022 22:38:34 -0400 Subject: [PATCH] Adds QM to authority & conspiracy phobias, QM's bedsheets will now make you dream of authority and SILVERY IDs (#69037) Adds QM to authority & conspiracy phobias --- code/_globalvars/phobias.dm | 31 ++++++++++++++++++++ code/game/objects/structures/bedsheet_bin.dm | 2 +- strings/phobia.json | 24 ++++++++++----- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm index 6fa5d0f5143..4b0b738d0f0 100644 --- a/code/_globalvars/phobias.dm +++ b/code/_globalvars/phobias.dm @@ -204,7 +204,10 @@ GLOBAL_LIST_INIT(phobia_objs, list( /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, @@ -214,6 +217,7 @@ GLOBAL_LIST_INIT(phobia_objs, list( /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, @@ -222,6 +226,7 @@ GLOBAL_LIST_INIT(phobia_objs, list( /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, @@ -279,7 +284,24 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/clothing/under/rank/medical/chief_medical_officer, /obj/item/clothing/under/rank/rnd/research_director, /obj/item/clothing/under/rank/security/head_of_security, + /obj/item/clothing/under/rank/cargo/qm, + /obj/item/clothing/neck/cloak/qm, + /obj/item/clothing/neck/cloak/hos, + /obj/item/clothing/neck/cloak/cmo, + /obj/item/clothing/neck/cloak/rd, + /obj/item/clothing/neck/cloak/ce, + /obj/item/clothing/neck/cloak/cap, + /obj/item/clothing/neck/cloak/hop, + /obj/item/clothing/suit/hooded/wintercoat/captain, + /obj/item/clothing/suit/hooded/wintercoat/security/hos, + /obj/item/clothing/head/hooded/winterhood/engineering/ce, + /obj/item/clothing/suit/hooded/wintercoat/science/rd, + /obj/item/clothing/suit/hooded/wintercoat/hop, + /obj/item/clothing/head/hooded/winterhood/medical/cmo, + /obj/item/clothing/suit/hooded/wintercoat/cargo/qm, /obj/item/megaphone/command, + /obj/item/encryptionkey/heads, + /obj/item/radio/headset/heads, /obj/item/melee/baton/telescopic, /obj/item/stamp/captain, /obj/item/stamp/ce, @@ -288,6 +310,7 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/stamp/hop, /obj/item/stamp/hos, /obj/item/stamp/rd, + /obj/item/stamp/qm, /obj/item/toy/figure/captain, /obj/item/toy/figure/ce, /obj/item/toy/figure/cmo, @@ -295,6 +318,7 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/toy/figure/hop, /obj/item/toy/figure/hos, /obj/item/toy/figure/rd, + /obj/item/toy/figure/qm, /obj/machinery/door/airlock/command, /obj/structure/statue/diamond/captain, /obj/structure/statue/gold/ce, @@ -302,6 +326,13 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/structure/statue/gold/hop, /obj/structure/statue/gold/hos, /obj/structure/statue/gold/rd, + /obj/item/bedsheet/captain, + /obj/item/bedsheet/rd, + /obj/item/bedsheet/cmo, + /obj/item/bedsheet/hos, + /obj/item/bedsheet/hop, + /obj/item/bedsheet/ce, + /obj/item/bedsheet/qm )), "the supernatural" = typecacheof(list( diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 6371e0e199a..936a14801c8 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -198,7 +198,7 @@ LINEN BINS desc = "It is decorated with a crate emblem in silver lining. It's rather tough, and just the thing to lie on after a hard day of pushing paper." icon_state = "sheetqm" inhand_icon_state = "sheetqm" - dream_messages = list("a grey ID", "a shuttle", "a crate", "a sloth", "the quartermaster") + dream_messages = list("authority", "a silvery ID", "a shuttle", "a crate", "a sloth", "the quartermaster") /obj/item/bedsheet/chaplain name = "chaplain's blanket" diff --git a/strings/phobia.json b/strings/phobia.json index 0b4be1a7133..46aa6e34470 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -27,20 +27,19 @@ ], "conspiracies": [ - "central command", - "command", - "chain of command", - "heads of staff", - "head of security", + "head", + "heads", + "chief", "hos", - "head of personnel", "hop", "research director", "rd", - "chief medical officer", "cmo", - "chief engineer", "ce", + "qm", + "quartermaster", + "quarter master", + "cap", "captain", "deathsquad", "death squad", @@ -53,6 +52,9 @@ "ufo", "big pharma", "government", + "nanotrasen", + "centcom", + "command", "steel beam", "jet fuel", "round earth", @@ -155,12 +157,18 @@ "captain", "chief", "head", + "heads", "hop", "hos", "ce", "cmo", "rd", + "research director", + "qm", + "quarter master", + "quartermaster", "command", + "centcom", "nanotrasen", "admiral", "centcom",