From f5b603aae724b27d17a05d62fe11f59bca8dd48b Mon Sep 17 00:00:00 2001 From: Shaps <3589655+Shapsy@users.noreply.github.com> Date: Thu, 17 Oct 2019 21:26:53 -0400 Subject: [PATCH] first use of the word plasmeme in the codebase (#47114) --- code/modules/admin/verbs/debug.dm | 17 ++++++- code/modules/clothing/outfits/standard.dm | 62 +++++++++++------------ code/modules/jobs/access.dm | 2 +- 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 7ffb7f391c2..5346188a0d6 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -494,8 +494,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that message_admins("[key_name_admin(usr)] changed the equipment of [ADMIN_LOOKUPFLW(H)] to [dresscode].") /client/proc/robust_dress_shop() - var/list/outfits = list("Naked","Custom","As Job...") - var/list/paths = subtypesof(/datum/outfit) - typesof(/datum/outfit/job) + var/list/outfits = list("Naked","Custom","As Job...", "As Plasmaman...") + var/list/paths = subtypesof(/datum/outfit) - typesof(/datum/outfit/job) - typesof(/datum/outfit/plasmaman) for(var/path in paths) var/datum/outfit/O = path //not much to initalize here but whatever if(initial(O.can_be_admin_equipped)) @@ -521,6 +521,19 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(isnull(dresscode)) return + if (dresscode == "As Plasmaman...") + var/list/plasmaman_paths = subtypesof(/datum/outfit/plasmaman) + var/list/plasmaman_outfits = list() + for(var/path in plasmaman_paths) + var/datum/outfit/O = path + if(initial(O.can_be_admin_equipped)) + plasmaman_outfits[initial(O.name)] = path + + dresscode = input("Select plasmeme equipment", "Robust quick dress shop") as null|anything in plasmaman_outfits + dresscode = plasmaman_outfits[dresscode] + if(isnull(dresscode)) + return + if (dresscode == "Custom") var/list/custom_names = list() for(var/datum/outfit/D in GLOB.custom_outfits) diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 6d55b96c070..d0193e5391a 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -1,3 +1,34 @@ +/datum/outfit/spec_ops + name = "Special Ops Officer" + + uniform = /obj/item/clothing/under/syndicate + suit = /obj/item/clothing/suit/space/officer + shoes = /obj/item/clothing/shoes/combat/swat + gloves = /obj/item/clothing/gloves/combat + glasses = /obj/item/clothing/glasses/thermal/eyepatch + ears = /obj/item/radio/headset/headset_cent/commander + mask = /obj/item/clothing/mask/cigarette/cigar/havana + head = /obj/item/clothing/head/helmet/space/beret + belt = /obj/item/gun/energy/pulse/pistol/m1911 + r_pocket = /obj/item/lighter + back = /obj/item/storage/backpack/satchel/leather + id = /obj/item/card/id/centcom + +/datum/outfit/spec_ops/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + if(visualsOnly) + return + + var/obj/item/card/id/W = H.wear_id + W.access = get_all_accesses() + W.access += get_centcom_access("Special Ops Officer") + W.assignment = "Special Ops Officer" + W.registered_name = H.real_name + W.update_label() + + var/obj/item/radio/headset/R = H.ears + R.set_frequency(FREQ_CENTCOM) + R.freqlock = TRUE + /datum/outfit/space name = "Standard Space Gear" @@ -227,37 +258,6 @@ W.registered_name = H.real_name W.update_label() -/datum/outfit/spec_ops - name = "Special Ops Officer" - - uniform = /obj/item/clothing/under/syndicate - suit = /obj/item/clothing/suit/space/officer - shoes = /obj/item/clothing/shoes/combat/swat - gloves = /obj/item/clothing/gloves/combat - glasses = /obj/item/clothing/glasses/thermal/eyepatch - ears = /obj/item/radio/headset/headset_cent/commander - mask = /obj/item/clothing/mask/cigarette/cigar/havana - head = /obj/item/clothing/head/helmet/space/beret - belt = /obj/item/gun/energy/pulse/pistol/m1911 - r_pocket = /obj/item/lighter - back = /obj/item/storage/backpack/satchel/leather - id = /obj/item/card/id/centcom - -/datum/outfit/spec_ops/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - if(visualsOnly) - return - - var/obj/item/card/id/W = H.wear_id - W.access = get_all_accesses() - W.access += get_centcom_access("Special Ops Officer") - W.assignment = "Special Ops Officer" - W.registered_name = H.real_name - W.update_label() - - var/obj/item/radio/headset/R = H.ears - R.set_frequency(FREQ_CENTCOM) - R.freqlock = TRUE - /datum/outfit/ghost_cultist name = "Cultist Ghost" diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index a765e02db5d..645d3f0943b 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -104,7 +104,7 @@ if("Research Officer") return list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_TELEPORTER, ACCESS_CENT_STORAGE) if("Special Ops Officer") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE) + return get_all_centcom_access() if("Admiral") return get_all_centcom_access() if("CentCom Commander")