From 866c562ff75f6bfc2caa281067d19a23445bb06a Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Fri, 21 Mar 2025 16:39:18 -0700 Subject: [PATCH] [MIRROR] Zaddat gear (#10490) Co-authored-by: Cameron Lennox Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- .../preference_setup/loadout/loadout_xeno.dm | 20 ++++++++++++++++++ .../loadout/loadout_xeno_yw.dm | 21 ------------------- .../clothing/spacesuits/void/zaddat.dm | 18 ++++++++-------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index cc82c079b9..23d28fb087 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -841,3 +841,23 @@ /datum/gear/suit/taur/colorable_skirt/New() ..() gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/zaddat + sort_category = "Xenowear" + whitelisted = SPECIES_ZADDAT + +/datum/gear/suit/zaddat/security + display_name = "Zaddat security shroud" + description = "A zaddat shroud with a layer of armor, for security officers" + sort_category = "Xenowear" + whitelisted = SPECIES_ZADDAT + path = /obj/item/clothing/suit/space/void/zaddat/security + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_DETECTIVE,JOB_WARDEN,JOB_SECURITY_OFFICER) + +/datum/gear/suit/zaddat/engineer + display_name = "Zaddat engineer shroud" + description = "A zaddat shroud with a extra layer of rad-shielding, for engineers" + path = /obj/item/clothing/suit/space/void/zaddat/engineer + sort_category = "Xenowear" + whitelisted = SPECIES_ZADDAT + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEER) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm index 893ade247b..c0dbd1bf92 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm @@ -1,24 +1,3 @@ -/datum/gear/suit/zaddat - sort_category = "Xenowear" - whitelisted = SPECIES_ZADDAT - -/datum/gear/suit/zaddat/security - display_name = "Zaddat security shroud" - description = "A zaddat shroud with a layer of armor, for security officers" - sort_category = "Xenowear" - whitelisted = SPECIES_ZADDAT - path = /obj/item/clothing/suit/space/void/zaddat/security - allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_DETECTIV,JOB_WARDEN,JOB_SECURITY_OFFICER) - -/datum/gear/suit/zaddat/engineer - display_name = "Zaddat engineer shroud" - description = "A zaddat shroud with a extra layer of rad-shielding, for engineers" - path = /obj/item/clothing/suit/space/void/zaddat/engineer - sort_category = "Xenowear" - whitelisted = SPECIES_ZADDAT - allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEER) - - //Added from CHOMP /datum/gear/suit/hood display_name = "hooded cloak selection (Teshari)" diff --git a/code/modules/clothing/spacesuits/void/zaddat.dm b/code/modules/clothing/spacesuits/void/zaddat.dm index 10e2f47b89..3e2c4a156b 100644 --- a/code/modules/clothing/spacesuits/void/zaddat.dm +++ b/code/modules/clothing/spacesuits/void/zaddat.dm @@ -28,14 +28,14 @@ /obj/item/clothing/suit/space/void/zaddat/verb/custom_suit() set name = "Customize Shroud" set category = "Object" - set desc = "Pick an appearence for your Shroud." + set desc = "Pick an appearance for your Shroud." var/mob/M = usr var/suit_style = null if(has_been_customized) to_chat(M, "This Shroud has already been customized!") - return 0 + return FALSE suit_style = tgui_input_list(M, "Which suit style would you like?", "Suit Style", list("Engineer", "Spacer", "Knight", "Fashion", "Bishop", "Hegemony", "Rugged", "Soft")) switch(suit_style) @@ -120,7 +120,7 @@ to_chat(M, "You finish customizing your Shroud. Looking good!") has_been_customized = TRUE M.regenerate_icons() - return 1 + return TRUE //Zaddat subtypes @@ -162,14 +162,14 @@ /obj/item/clothing/suit/space/void/zaddat/security/custom_suit() //so it cant turn into looks that dont makes sense and keep security name in it set name = "Customize Shroud" set category = "Object" - set desc = "Pick an appearence for your Shroud." + set desc = "Pick an appearance for your Shroud." var/mob/M = usr var/suit_style = null if(has_been_customized) to_chat(M, "This Shroud has already been customized!") - return 0 + return FALSE suit_style = input(M, "Which suit style would you like?") in list("Engineer", "Spacer", "Knight", "Fashion", "Bishop", "Hegemony", "Rugged", "Soft") switch(suit_style) @@ -232,20 +232,20 @@ to_chat(M, "You finish customizing your Shroud. Looking good!") has_been_customized = TRUE M.regenerate_icons() - return 1 + return TRUE /obj/item/clothing/suit/space/void/zaddat/engineer/custom_suit() set name = "Customize Shroud" set category = "Object" - set desc = "Pick an appearence for your Shroud." + set desc = "Pick an appearance for your Shroud." var/mob/M = usr var/suit_style = null if(has_been_customized) to_chat(M, "This Shroud has already been customized!") - return 0 + return FALSE suit_style = input(M, "Which suit style would you like?") in list("Engineer", "Spacer", "Knight", "Fashion", "Bishop", "Hegemony", "Rugged", "Soft") switch(suit_style) @@ -330,4 +330,4 @@ to_chat(M, "You finish customizing your Shroud. Looking good!") has_been_customized = TRUE M.regenerate_icons() - return 1 + return TRUE