From 89ad7e1fa6469bafb7b93ab4414dd4a78a649ada Mon Sep 17 00:00:00 2001 From: Killian Date: Sun, 12 Jan 2025 20:50:45 +0000 Subject: [PATCH 1/3] Update loadout_shoes.dm --- .../client/preference_setup/loadout/loadout_shoes.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 9ec7bce52a..a357de6412 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -45,6 +45,14 @@ ..() gear_tweaks += gear_tweak_free_color_choice +/datum/gear/shoes/jackboots_white + display_name = "jackboots, white" + path = /obj/item/clothing/shoes/boots/jackboots/white + +/datum/gear/shoes/jackboots_silver + display_name = "jackboots, silver" + path = /obj/item/clothing/shoes/boots/jackboots/silver + /datum/gear/shoes/workboots display_name = "workboots" path = /obj/item/clothing/shoes/boots/workboots From 95fa27627c5c61f3ffe9503439207298171cb211 Mon Sep 17 00:00:00 2001 From: Killian Date: Mon, 13 Jan 2025 21:07:20 +0000 Subject: [PATCH 2/3] Update loadout_suit.dm --- code/modules/client/preference_setup/loadout/loadout_suit.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index c221f36b6c..11995583bb 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -719,11 +719,11 @@ ..() gear_tweaks += gear_tweak_free_color_choice -/datum/gear/suit/miscellaneous/kimono +/datum/gear/suit/miscellaneous/kimono_select display_name = "kimono selection" path = /obj/item/clothing/suit/kimono/red -/datum/gear/suit/miscellaneous/kimono/New() +/datum/gear/suit/miscellaneous/kimono_select/New() ..() var/list/kimonos = list( "Red kimono" = /obj/item/clothing/suit/kimono/red, From 27a6b7eed0a1e0d207037240bde85c22badec0cf Mon Sep 17 00:00:00 2001 From: Killian Date: Mon, 13 Jan 2025 21:26:08 +0000 Subject: [PATCH 3/3] clean up _vr files --- .../preference_setup/loadout/gear_tweaks.dm | 17 +- .../loadout/gear_tweaks_vr.dm | 14 - .../preference_setup/loadout/loadout.dm | 2 + .../loadout/loadout_cosmetics.dm | 23 +- .../loadout/loadout_cosmetics_vr.dm | 20 - .../preference_setup/loadout/loadout_eyes.dm | 53 +++ .../loadout/loadout_eyes_vr.dm | 55 --- ...fluffitems_vr.dm => loadout_fluffitems.dm} | 0 .../loadout/loadout_general.dm | 110 +++++- .../loadout/loadout_general_vr.dm | 107 ------ .../loadout/loadout_gloves.dm | 32 ++ .../loadout/loadout_gloves_vr.dm | 32 -- .../preference_setup/loadout/loadout_head.dm | 97 +++++ .../loadout/loadout_head_vr.dm | 100 ----- .../preference_setup/loadout/loadout_shoes.dm | 44 +++ .../loadout/loadout_shoes_vr.dm | 43 --- .../preference_setup/loadout/loadout_suit.dm | 342 ++++++++++++++++++ .../loadout/loadout_suit_vr.dm | 341 ----------------- .../loadout/loadout_uniform.dm | 226 ++++++++++++ .../loadout/loadout_uniform_vr.dm | 227 ------------ .../loadout/loadout_utility.dm | 81 +++++ .../loadout/loadout_utility_vr.dm | 80 ---- .../preference_setup/loadout/loadout_vr.dm | 3 - .../preference_setup/loadout/loadout_xeno.dm | 154 +++++++- .../loadout/loadout_xeno_vr.dm | 158 -------- maps/~map_system/_map_selection.dm | 4 +- vorestation.dme | 14 +- 27 files changed, 1179 insertions(+), 1200 deletions(-) delete mode 100644 code/modules/client/preference_setup/loadout/gear_tweaks_vr.dm delete mode 100644 code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm delete mode 100644 code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm rename code/modules/client/preference_setup/loadout/{loadout_fluffitems_vr.dm => loadout_fluffitems.dm} (100%) delete mode 100644 code/modules/client/preference_setup/loadout/loadout_general_vr.dm delete mode 100644 code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm delete mode 100644 code/modules/client/preference_setup/loadout/loadout_head_vr.dm delete mode 100644 code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm delete mode 100644 code/modules/client/preference_setup/loadout/loadout_suit_vr.dm delete mode 100644 code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm delete mode 100644 code/modules/client/preference_setup/loadout/loadout_utility_vr.dm delete mode 100644 code/modules/client/preference_setup/loadout/loadout_vr.dm delete mode 100644 code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks.dm b/code/modules/client/preference_setup/loadout/gear_tweaks.dm index ce9a748e5c..5948152129 100644 --- a/code/modules/client/preference_setup/loadout/gear_tweaks.dm +++ b/code/modules/client/preference_setup/loadout/gear_tweaks.dm @@ -599,4 +599,19 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new() /datum/gear_tweak/implant_location/get_metadata(var/user, var/metadata) return (tgui_input_list(user, "Select a bodypart for the implant to be implanted inside.", "Implant Location", bodypart_names_to_tokens || bodypart_tokens_to_names[BP_TORSO])) -#undef LOADOUT_BAN_STRING +/datum/gear_tweak/collar_tag/get_contents(var/metadata) + return "Tag: [metadata]" + +/datum/gear_tweak/collar_tag/get_default() + return "" + +/datum/gear_tweak/collar_tag/get_metadata(var/user, var/metadata) + return sanitize( tgui_input_text(user, "Choose the tag text", "Character Preference", metadata, MAX_NAME_LEN), MAX_NAME_LEN ) + +/datum/gear_tweak/collar_tag/tweak_item(var/obj/item/clothing/accessory/collar/C, var/metadata) + if(metadata == "") + return ..() + else + C.initialize_tag(metadata) + +#undef LOADOUT_BAN_STRING \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks_vr.dm b/code/modules/client/preference_setup/loadout/gear_tweaks_vr.dm deleted file mode 100644 index 4de3362d6f..0000000000 --- a/code/modules/client/preference_setup/loadout/gear_tweaks_vr.dm +++ /dev/null @@ -1,14 +0,0 @@ -/datum/gear_tweak/collar_tag/get_contents(var/metadata) - return "Tag: [metadata]" - -/datum/gear_tweak/collar_tag/get_default() - return "" - -/datum/gear_tweak/collar_tag/get_metadata(var/user, var/metadata) - return sanitize( tgui_input_text(user, "Choose the tag text", "Character Preference", metadata, MAX_NAME_LEN), MAX_NAME_LEN ) - -/datum/gear_tweak/collar_tag/tweak_item(var/obj/item/clothing/accessory/collar/C, var/metadata) - if(metadata == "") - return ..() - else - C.initialize_tag(metadata) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 0fba39295b..278483501d 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -273,6 +273,8 @@ var/list/gear_datums = list() var/list/gear_tweaks = list() //List of datums which will alter the item after it has been spawned. var/exploitable = 0 //Does it go on the exploitable information list? var/type_category = null + var/list/ckeywhitelist //restricted based on these ckeys? + var/list/character_name //restricted to these character names? /datum/gear/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm index f48943883b..5ddf5fab16 100644 --- a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm +++ b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm @@ -17,4 +17,25 @@ /datum/gear/cosmetic display_name = "purple comb" path = /obj/item/haircomb - sort_category = "Cosmetics" \ No newline at end of file + sort_category = "Cosmetics" + +/datum/gear/cosmetic/nailpolish + display_name = "nail polish (colorable)" + description = "Nail polish, available in every color of the rainbow! Doesn't come with nail polish remover." + path = /obj/item/nailpolish + +/datum/gear/cosmetic/nailpolish/New() + ..() + // can't set description, it'll look funny + gear_tweaks = list(gear_tweak_free_color_choice, gear_tweak_free_name) + +/datum/gear/cosmetic/nailpolish/spawn_item(var/location, var/metadata) + var/obj/item/nailpolish/polish = ..() + polish.set_colour(polish.color) + polish.color = null + return polish + +/datum/gear/cosmetic/nailpolish_remover + display_name = "nail polish remover" + description = "Nail polish remover, for when the fun's over. Doesn't come with nail polish." + path = /obj/item/nailpolish_remover diff --git a/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm b/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm deleted file mode 100644 index 9cd5982274..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/gear/cosmetic/nailpolish - display_name = "nail polish (colorable)" - description = "Nail polish, available in every color of the rainbow! Doesn't come with nail polish remover." - path = /obj/item/nailpolish - -/datum/gear/cosmetic/nailpolish/New() - ..() - // can't set description, it'll look funny - gear_tweaks = list(gear_tweak_free_color_choice, gear_tweak_free_name) - -/datum/gear/cosmetic/nailpolish/spawn_item(var/location, var/metadata) - var/obj/item/nailpolish/polish = ..() - polish.set_colour(polish.color) - polish.color = null - return polish - -/datum/gear/cosmetic/nailpolish_remover - display_name = "nail polish remover" - description = "Nail polish remover, for when the fun's over. Doesn't come with nail polish." - path = /obj/item/nailpolish_remover \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 79cfd6e3e2..1f4104c20f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -178,3 +178,56 @@ /datum/gear/eyes/glasses/prescriptionthin display_name = "glasses, prescription thin frame" path = /obj/item/clothing/glasses/regular/thin + +/datum/gear/eyes/arglasses + display_name = "AR glasses" + path = /obj/item/clothing/glasses/omnihud + +/datum/gear/eyes/arglasses/visor + display_name = "AR visor" + path = /obj/item/clothing/glasses/omnihud/visor + +/datum/gear/eyes/arglasses/visor/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) +/datum/gear/eyes/arglassespres + display_name = "AR glasses, prescription" + path = /obj/item/clothing/glasses/omnihud/prescription + +/datum/gear/eyes/arglasses/sec + display_name = "AR-Security glasses" + path = /obj/item/clothing/glasses/omnihud/sec + allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE) + +/datum/gear/eyes/arglasses/sci + display_name = "AR-Research glasses" + path = /obj/item/clothing/glasses/omnihud/rnd + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ROBOTICIST) + +/datum/gear/eyes/arglasses/eng + display_name = "AR-Engineering glasses" + path = /obj/item/clothing/glasses/omnihud/eng + allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN) + +/datum/gear/eyes/arglasses/med + display_name = "AR-Medical glasses" + path = /obj/item/clothing/glasses/omnihud/med + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) + +/datum/gear/eyes/arglasses/all + display_name = "AR-Command glasses" + path = /obj/item/clothing/glasses/omnihud/all + cost = 2 + allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL) + +/datum/gear/eyes/spiffygogs + display_name = "slick orange goggles" + path = /obj/item/clothing/glasses/fluff/spiffygogs + +/datum/gear/eyes/science_proper + display_name = "science goggles (no overlay)" + path = /obj/item/clothing/glasses/fluff/science_proper + +/datum/gear/eyes/bigshot + display_name = "Big Shot's Glasses" + path = /obj/item/clothing/glasses/sunglasses/bigshot diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm deleted file mode 100644 index b8d8a09518..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ /dev/null @@ -1,55 +0,0 @@ -/datum/gear/eyes/medical - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) - -/datum/gear/eyes/arglasses - display_name = "AR glasses" - path = /obj/item/clothing/glasses/omnihud - -/datum/gear/eyes/arglasses/visor - display_name = "AR visor" - path = /obj/item/clothing/glasses/omnihud/visor - -/datum/gear/eyes/arglasses/visor/New() - ..() - gear_tweaks = list(gear_tweak_free_color_choice) -/datum/gear/eyes/arglassespres - display_name = "AR glasses, prescription" - path = /obj/item/clothing/glasses/omnihud/prescription - -/datum/gear/eyes/arglasses/sec - display_name = "AR-Security glasses" - path = /obj/item/clothing/glasses/omnihud/sec - allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE) - -/datum/gear/eyes/arglasses/sci - display_name = "AR-Research glasses" - path = /obj/item/clothing/glasses/omnihud/rnd - allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ROBOTICIST) - -/datum/gear/eyes/arglasses/eng - display_name = "AR-Engineering glasses" - path = /obj/item/clothing/glasses/omnihud/eng - allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN) - -/datum/gear/eyes/arglasses/med - display_name = "AR-Medical glasses" - path = /obj/item/clothing/glasses/omnihud/med - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) - -/datum/gear/eyes/arglasses/all - display_name = "AR-Command glasses" - path = /obj/item/clothing/glasses/omnihud/all - cost = 2 - allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL) - -/datum/gear/eyes/spiffygogs - display_name = "slick orange goggles" - path = /obj/item/clothing/glasses/fluff/spiffygogs - -/datum/gear/eyes/science_proper - display_name = "science goggles (no overlay)" - path = /obj/item/clothing/glasses/fluff/science_proper - -/datum/gear/eyes/bigshot - display_name = "Big Shot's Glasses" - path = /obj/item/clothing/glasses/sunglasses/bigshot diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm similarity index 100% rename from code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm rename to code/modules/client/preference_setup/loadout/loadout_fluffitems.dm diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index b9448887d0..de9a69226f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -195,4 +195,112 @@ coffeemugs["tall rainbow coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow coffeemugs["Talon coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/talon gear_tweaks += new /datum/gear_tweak/path(coffeemugs) - gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents()) \ No newline at end of file + gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents()) + +/datum/gear/ball + display_name = "tennis ball selection" + description = "Choose from a num- BALL!" + path = /obj/item/toy/tennis + +/datum/gear/ball/New() + ..() + var/list/balls = list() + for(var/obj/item/toy/tennis/ball_type as anything in typesof(/obj/item/toy/tennis/)) + balls[initial(ball_type.name)] = ball_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(balls)) + +/datum/gear/character/ + display_name = "miniature selection" + description = "Choose from a number of miniatures. From Battlemace 40 million to Grottos and Ghouls." + path = /obj/item/toy/character/alien + +/datum/gear/character/New() + ..() + var/list/characters = list() + for(var/obj/item/toy/character/character_type as anything in subtypesof(/obj/item/toy/character)) + characters[initial(character_type.name)] = character_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(characters)) + +/datum/gear/mechtoy/ + display_name = "mecha toy selection" + description = "Choose from a number of mech toys." + path = /obj/item/toy/mecha/ripley + +/datum/gear/mechtoy/New() + ..() + var/list/mechs = list() + for(var/obj/item/toy/mecha/mech_type as anything in subtypesof(/obj/item/toy/mecha)) + mechs[initial(mech_type.name)] = mech_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(mechs)) + +/datum/gear/toy/New() + ..() + var/toytype = list() + toytype["Blink toy"] = /obj/item/toy/blink + toytype["Foam dart crossbow"] = /obj/item/toy/blink + toytype["Toy sword"] = /obj/item/toy/sword + toytype["Toy katana"] = /obj/item/toy/katana + toytype["Snap pops"] = /obj/item/storage/box/snappops + toytype["Plastic flowers"] = /obj/item/toy/bouquet/fake + toytype["Stick horse"] = /obj/item/toy/stickhorse + toytype["Toy X-mas tree"] = /obj/item/toy/xmastree + toytype["Fake handcuff kit"] = /obj/item/storage/box/handcuffs/fake + toytype["Gravitational singularity"] = /obj/item/toy/spinningtoy + toytype["Water flower"] = /obj/item/reagent_containers/spray/waterflower + toytype["Bosun's whistle"] = /obj/item/toy/bosunwhistle + toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball + toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch + toytype["Pet rock"] = /obj/item/toy/rock + toytype["Toy flash"] = /obj/item/toy/flash + toytype["Big Red Button"] = /obj/item/toy/redbutton + toytype["Garden gnome"] = /obj/item/toy/gnome + toytype["Toy AI"] = /obj/item/toy/AI + toytype["Toy nuke"] = /obj/item/toy/nuke + toytype["Toy gibber"] = /obj/item/toy/minigibber + toytype["Toy xeno"] = /obj/item/toy/toy_xeno + gear_tweaks += new/datum/gear_tweak/path(toytype) + +/datum/gear/chewtoy + display_name = "animal toy selection" + path = /obj/item/toy/chewtoy + +/datum/gear/chewtoy/New() + ..() + var/toytype = list() + toytype["Bone"] = /obj/item/toy/chewtoy + toytype["Classic"] = /obj/item/toy/chewtoy/tall + toytype["Mouse"] = /obj/item/toy/cat_toy + toytype["Feather rod"] = /obj/item/toy/cat_toy/rod + gear_tweaks += new/datum/gear_tweak/path(toytype) + +/datum/gear/chewtoy_poly + display_name = "animal toy selection, colorable" + path = /obj/item/toy/chewtoy/poly + +/datum/gear/chewtoy_poly/New() + ..() + var/toytype = list() + toytype["Bone"] = /obj/item/toy/chewtoy/poly + toytype["Classic"] = /obj/item/toy/chewtoy/tall/poly + gear_tweaks += new/datum/gear_tweak/path(toytype) + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/textmug + display_name = "mug with text" + description = "A mug with something written on it." + path = /obj/item/reagent_containers/food/drinks/textmug + +/datum/gear/schnapsen + display_name = "schnapsen playing cards" + description = "An ancient Austro-Hungarian suit of cards!" + path = /obj/item/deck/schnapsen + +/datum/gear/egy_game + display_name = "EGY playing cards" + description = "A deck of cards for playing EGY! Be the first to lose all cards!" + path = /obj/item/deck/egy + +/datum/gear/fluff_permit + display_name = "Customizable Permit" + description = "A customizable permit you can use for... just about anything! Be sure to customize the name and description. It is meant to represent generic driver's or pilot's licenses, and similar fluff items. It includes an irremovable disclaimer and may be freely confiscated or revoked at the discretion of Security and/or Command if you attempt to abuse it!" + path = /obj/item/card_fluff diff --git a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm deleted file mode 100644 index 86a89ddfa8..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm +++ /dev/null @@ -1,107 +0,0 @@ -/datum/gear/ball - display_name = "tennis ball selection" - description = "Choose from a num- BALL!" - path = /obj/item/toy/tennis - -/datum/gear/ball/New() - ..() - var/list/balls = list() - for(var/obj/item/toy/tennis/ball_type as anything in typesof(/obj/item/toy/tennis/)) - balls[initial(ball_type.name)] = ball_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(balls)) - -/datum/gear/character/ - display_name = "miniature selection" - description = "Choose from a number of miniatures. From Battlemace 40 million to Grottos and Ghouls." - path = /obj/item/toy/character/alien - -/datum/gear/character/New() - ..() - var/list/characters = list() - for(var/obj/item/toy/character/character_type as anything in subtypesof(/obj/item/toy/character)) - characters[initial(character_type.name)] = character_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(characters)) - -/datum/gear/mechtoy/ - display_name = "mecha toy selection" - description = "Choose from a number of mech toys." - path = /obj/item/toy/mecha/ripley - -/datum/gear/mechtoy/New() - ..() - var/list/mechs = list() - for(var/obj/item/toy/mecha/mech_type as anything in subtypesof(/obj/item/toy/mecha)) - mechs[initial(mech_type.name)] = mech_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(mechs)) - -/datum/gear/toy/New() - ..() - var/toytype = list() - toytype["Blink toy"] = /obj/item/toy/blink - toytype["Foam dart crossbow"] = /obj/item/toy/blink - toytype["Toy sword"] = /obj/item/toy/sword - toytype["Toy katana"] = /obj/item/toy/katana - toytype["Snap pops"] = /obj/item/storage/box/snappops - toytype["Plastic flowers"] = /obj/item/toy/bouquet/fake - toytype["Stick horse"] = /obj/item/toy/stickhorse - toytype["Toy X-mas tree"] = /obj/item/toy/xmastree - toytype["Fake handcuff kit"] = /obj/item/storage/box/handcuffs/fake - toytype["Gravitational singularity"] = /obj/item/toy/spinningtoy - toytype["Water flower"] = /obj/item/reagent_containers/spray/waterflower - toytype["Bosun's whistle"] = /obj/item/toy/bosunwhistle - toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball - toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch - toytype["Pet rock"] = /obj/item/toy/rock - toytype["Toy flash"] = /obj/item/toy/flash - toytype["Big Red Button"] = /obj/item/toy/redbutton - toytype["Garden gnome"] = /obj/item/toy/gnome - toytype["Toy AI"] = /obj/item/toy/AI - toytype["Toy nuke"] = /obj/item/toy/nuke - toytype["Toy gibber"] = /obj/item/toy/minigibber - toytype["Toy xeno"] = /obj/item/toy/toy_xeno - gear_tweaks += new/datum/gear_tweak/path(toytype) - -/datum/gear/chewtoy - display_name = "animal toy selection" - path = /obj/item/toy/chewtoy - -/datum/gear/chewtoy/New() - ..() - var/toytype = list() - toytype["Bone"] = /obj/item/toy/chewtoy - toytype["Classic"] = /obj/item/toy/chewtoy/tall - toytype["Mouse"] = /obj/item/toy/cat_toy - toytype["Feather rod"] = /obj/item/toy/cat_toy/rod - gear_tweaks += new/datum/gear_tweak/path(toytype) - -/datum/gear/chewtoy_poly - display_name = "animal toy selection, colorable" - path = /obj/item/toy/chewtoy/poly - -/datum/gear/chewtoy_poly/New() - ..() - var/toytype = list() - toytype["Bone"] = /obj/item/toy/chewtoy/poly - toytype["Classic"] = /obj/item/toy/chewtoy/tall/poly - gear_tweaks += new/datum/gear_tweak/path(toytype) - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/textmug - display_name = "mug with text" - description = "A mug with something written on it." - path = /obj/item/reagent_containers/food/drinks/textmug - -/datum/gear/schnapsen - display_name = "schnapsen playing cards" - description = "An ancient Austro-Hungarian suit of cards!" - path = /obj/item/deck/schnapsen - -/datum/gear/egy_game - display_name = "EGY playing cards" - description = "A deck of cards for playing EGY! Be the first to lose all cards!" - path = /obj/item/deck/egy - -/datum/gear/fluff_permit - display_name = "Customizable Permit" - description = "A customizable permit you can use for... just about anything! Be sure to customize the name and description. It is meant to represent generic driver's or pilot's licenses, and similar fluff items. It includes an irremovable disclaimer and may be freely confiscated or revoked at the discretion of Security and/or Command if you attempt to abuse it!" - path = /obj/item/card_fluff diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves.dm b/code/modules/client/preference_setup/loadout/loadout_gloves.dm index 29f22840e6..4aa4ec8206 100644 --- a/code/modules/client/preference_setup/loadout/loadout_gloves.dm +++ b/code/modules/client/preference_setup/loadout/loadout_gloves.dm @@ -117,3 +117,35 @@ "survival"=/obj/item/clothing/accessory/watch/survival ) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_watches)) + +/datum/gear/gloves/goldring + display_name = "wedding ring, gold" + path = /obj/item/clothing/accessory/ring/wedding + +/datum/gear/gloves/silverring + display_name = "wedding ring, silver" + path = /obj/item/clothing/accessory/ring/wedding/silver + +/datum/gear/gloves/colored + display_name = "gloves, colorable" + path = /obj/item/clothing/gloves/color + +/datum/gear/gloves/colored/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/gloves/latex/colorable + display_name = "gloves, latex, colorable" + path = /obj/item/clothing/gloves/sterile/latex + +/datum/gear/gloves/latex/colorable/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/gloves/siren + display_name = "gloves, Siren" + path = /obj/item/clothing/gloves/fluff/siren + +/datum/gear/gloves/maid_arms + display_name = "maid arm covers" + path = /obj/item/clothing/accessory/maid_arms diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm b/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm deleted file mode 100644 index fd25064e85..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm +++ /dev/null @@ -1,32 +0,0 @@ -/datum/gear/gloves/goldring - display_name = "wedding ring, gold" - path = /obj/item/clothing/accessory/ring/wedding - -/datum/gear/gloves/silverring - display_name = "wedding ring, silver" - path = /obj/item/clothing/accessory/ring/wedding/silver - -/datum/gear/gloves/colored - display_name = "gloves, colorable" - path = /obj/item/clothing/gloves/color - -/datum/gear/gloves/colored/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - - -/datum/gear/gloves/latex/colorable - display_name = "gloves, latex, colorable" - path = /obj/item/clothing/gloves/sterile/latex - -/datum/gear/gloves/latex/colorable/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/gloves/siren - display_name = "gloves, Siren" - path = /obj/item/clothing/gloves/fluff/siren - -/datum/gear/gloves/maid_arms - display_name = "maid arm covers" - path = /obj/item/clothing/accessory/maid_arms diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index c5a80a9e67..4e1d7a1e61 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -449,3 +449,100 @@ "pilot helmet, major bill's transport"=/obj/item/clothing/head/pilot_vr/mbill ) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) + +/datum/gear/head/headbando + display_name = "basic headband" + path = /obj/item/clothing/head/fluff/headbando + +/datum/gear/head/headbando/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/head/maid + display_name = "maid headband selection" + path = /obj/item/clothing/head/headband/maid + +/datum/gear/head/maid/New() + ..() + var/list/headbands_list = list() + for(var/obj/item/clothing/head/bands as anything in typesof(/obj/item/clothing/head/headband/maid)) + headbands_list[initial(bands.name)] = bands + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(headbands_list)) + +//Detective alternative +/datum/gear/head/detective_alt + display_name = "cyberscope headgear, detective" + path = /obj/item/clothing/head/helmet/detective_alt + allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_DETECTIVE) + +/datum/gear/head/bearpelt + display_name = "animal pelt selection" + description = "Select from a range of (probably, hopefully) synthetic/artificial animal pelts." + path = /obj/item/clothing/head/pelt + +/datum/gear/head/bearpelt/New() + ..() + var/list/selector_uniforms = list( + "bear, brown"=/obj/item/clothing/head/pelt, + "wolf, brown"=/obj/item/clothing/head/pelt/wolfpelt, + "wolf, black"=/obj/item/clothing/head/pelt/wolfpeltblack, + "tiger, plain"=/obj/item/clothing/head/pelt/tigerpelt, + "tiger, white"=/obj/item/clothing/head/pelt/tigerpeltsnow, + "tiger, pink"=/obj/item/clothing/head/pelt/tigerpeltpink + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) + +/datum/gear/head/magic_hat + display_name = "wizard hat, colorable" + path = /obj/item/clothing/head/wizard/fake/realistic/colorable + +/datum/gear/head/magic_hat/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/head/wedding + display_name = "wedding veil" + path = /obj/item/clothing/head/wedding + +/datum/gear/head/wedding/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/head/halo/alt + display_name = "halo, alt" + path = /obj/item/clothing/head/halo/alt + +/datum/gear/head/buckethat + display_name = "hat, bucket" + path = /obj/item/clothing/head/buckethat + +/datum/gear/head/buckethat/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/head/nonla + display_name = "hat, non la" + path = /obj/item/clothing/head/nonla + +/* +Talon hats +*/ +/datum/gear/head/cap/talon + display_name = "cap, Talon" + path = /obj/item/clothing/head/soft/talon + +/datum/gear/head/beret/talon + display_name = "beret, Talon" + path = /obj/item/clothing/head/beret + +// tiny tophat + +/datum/gear/head/tiny_tophat + display_name = "tiny tophat" + path = /obj/item/clothing/head/tinytophat + +//Replikant hat + +/datum/gear/head/eulrhat + display_name = "Sleek side cap" + path = /obj/item/clothing/head/eulrhat diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm deleted file mode 100644 index 969bb5cb06..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm +++ /dev/null @@ -1,100 +0,0 @@ -/*/datum/gear/head/cap/sol - display_name = "cap, sol" - path = /obj/item/clothing/head/soft/sol*/ - -/datum/gear/head/headbando - display_name = "basic headband" - path = /obj/item/clothing/head/fluff/headbando - -/datum/gear/head/headbando/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/head/maid - display_name = "maid headband selection" - path = /obj/item/clothing/head/headband/maid - -/datum/gear/head/maid/New() - ..() - var/list/headbands_list = list() - for(var/obj/item/clothing/head/bands as anything in typesof(/obj/item/clothing/head/headband/maid)) - headbands_list[initial(bands.name)] = bands - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(headbands_list)) - -//Detective alternative -/datum/gear/head/detective_alt - display_name = "cyberscope headgear, detective" - path = /obj/item/clothing/head/helmet/detective_alt - allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_DETECTIVE) - -/datum/gear/head/bearpelt - display_name = "animal pelt selection" - description = "Select from a range of (probably, hopefully) synthetic/artificial animal pelts." - path = /obj/item/clothing/head/pelt - -/datum/gear/head/bearpelt/New() - ..() - var/list/selector_uniforms = list( - "bear, brown"=/obj/item/clothing/head/pelt, - "wolf, brown"=/obj/item/clothing/head/pelt/wolfpelt, - "wolf, black"=/obj/item/clothing/head/pelt/wolfpeltblack, - "tiger, plain"=/obj/item/clothing/head/pelt/tigerpelt, - "tiger, white"=/obj/item/clothing/head/pelt/tigerpeltsnow, - "tiger, pink"=/obj/item/clothing/head/pelt/tigerpeltpink - ) - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) - -/datum/gear/head/magic_hat - display_name = "wizard hat, colorable" - path = /obj/item/clothing/head/wizard/fake/realistic/colorable - -/datum/gear/head/magic_hat/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/head/wedding - display_name = "wedding veil" - path = /obj/item/clothing/head/wedding - -/datum/gear/head/wedding/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/head/halo/alt - display_name = "halo, alt" - path = /obj/item/clothing/head/halo/alt - -/datum/gear/head/buckethat - display_name = "hat, bucket" - path = /obj/item/clothing/head/buckethat - -/datum/gear/head/buckethat/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/head/nonla - display_name = "hat, non la" - path = /obj/item/clothing/head/nonla - -/* -Talon hats -*/ -/datum/gear/head/cap/talon - display_name = "cap, Talon" - path = /obj/item/clothing/head/soft/talon - -/datum/gear/head/beret/talon - display_name = "beret, Talon" - path = /obj/item/clothing/head/beret - -// tiny tophat - -/datum/gear/head/tiny_tophat - display_name = "tiny tophat" - path = /obj/item/clothing/head/tinytophat - -//Replikant hat - -/datum/gear/head/eulrhat - display_name = "Sleek side cap" - path = /obj/item/clothing/head/eulrhat diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index a357de6412..6a3e886c08 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -273,3 +273,47 @@ /datum/gear/shoes/sandals/New() ..() gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/shoes/black/cuffs + display_name = "legwraps, black" + path = /obj/item/clothing/shoes/black/cuffs + +/datum/gear/shoes/black/cuffs/blue + display_name = "legwraps, blue" + path = /obj/item/clothing/shoes/black/cuffs/blue + +/datum/gear/shoes/black/cuffs/red + display_name = "legwraps, red" + path = /obj/item/clothing/shoes/black/cuffs/red + +/datum/gear/shoes/siren + display_name = "boots, Siren" + path = /obj/item/clothing/shoes/boots/fluff/siren + +/datum/gear/shoes/toeless + display_name = "toe-less jackboots" + path = /obj/item/clothing/shoes/boots/jackboots/toeless + +/datum/gear/shoes/singer_blue + display_name = "blue performer's boots" + path = /obj/item/clothing/shoes/boots/singer + +/datum/gear/shoes/singer_yellow + display_name = "yellow performer's boots" + path = /obj/item/clothing/shoes/boots/singer/yellow + +/datum/gear/shoes/antediluvian + display_name = "legwraps, antediluvian" + path = /obj/item/clothing/shoes/antediluvian + +/datum/gear/shoes/flats/alt + display_name = "flats, alt" + path = /obj/item/clothing/shoes/flats/white/color/alt + +/datum/gear/shoes/sandals_elegant + display_name = "sandals, elegant" + path = /obj/item/clothing/shoes/sandals_elegant + +/datum/gear/shoes/sandals_elegant/New() + ..() + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm deleted file mode 100644 index 07e121d039..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm +++ /dev/null @@ -1,43 +0,0 @@ -/datum/gear/shoes/black/cuffs - display_name = "legwraps, black" - path = /obj/item/clothing/shoes/black/cuffs - -/datum/gear/shoes/black/cuffs/blue - display_name = "legwraps, blue" - path = /obj/item/clothing/shoes/black/cuffs/blue - -/datum/gear/shoes/black/cuffs/red - display_name = "legwraps, red" - path = /obj/item/clothing/shoes/black/cuffs/red - -/datum/gear/shoes/siren - display_name = "boots, Siren" - path = /obj/item/clothing/shoes/boots/fluff/siren - -/datum/gear/shoes/toeless - display_name = "toe-less jackboots" - path = /obj/item/clothing/shoes/boots/jackboots/toeless - -/datum/gear/shoes/singer_blue - display_name = "blue performer's boots" - path = /obj/item/clothing/shoes/boots/singer - -/datum/gear/shoes/singer_yellow - display_name = "yellow performer's boots" - path = /obj/item/clothing/shoes/boots/singer/yellow - -/datum/gear/shoes/antediluvian - display_name = "legwraps, antediluvian" - path = /obj/item/clothing/shoes/antediluvian - -/datum/gear/shoes/flats/alt - display_name = "flats, alt" - path = /obj/item/clothing/shoes/flats/white/color/alt - -/datum/gear/shoes/sandals_elegant - display_name = "sandals, elegant" - path = /obj/item/clothing/shoes/sandals_elegant - -/datum/gear/shoes/sandals_elegant/New() - ..() - gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 11995583bb..ea4a8cc52f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -801,3 +801,345 @@ /datum/gear/suit/bomber_pilot display_name = "bomber jacket, pilot" path = /obj/item/clothing/suit/storage/toggle/bomber/pilot + +/datum/gear/suit/snowsuit/medical + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) + +/datum/gear/suit/labcoat_colorable + display_name = "labcoat, colorable" + path = /obj/item/clothing/suit/storage/toggle/labcoat + +/datum/gear/suit/labcoat_colorable/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/labcoat_old + display_name = "labcoat, old-school" + path = /obj/item/clothing/suit/storage/toggle/labcoat/old + +/datum/gear/suit/labcoat_cmo_old + display_name = "labcoat, CMO, oldschool" + path = /obj/item/clothing/suit/storage/toggle/labcoat/old/cmo + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER) + +/datum/gear/suit/roles/labcoat_old + display_name = "labcoat selection, department, oldschool" + path = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox + cost = 2 + +/datum/gear/suit/roles/labcoat_old/New() + ..() + var/list/labcoats = list( + "Oldschool Scientist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox, + "Oldschool Virologist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/vir, + "Oldschool Chemist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/chem + ) + gear_tweaks += new/datum/gear_tweak/path(labcoats) + +/datum/gear/suit/jacket_modular + display_name = "jacket, modular" + path = /obj/item/clothing/suit/storage/fluff/jacket + +/datum/gear/suit/jacket_modular/New() + ..() + var/list/the_jackets = list() + for(var/the_jacket in typesof(/obj/item/clothing/suit/storage/fluff/jacket)) + var/obj/item/clothing/suit/jacket_type = the_jacket + the_jackets[initial(jacket_type.name)] = jacket_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(the_jackets)) + +/datum/gear/suit/gntop + display_name = "GN crop jacket" + path = /obj/item/clothing/suit/storage/fluff/gntop + +/datum/gear/suit/old_poncho //This is made from an old sprite which has been here for quite some time. Called old poncho because duplicates + display_name = "Colorful poncho" + description = "A Mexican looking poncho. It look like it fits wolf taurs as well." + path = /obj/item/clothing/suit/poncho + +//Detective alternative +/datum/gear/suit/detective_alt + display_name = "sleek modern coat selection" + path = /obj/item/clothing/suit/storage/det_trench/alt + allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_DETECTIVE) + +/datum/gear/suit/detective_alt/New() + ..() + var/list/coats = list( + "Modern coat (tan)" = /obj/item/clothing/suit/storage/det_trench/alt, + "Modern coat (long, tan)" = /obj/item/clothing/suit/storage/det_trench/alt2, + "Modern coat (black)" = /obj/item/clothing/suit/storage/det_trench/alt/black, + "Modern coat (long, black)" = /obj/item/clothing/suit/storage/det_trench/alt2/black + ) + gear_tweaks += new/datum/gear_tweak/path(coats) + +//EMT coats, jackets and vest +/datum/gear/suit/paramedic_coat + display_name = "paramedic outerwear selection" + path = /obj/item/clothing/suit/storage/toggle/fr_jacket + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC,JOB_MEDICAL_DOCTOR) + +/datum/gear/suit/paramedic_coat/New() + ..() + var/list/paramedicCoats = list( + "First responder jacket" = /obj/item/clothing/suit/storage/toggle/fr_jacket, + "First responder jacket, alt." = /obj/item/clothing/suit/storage/toggle/fr_jacket/ems, + "Paramedic vest" = /obj/item/clothing/suit/storage/toggle/paramedic, + "EMT's labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/neo_emt, + "High visibility jacket" = /obj/item/clothing/suit/storage/toggle/labcoat/neo_highvis, + "Red EMT jacket" = /obj/item/clothing/suit/storage/toggle/labcoat/neo_redemt, + "Dark Blue EMT jacket" = /obj/item/clothing/suit/storage/toggle/labcoat/neo_blueemt + ) + gear_tweaks += new/datum/gear_tweak/path(paramedicCoats) + +//greek thing +/datum/gear/suit/chiton + display_name = "chiton" + path = /obj/item/clothing/suit/chiton + +//oversized t-shirt +/datum/gear/suit/oversize + display_name = "oversized t-shirt (colorable)" + path = /obj/item/clothing/suit/oversize + +/datum/gear/suit/oversize/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/* +Talon winter coat +*/ +/datum/gear/suit/wintercoat/talon + display_name = "winter coat, Talon" + path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon + +/datum/gear/suit/armor/combat/crusader_explo + display_name = "knight, explo" + path = /obj/item/clothing/suit/armor/combat/crusader_explo + //allowed_roles = list(JOB_EXPLORER,JOB_PATHFINDER) + +/datum/gear/suit/armor/combat/crusader_explo/FM + display_name = "knight, Field Medic" + path = /obj/item/clothing/suit/armor/combat/crusader_explo/FM + allowed_roles = list (JOB_PARAMEDIC) + +//Long fur coat +/datum/gear/suit/russofurcoat + display_name = "long fur coat" + path = /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat + +//Colorable Hoodie +/datum/gear/suit/hoodie_vr + display_name = "hoodie with hood (colorable)" + path = /obj/item/clothing/suit/storage/hooded/hoodie + +/datum/gear/suit/hoodie_vr/New() + ..() + var/list/hoodies = list() + for(var/hoodie_style in typesof(/obj/item/clothing/suit/storage/hooded/hoodie)) + var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style + hoodies[initial(hoodie.name)] = hoodie + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies)) + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/cyberpunk_recolorable + display_name = "cyberpunk jacket (recolorable)" + path = /obj/item/clothing/suit/cyberpunk/recolorable + cost = 2 //It's got armor, yo. + +/datum/gear/suit/cyberpunk_recolorable/New() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/shrine_maiden + display_name = "shrine maiden costume" + path = /obj/item/clothing/suit/shrine_maiden + +//Antediluvian cloak +/datum/gear/suit/cloak_ante + display_name = "cloak, antediluvian" + path = /obj/item/clothing/accessory/poncho/roles/cloak/antediluvian + cost = 1 + +//Chaplain cloaks +/datum/gear/suit/cloak_chaplain + display_name = "cloak, chaplain" + path = /obj/item/clothing/accessory/poncho/roles/cloak/chapel + cost = 1 + +/datum/gear/suit/cloak_chaplain/alt + display_name = "cloak, chaplain, alt" + path = /obj/item/clothing/accessory/poncho/roles/cloak/chapel/alt + cost = 1 + +//Half cloak +/datum/gear/suit/cloak_half + display_name = "cloak, half, colorable" + path = /obj/item/clothing/accessory/poncho/roles/cloak/half + cost = 1 + +/datum/gear/suit/cloak_half/New() + gear_tweaks += gear_tweak_free_color_choice + +//Shoulder cloak +/datum/gear/suit/cloak_shoulder + display_name = "cloak, shoulder" + path = /obj/item/clothing/accessory/poncho/roles/cloak/shoulder + cost = 1 + +/datum/gear/suit/cloak_shoulder/New() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/cloak_shoulder_right + display_name = "cloak, shoulder right" + path = /obj/item/clothing/accessory/poncho/roles/cloak/shoulder/right + cost = 1 + +/datum/gear/suit/cloak_shoulder_right/New() + gear_tweaks += gear_tweak_free_color_choice + +//Mantles, mostly for heads of staff +/datum/gear/suit/roles/mantle + display_name = "mantle, colorable" + path = /obj/item/clothing/accessory/poncho/roles/cloak/mantle + cost = 1 + +/datum/gear/suit/roles/mantle/New() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/roles/mantles + display_name = "mantle selection" + path = /obj/item/clothing/accessory/poncho/roles/cloak/mantle/cargo + cost = 1 + +/datum/gear/suit/roles/mantles/New() + ..() + var/list/mantles = list( + "orange mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cargo, + "black mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/security, + "white mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/engineering, + "purple mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/research, + "cyan mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/medical, + "blue mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/hop, + "gold mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cap + ) + gear_tweaks += new/datum/gear_tweak/path(mantles) + +//Boat cloaks +/datum/gear/suit/roles/boatcloak + display_name = "boat cloak, colorable" + path = /obj/item/clothing/accessory/poncho/roles/cloak/boat + +/datum/gear/suit/roles/boatcloak/New() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/roles/capboatcloak + display_name = "boat cloak, site manager" + path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/cap + allowed_roles = list(JOB_SITE_MANAGER) + show_roles = FALSE + +/datum/gear/suit/roles/hopboatcloak + display_name = "boat cloak, head of personnel" + path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/hop + allowed_roles = list(JOB_HEAD_OF_PERSONNEL) + show_roles = FALSE + +/datum/gear/suit/roles/boatcloaks + display_name = "boat cloak selection" + path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/security + +/datum/gear/suit/roles/boatcloaks/New() + ..() + var/list/boatcloaks = list( + "security boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/security, + "engineering boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/engineering, + "atmospherics boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/atmos, + "medical boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/medical, + "service boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/service, + "cargo boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/cargo, + "mining boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/mining, + "research boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/science + ) + gear_tweaks += new/datum/gear_tweak/path(boatcloaks) + +//Shrouds +/datum/gear/suit/roles/shroud + display_name = "shroud, colorable" + path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud + +/datum/gear/suit/roles/shroud/New() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/roles/capshroud + display_name = "shroud, site manager" + path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/cap + allowed_roles = list(JOB_SITE_MANAGER) + show_roles = FALSE + +/datum/gear/suit/roles/hopshroud + display_name = "shroud, head of personnel" + path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/hop + allowed_roles = list(JOB_HEAD_OF_PERSONNEL) + show_roles = FALSE + +/datum/gear/suit/roles/shrouds + display_name = "shroud selection" + path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/security + +/datum/gear/suit/roles/shrouds/New() + ..() + var/list/shrouds = list( + "security shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/security, + "engineering shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/engineering, + "atmospherics shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/atmos, + "medical shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/medical, + "service shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/service, + "cargo shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/cargo, + "mining shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/mining, + "research shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/science + ) + gear_tweaks += new/datum/gear_tweak/path(shrouds) + +/datum/gear/suit/roles/cropjackets + display_name = "crop jacket selection" + path = /obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket + +/datum/gear/suit/roles/cropjackets/New() + ..() + var/list/shrouds = list( + "white crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket, + "blue crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/blue, + "red crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/red, + "green crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/green, + "purple crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/purple, + "orange crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/orange, + "charcoal crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/charcoal, + "faded reflec crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/marine, + "drab crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/drab + ) + gear_tweaks += new/datum/gear_tweak/path(shrouds) + +//Actually colorable hoodies +/datum/gear/suit/roles/choodies + display_name = "hoodie selection, colorable" + path = /obj/item/clothing/suit/storage/hooded/toggle/colorable + +/datum/gear/suit/roles/choodies/New() + ..() + var/list/choodies = list( + "normal hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable, + "sleeveless hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/sleeveless, + "cropped hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped, + "shortsleeve hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/shortsleeve + ) + gear_tweaks += gear_tweak_free_color_choice + gear_tweaks += new/datum/gear_tweak/path(choodies) + +//ABOUT TIME SOMEONE ADDED THIS TO A LOADOUT +/datum/gear/suit/bladerunnercoat + display_name = "leather coat, massive" + path = /obj/item/clothing/suit/storage/bladerunner + +/datum/gear/suit/martianminer + display_name = "martian miner's coat, basic" + path = /obj/item/clothing/suit/storage/vest/martian_miner diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm deleted file mode 100644 index 8d84ba744c..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ /dev/null @@ -1,341 +0,0 @@ -/datum/gear/suit/snowsuit/medical - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) - -/datum/gear/suit/labcoat_colorable - display_name = "labcoat, colorable" - path = /obj/item/clothing/suit/storage/toggle/labcoat - -/datum/gear/suit/labcoat_colorable/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/suit/labcoat_old - display_name = "labcoat, old-school" - path = /obj/item/clothing/suit/storage/toggle/labcoat/old - -/datum/gear/suit/labcoat_cmo_old - display_name = "labcoat, CMO, oldschool" - path = /obj/item/clothing/suit/storage/toggle/labcoat/old/cmo - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER) - -/datum/gear/suit/roles/labcoat_old - display_name = "labcoat selection, department, oldschool" - path = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox - cost = 2 - -/datum/gear/suit/roles/labcoat_old/New() - ..() - var/list/labcoats = list( - "Oldschool Scientist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox, - "Oldschool Virologist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/vir, - "Oldschool Chemist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/chem - ) - gear_tweaks += new/datum/gear_tweak/path(labcoats) - -/datum/gear/suit/jacket_modular - display_name = "jacket, modular" - path = /obj/item/clothing/suit/storage/fluff/jacket - -/datum/gear/suit/jacket_modular/New() - ..() - var/list/the_jackets = list() - for(var/the_jacket in typesof(/obj/item/clothing/suit/storage/fluff/jacket)) - var/obj/item/clothing/suit/jacket_type = the_jacket - the_jackets[initial(jacket_type.name)] = jacket_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(the_jackets)) - -/datum/gear/suit/gntop - display_name = "GN crop jacket" - path = /obj/item/clothing/suit/storage/fluff/gntop - -/datum/gear/suit/old_poncho //This is made from an old sprite which has been here for quite some time. Called old poncho because duplicates - display_name = "Colorful poncho" - description = "A Mexican looking poncho. It look like it fits wolf taurs as well." - path = /obj/item/clothing/suit/poncho - -//Detective alternative -/datum/gear/suit/detective_alt - display_name = "sleek modern coat selection" - path = /obj/item/clothing/suit/storage/det_trench/alt - allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_DETECTIVE) - -/datum/gear/suit/detective_alt/New() - ..() - var/list/coats = list( - "Modern coat (tan)" = /obj/item/clothing/suit/storage/det_trench/alt, - "Modern coat (long, tan)" = /obj/item/clothing/suit/storage/det_trench/alt2, - "Modern coat (black)" = /obj/item/clothing/suit/storage/det_trench/alt/black, - "Modern coat (long, black)" = /obj/item/clothing/suit/storage/det_trench/alt2/black - ) - gear_tweaks += new/datum/gear_tweak/path(coats) - -//EMT coats, jackets and vest -/datum/gear/suit/paramedic_coat - display_name = "paramedic outerwear selection" - path = /obj/item/clothing/suit/storage/toggle/fr_jacket - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC,JOB_MEDICAL_DOCTOR) - -/datum/gear/suit/paramedic_coat/New() - ..() - var/list/paramedicCoats = list( - "First responder jacket" = /obj/item/clothing/suit/storage/toggle/fr_jacket, - "First responder jacket, alt." = /obj/item/clothing/suit/storage/toggle/fr_jacket/ems, - "Paramedic vest" = /obj/item/clothing/suit/storage/toggle/paramedic, - "EMT's labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/neo_emt, - "High visibility jacket" = /obj/item/clothing/suit/storage/toggle/labcoat/neo_highvis, - "Red EMT jacket" = /obj/item/clothing/suit/storage/toggle/labcoat/neo_redemt, - "Dark Blue EMT jacket" = /obj/item/clothing/suit/storage/toggle/labcoat/neo_blueemt - ) - gear_tweaks += new/datum/gear_tweak/path(paramedicCoats) - -//greek thing -/datum/gear/suit/chiton - display_name = "chiton" - path = /obj/item/clothing/suit/chiton - -//oversized t-shirt -/datum/gear/suit/oversize - display_name = "oversized t-shirt (colorable)" - path = /obj/item/clothing/suit/oversize - -/datum/gear/suit/oversize/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -/* -Talon winter coat -*/ -/datum/gear/suit/wintercoat/talon - display_name = "winter coat, Talon" - path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon - -/datum/gear/suit/armor/combat/crusader_explo - display_name = "knight, explo" - path = /obj/item/clothing/suit/armor/combat/crusader_explo - //allowed_roles = list(JOB_EXPLORER,JOB_PATHFINDER) - -/datum/gear/suit/armor/combat/crusader_explo/FM - display_name = "knight, Field Medic" - path = /obj/item/clothing/suit/armor/combat/crusader_explo/FM - allowed_roles = list (JOB_PARAMEDIC) - -//Long fur coat -/datum/gear/suit/russofurcoat - display_name = "long fur coat" - path = /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat - -//Colorable Hoodie -/datum/gear/suit/hoodie_vr - display_name = "hoodie with hood (colorable)" - path = /obj/item/clothing/suit/storage/hooded/hoodie - -/datum/gear/suit/hoodie_vr/New() - ..() - var/list/hoodies = list() - for(var/hoodie_style in typesof(/obj/item/clothing/suit/storage/hooded/hoodie)) - var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style - hoodies[initial(hoodie.name)] = hoodie - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies)) - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/suit/cyberpunk_recolorable - display_name = "cyberpunk jacket (recolorable)" - path = /obj/item/clothing/suit/cyberpunk/recolorable - cost = 2 //It's got armor, yo. - -/datum/gear/suit/cyberpunk_recolorable/New() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/suit/shrine_maiden - display_name = "shrine maiden costume" - path = /obj/item/clothing/suit/shrine_maiden - -//Antediluvian cloak -/datum/gear/suit/cloak_ante - display_name = "cloak, antediluvian" - path = /obj/item/clothing/accessory/poncho/roles/cloak/antediluvian - cost = 1 - -//Chaplain cloaks -/datum/gear/suit/cloak_chaplain - display_name = "cloak, chaplain" - path = /obj/item/clothing/accessory/poncho/roles/cloak/chapel - cost = 1 - -/datum/gear/suit/cloak_chaplain/alt - display_name = "cloak, chaplain, alt" - path = /obj/item/clothing/accessory/poncho/roles/cloak/chapel/alt - cost = 1 - -//Half cloak -/datum/gear/suit/cloak_half - display_name = "cloak, half, colorable" - path = /obj/item/clothing/accessory/poncho/roles/cloak/half - cost = 1 - -/datum/gear/suit/cloak_half/New() - gear_tweaks += gear_tweak_free_color_choice - -//Shoulder cloak -/datum/gear/suit/cloak_shoulder - display_name = "cloak, shoulder" - path = /obj/item/clothing/accessory/poncho/roles/cloak/shoulder - cost = 1 - -/datum/gear/suit/cloak_shoulder/New() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/suit/cloak_shoulder_right - display_name = "cloak, shoulder right" - path = /obj/item/clothing/accessory/poncho/roles/cloak/shoulder/right - cost = 1 - -/datum/gear/suit/cloak_shoulder_right/New() - gear_tweaks += gear_tweak_free_color_choice - -//Mantles, mostly for heads of staff -/datum/gear/suit/roles/mantle - display_name = "mantle, colorable" - path = /obj/item/clothing/accessory/poncho/roles/cloak/mantle - cost = 1 - -/datum/gear/suit/roles/mantle/New() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/suit/roles/mantles - display_name = "mantle selection" - path = /obj/item/clothing/accessory/poncho/roles/cloak/mantle/cargo - cost = 1 - -/datum/gear/suit/roles/mantles/New() - ..() - var/list/mantles = list( - "orange mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cargo, - "black mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/security, - "white mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/engineering, - "purple mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/research, - "cyan mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/medical, - "blue mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/hop, - "gold mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cap - ) - gear_tweaks += new/datum/gear_tweak/path(mantles) - -//Boat cloaks -/datum/gear/suit/roles/boatcloak - display_name = "boat cloak, colorable" - path = /obj/item/clothing/accessory/poncho/roles/cloak/boat - -/datum/gear/suit/roles/boatcloak/New() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/suit/roles/capboatcloak - display_name = "boat cloak, site manager" - path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/cap - allowed_roles = list(JOB_SITE_MANAGER) - show_roles = FALSE - -/datum/gear/suit/roles/hopboatcloak - display_name = "boat cloak, head of personnel" - path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/hop - allowed_roles = list(JOB_HEAD_OF_PERSONNEL) - show_roles = FALSE - -/datum/gear/suit/roles/boatcloaks - display_name = "boat cloak selection" - path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/security - -/datum/gear/suit/roles/boatcloaks/New() - ..() - var/list/boatcloaks = list( - "security boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/security, - "engineering boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/engineering, - "atmospherics boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/atmos, - "medical boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/medical, - "service boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/service, - "cargo boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/cargo, - "mining boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/mining, - "research boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/science - ) - gear_tweaks += new/datum/gear_tweak/path(boatcloaks) - -//Shrouds -/datum/gear/suit/roles/shroud - display_name = "shroud, colorable" - path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud - -/datum/gear/suit/roles/shroud/New() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/suit/roles/capshroud - display_name = "shroud, site manager" - path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/cap - allowed_roles = list(JOB_SITE_MANAGER) - show_roles = FALSE - -/datum/gear/suit/roles/hopshroud - display_name = "shroud, head of personnel" - path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/hop - allowed_roles = list(JOB_HEAD_OF_PERSONNEL) - show_roles = FALSE - -/datum/gear/suit/roles/shrouds - display_name = "shroud selection" - path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/security - -/datum/gear/suit/roles/shrouds/New() - ..() - var/list/shrouds = list( - "security shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/security, - "engineering shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/engineering, - "atmospherics shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/atmos, - "medical shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/medical, - "service shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/service, - "cargo shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/cargo, - "mining shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/mining, - "research shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/science - ) - gear_tweaks += new/datum/gear_tweak/path(shrouds) - -/datum/gear/suit/roles/cropjackets - display_name = "crop jacket selection" - path = /obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket - -/datum/gear/suit/roles/cropjackets/New() - ..() - var/list/shrouds = list( - "white crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket, - "blue crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/blue, - "red crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/red, - "green crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/green, - "purple crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/purple, - "orange crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/orange, - "charcoal crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/charcoal, - "faded reflec crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/marine, - "drab crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/drab - ) - gear_tweaks += new/datum/gear_tweak/path(shrouds) - -//Actually colorable hoodies -/datum/gear/suit/roles/choodies - display_name = "hoodie selection, colorable" - path = /obj/item/clothing/suit/storage/hooded/toggle/colorable - -/datum/gear/suit/roles/choodies/New() - ..() - var/list/choodies = list( - "normal hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable, - "sleeveless hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/sleeveless, - "cropped hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped, - "shortsleeve hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/shortsleeve - ) - gear_tweaks += gear_tweak_free_color_choice - gear_tweaks += new/datum/gear_tweak/path(choodies) - -//ABOUT TIME SOMEONE ADDED THIS TO A LOADOUT -/datum/gear/suit/bladerunnercoat - display_name = "leather coat, massive" - path = /obj/item/clothing/suit/storage/bladerunner - -/datum/gear/suit/martianminer - display_name = "martian miner's coat, basic" - path = /obj/item/clothing/suit/storage/vest/martian_miner diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index c7803fc0e9..81a5c1971d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -654,3 +654,229 @@ ) gear_tweaks += list(new/datum/gear_tweak/path(bunnysuit)) gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/uniform/suit/permit + display_name = "nudity permit" + path = /obj/item/clothing/under/permit + +/datum/gear/uniform/suit/natureist_talisman + display_name = "naturist talisman" + path = /obj/item/clothing/under/permit/natureist_talisman + +//Polaris overrides +/datum/gear/uniform/solgov/pt/sifguard + display_name = "pt uniform, planetside sec" + path = /obj/item/clothing/under/solgov/pt/sifguard + +//Federation jackets +/datum/gear/suit/job_fed/sec + display_name = "fed uniform, sec" + path = /obj/item/clothing/suit/storage/fluff/fedcoat + allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER) + +/datum/gear/suit/job_fed/medsci + display_name = "fed uniform, med/sci" + path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST,JOB_XENOBOTANIST) + +/datum/gear/suit/job_fed/eng + display_name = "fed uniform, eng" + path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_ENGINEER) +//DS9 + +/datum/gear/suit/job_trek/ds9_coat + display_name = "DS9 Overcoat (use uniform)" + path = /obj/item/clothing/suit/storage/trek/ds9 + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR, + JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, + JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ATMOSPHERIC_TECHNICIAN, + JOB_ENGINEER,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER) + +/* +Swimsuits +*/ + +/datum/gear/uniform/swimsuits + display_name = "swimsuits selection" + path = /obj/item/storage/box/fluff/swimsuit + +/datum/gear/uniform/swimsuits/New() + ..() + var/list/swimsuits = list() + for(var/obj/item/storage/box/fluff/swimsuit/swimsuit_type as anything in typesof(/obj/item/storage/box/fluff/swimsuit)) + swimsuits[initial(swimsuit_type.name)] = swimsuit_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(swimsuits)) + +/datum/gear/uniform/suit/gnshorts + display_name = "GN shorts" + path = /obj/item/clothing/under/fluff/gnshorts + +//Latex maid dress +/datum/gear/uniform/latexmaid + display_name = "latex maid dress" + path = /obj/item/clothing/under/fluff/latexmaid + +//Tron Siren outfit +/datum/gear/uniform/siren + display_name = "jumpsuit, Siren" + path = /obj/item/clothing/under/fluff/siren + +/datum/gear/uniform/suit/v_nanovest + display_name = "Varmacorp nanovest" + path = /obj/item/clothing/under/fluff/v_nanovest + +/* +Qipao +*/ +/datum/gear/uniform/qipao_black + display_name = "qipao, black" + path = /obj/item/clothing/under/qipao + +/datum/gear/uniform/qipao_red + display_name = "qipao, red" + path = /obj/item/clothing/under/qipao/red + +/datum/gear/uniform/qipao_white + display_name = "qipao, white" + path = /obj/item/clothing/under/qipao/white + +/datum/gear/uniform/qipao_colorable_alt + display_name = "qipao, colorable alt" + path = /obj/item/clothing/under/qipao/white/colorable + +/datum/gear/uniform/qipao_colorable_alt/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/* +Bluespace jumpsuit +*/ +/datum/gear/uniform/hfjumpsuit + display_name = "HYPER jumpsuit" + path = /obj/item/clothing/under/hyperfiber + cost = 2 + +/* +Talon jumpsuit +*/ +/datum/gear/uniform/talonbasic + display_name = "Talon Jumpsuit" + description = "A jumpsuit that is usually issued to ITV Talon contractors, however others can purchase it to show their support towards the ship." + path = /obj/item/clothing/under/rank/talon/basic + +// Summer dresses +/datum/gear/uniform/summerdress + display_name = "summer dress selection" + path = /obj/item/clothing/under/summerdress + +/datum/gear/uniform/summerdress/New() + ..() + var/list/dresses = list( + "black and white" = /obj/item/clothing/under/summerdress, + "blue and white" = /obj/item/clothing/under/summerdress/blue, + "red and white" = /obj/item/clothing/under/summerdress/red + ) + gear_tweaks += new/datum/gear_tweak/path(dresses) + +//Altevian Uniforms +/datum/gear/uniform/altevian + description = "A comfortable set of clothing for people to handle their day to day work around the fleets with little to no discomfort." + display_name = "altevian uniform selection" + +/datum/gear/uniform/altevian/New() + ..() + var/list/pants = list() + for(var/obj/item/clothing/under/pants/altevian/pants_type as anything in typesof(/obj/item/clothing/under/pants/altevian)) + pants[initial(pants_type.name)] = pants_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants)) + +//Feminine Colored Jumpsuits. +/datum/gear/uniform/f_jumpsuit_alt + display_name = "Colored Feminine Jumpsuit" + path = /obj/item/clothing/under/color/fjumpsuit + +/datum/gear/uniform/f_jumpsuit_alt/New() + ..() + var/list/jumpsuits = list() + for(var/jumpsuit_style in typesof(/obj/item/clothing/under/color/fjumpsuit)) + var/obj/item/clothing/under/color/fjumpsuit/jumpsuit = jumpsuit_style + jumpsuits[initial(jumpsuit.name)] = jumpsuit + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpsuits)) + +/datum/gear/uniform/singer_blue + display_name = "blue singer dress" + path = /obj/item/clothing/under/dress/singer + +/datum/gear/uniform/singer_yellow + display_name = "yellow singer dress" + path = /obj/item/clothing/under/dress/singer/yellow + +//Antediluvian corsets from CitRP +/datum/gear/uniform/antediluvian + display_name = "corset, antediluvian" + path = /obj/item/clothing/under/dress/antediluvian + +/datum/gear/uniform/antediluvianalt + display_name = "corset, antediluvian alt" + path = /obj/item/clothing/under/dress/antediluvian/sheerless + +//Colorable skirts +/datum/gear/uniform/coloredskirts + display_name = "skirt selection, colorable" + path = /obj/item/clothing/under/skirt/colorable + +/datum/gear/uniform/coloredskirts/New() + ..() + var/list/skirts = list( + "casual skirt"=/obj/item/clothing/under/skirt/colorable, + "puffy skirt"=/obj/item/clothing/under/skirt/colorable/puffy, + "skater skirt"=/obj/item/clothing/under/skirt/colorable/skater, + "pleated skirt"=/obj/item/clothing/under/skirt/colorable/pleated, + "pleated skirt, alt"=/obj/item/clothing/under/skirt/colorable/pleated/alt, + "pencil skirt"=/obj/item/clothing/under/skirt/colorable/pencil, + "plaid skirt"=/obj/item/clothing/under/skirt/colorable/plaid, + "tube skirt"=/obj/item/clothing/under/skirt/colorable/tube, + "long skirt"=/obj/item/clothing/under/skirt/colorable/long, + "high skirt"=/obj/item/clothing/under/skirt/colorable/high, + "swept skirt"=/obj/item/clothing/under/skirt/colorable/swept, + "jumper skirt"=/obj/item/clothing/under/skirt/colorable/jumper, + "jumper dress"=/obj/item/clothing/under/skirt/colorable/jumperdress, + "short skirt"=/obj/item/clothing/under/skirt/colorable/short, + "short skirt (split)"=/obj/item/clothing/under/skirt/colorable/short_split + ) + gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice) + +// gwen beedells clown clothes + +/datum/gear/uniform/stripeddungarees + display_name = "striped dungarees" + path = /obj/item/clothing/under/stripeddungarees + +// recolorable flame dress + +/datum/gear/uniform/cdress_fire + display_name = "flame dress, colorable" + path = /obj/item/clothing/under/dress/cdress_fire + +/datum/gear/uniform/cdress_fire/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +// recolorable yellow dress +/datum/gear/uniform/cbridesmaid + display_name = "fancy dress, colorable" + path = /obj/item/clothing/under/dress/cbridesmaid + +/datum/gear/uniform/cbridesmaid/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +// recolorable orange swoop dress +/datum/gear/uniform/cswoopdress + display_name = "swoop dress, recolorable" + path = /obj/item/clothing/under/dress/cswoopdress + +/datum/gear/uniform/cswoopdress/New() + ..() + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm deleted file mode 100644 index e74a34ace6..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ /dev/null @@ -1,227 +0,0 @@ -/datum/gear/uniform/suit/permit - display_name = "nudity permit" - path = /obj/item/clothing/under/permit - -/datum/gear/uniform/suit/natureist_talisman - display_name = "naturist talisman" - path = /obj/item/clothing/under/permit/natureist_talisman - -//Polaris overrides -/datum/gear/uniform/solgov/pt/sifguard - display_name = "pt uniform, planetside sec" - path = /obj/item/clothing/under/solgov/pt/sifguard - -//Federation jackets -/datum/gear/suit/job_fed/sec - display_name = "fed uniform, sec" - path = /obj/item/clothing/suit/storage/fluff/fedcoat - allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER) - -/datum/gear/suit/job_fed/medsci - display_name = "fed uniform, med/sci" - path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST,JOB_XENOBOTANIST) - -/datum/gear/suit/job_fed/eng - display_name = "fed uniform, eng" - path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng - allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_ENGINEER) -//DS9 - -/datum/gear/suit/job_trek/ds9_coat - display_name = "DS9 Overcoat (use uniform)" - path = /obj/item/clothing/suit/storage/trek/ds9 - allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR, - JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, - JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ATMOSPHERIC_TECHNICIAN, - JOB_ENGINEER,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER) - -/* -Swimsuits -*/ - -/datum/gear/uniform/swimsuits - display_name = "swimsuits selection" - path = /obj/item/storage/box/fluff/swimsuit - -/datum/gear/uniform/swimsuits/New() - ..() - var/list/swimsuits = list() - for(var/obj/item/storage/box/fluff/swimsuit/swimsuit_type as anything in typesof(/obj/item/storage/box/fluff/swimsuit)) - swimsuits[initial(swimsuit_type.name)] = swimsuit_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(swimsuits)) - -/datum/gear/uniform/suit/gnshorts - display_name = "GN shorts" - path = /obj/item/clothing/under/fluff/gnshorts - -//Latex maid dress -/datum/gear/uniform/latexmaid - display_name = "latex maid dress" - path = /obj/item/clothing/under/fluff/latexmaid - -//Tron Siren outfit -/datum/gear/uniform/siren - display_name = "jumpsuit, Siren" - path = /obj/item/clothing/under/fluff/siren - -/datum/gear/uniform/suit/v_nanovest - display_name = "Varmacorp nanovest" - path = /obj/item/clothing/under/fluff/v_nanovest - -/* -Qipao -*/ -/datum/gear/uniform/qipao_black - display_name = "qipao, black" - path = /obj/item/clothing/under/qipao - -/datum/gear/uniform/qipao_red - display_name = "qipao, red" - path = /obj/item/clothing/under/qipao/red - -/datum/gear/uniform/qipao_white - display_name = "qipao, white" - path = /obj/item/clothing/under/qipao/white - -/datum/gear/uniform/qipao_colorable_alt - display_name = "qipao, colorable alt" - path = /obj/item/clothing/under/qipao/white/colorable - -/datum/gear/uniform/qipao_colorable_alt/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -/* -Bluespace jumpsuit -*/ -/datum/gear/uniform/hfjumpsuit - display_name = "HYPER jumpsuit" - path = /obj/item/clothing/under/hyperfiber - cost = 2 - -/* -Talon jumpsuit -*/ -/datum/gear/uniform/talonbasic - display_name = "Talon Jumpsuit" - description = "A jumpsuit that is usually issued to ITV Talon contractors, however others can purchase it to show their support towards the ship." - path = /obj/item/clothing/under/rank/talon/basic - -// Summer dresses -/datum/gear/uniform/summerdress - display_name = "summer dress selection" - path = /obj/item/clothing/under/summerdress - -/datum/gear/uniform/summerdress/New() - ..() - var/list/dresses = list( - "black and white" = /obj/item/clothing/under/summerdress, - "blue and white" = /obj/item/clothing/under/summerdress/blue, - "red and white" = /obj/item/clothing/under/summerdress/red - ) - gear_tweaks += new/datum/gear_tweak/path(dresses) - -//Altevian Uniforms -/datum/gear/uniform/altevian - description = "A comfortable set of clothing for people to handle their day to day work around the fleets with little to no discomfort." - display_name = "altevian uniform selection" - -/datum/gear/uniform/altevian/New() - ..() - var/list/pants = list() - for(var/obj/item/clothing/under/pants/altevian/pants_type as anything in typesof(/obj/item/clothing/under/pants/altevian)) - pants[initial(pants_type.name)] = pants_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants)) - - -//Feminine Colored Jumpsuits. -/datum/gear/uniform/f_jumpsuit_alt - display_name = "Colored Feminine Jumpsuit" - path = /obj/item/clothing/under/color/fjumpsuit - -/datum/gear/uniform/f_jumpsuit_alt/New() - ..() - var/list/jumpsuits = list() - for(var/jumpsuit_style in typesof(/obj/item/clothing/under/color/fjumpsuit)) - var/obj/item/clothing/under/color/fjumpsuit/jumpsuit = jumpsuit_style - jumpsuits[initial(jumpsuit.name)] = jumpsuit - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpsuits)) - -/datum/gear/uniform/singer_blue - display_name = "blue singer dress" - path = /obj/item/clothing/under/dress/singer - -/datum/gear/uniform/singer_yellow - display_name = "yellow singer dress" - path = /obj/item/clothing/under/dress/singer/yellow - -//Antediluvian corsets from CitRP -/datum/gear/uniform/antediluvian - display_name = "corset, antediluvian" - path = /obj/item/clothing/under/dress/antediluvian - -/datum/gear/uniform/antediluvianalt - display_name = "corset, antediluvian alt" - path = /obj/item/clothing/under/dress/antediluvian/sheerless - -//Colorable skirts -/datum/gear/uniform/coloredskirts - display_name = "skirt selection, colorable" - path = /obj/item/clothing/under/skirt/colorable - -/datum/gear/uniform/coloredskirts/New() - ..() - var/list/skirts = list( - "casual skirt"=/obj/item/clothing/under/skirt/colorable, - "puffy skirt"=/obj/item/clothing/under/skirt/colorable/puffy, - "skater skirt"=/obj/item/clothing/under/skirt/colorable/skater, - "pleated skirt"=/obj/item/clothing/under/skirt/colorable/pleated, - "pleated skirt, alt"=/obj/item/clothing/under/skirt/colorable/pleated/alt, - "pencil skirt"=/obj/item/clothing/under/skirt/colorable/pencil, - "plaid skirt"=/obj/item/clothing/under/skirt/colorable/plaid, - "tube skirt"=/obj/item/clothing/under/skirt/colorable/tube, - "long skirt"=/obj/item/clothing/under/skirt/colorable/long, - "high skirt"=/obj/item/clothing/under/skirt/colorable/high, - "swept skirt"=/obj/item/clothing/under/skirt/colorable/swept, - "jumper skirt"=/obj/item/clothing/under/skirt/colorable/jumper, - "jumper dress"=/obj/item/clothing/under/skirt/colorable/jumperdress, - "short skirt"=/obj/item/clothing/under/skirt/colorable/short, - "short skirt (split)"=/obj/item/clothing/under/skirt/colorable/short_split - ) - gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice) - -// gwen beedells clown clothes - -/datum/gear/uniform/stripeddungarees - display_name = "striped dungarees" - path = /obj/item/clothing/under/stripeddungarees - -// recolorable flame dress - -/datum/gear/uniform/cdress_fire - display_name = "flame dress, colorable" - path = /obj/item/clothing/under/dress/cdress_fire - -/datum/gear/uniform/cdress_fire/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - - -// recolorable yellow dress -/datum/gear/uniform/cbridesmaid - display_name = "fancy dress, colorable" - path = /obj/item/clothing/under/dress/cbridesmaid - -/datum/gear/uniform/cbridesmaid/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -// recolorable orange swoop dress -/datum/gear/uniform/cswoopdress - display_name = "swoop dress, recolorable" - path = /obj/item/clothing/under/dress/cswoopdress - -/datum/gear/uniform/cswoopdress/New() - ..() - gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 1f64bea985..02ee9517c7 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -230,3 +230,84 @@ modular computers "alai" = /obj/item/universal_translator/limited/alai ) gear_tweaks += new/datum/gear_tweak/path(translators) + +/datum/gear/utility/saddlebag + display_name = "saddle bag, horse" + path = /obj/item/storage/backpack/saddlebag + slot = slot_back + cost = 2 + +/datum/gear/utility/saddlebag_common + display_name = "saddle bag, common" + path = /obj/item/storage/backpack/saddlebag_common + slot = slot_back + cost = 2 + +/datum/gear/utility/saddlebag_common/robust + display_name = "saddle bag, robust" + path = /obj/item/storage/backpack/saddlebag_common/robust + slot = slot_back + cost = 2 + +/datum/gear/utility/saddlebag_common/vest + display_name = "taur duty vest (backpack)" + path = /obj/item/storage/backpack/saddlebag_common/vest + slot = slot_back + cost = 1 + +/datum/gear/utility/dufflebag + display_name = "dufflebag" + path = /obj/item/storage/backpack/dufflebag + slot = slot_back + cost = 2 + +/datum/gear/utility/dufflebag/black + display_name = "black dufflebag" + path = /obj/item/storage/backpack/dufflebag/fluff + +/datum/gear/utility/dufflebag/med + display_name = "medical dufflebag" + path = /obj/item/storage/backpack/dufflebag/med + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_PSYCHIATRIST) + +/datum/gear/utility/dufflebag/med/emt + display_name = "EMT dufflebag" + path = /obj/item/storage/backpack/dufflebag/emt + +/datum/gear/utility/dufflebag/sec + display_name = "security Dufflebag" + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER) + path = /obj/item/storage/backpack/dufflebag/sec + +/datum/gear/utility/dufflebag/eng + display_name = "engineering dufflebag" + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_ENGINEER) + path = /obj/item/storage/backpack/dufflebag/eng + +/datum/gear/utility/dufflebag/sci + display_name = "science dufflebag" + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST) + path = /obj/item/storage/backpack/dufflebag/sci + +/datum/gear/utility/dufflebag/explorer + display_name = "away team dufflebag" + path = /obj/item/storage/backpack/dufflebag/explorer + +/datum/gear/utility/dufflebag/talon + display_name = "Talon dufflebag" + path = /obj/item/storage/backpack/dufflebag/explorer + +/datum/gear/utility/ID + display_name = "contractor identification card" + path = /obj/item/card/id/event/polymorphic/altcard + cost = 1 + +/datum/gear/utility/bs_bracelet + display_name = "bluespace bracelet" + path = /obj/item/clothing/gloves/bluespace + cost = 2 + +/datum/gear/utility/walkpod + display_name = "podzu music player" + path = /obj/item/walkpod + cost = 2 diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm deleted file mode 100644 index 7b998d20af..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ /dev/null @@ -1,80 +0,0 @@ -/datum/gear/utility/saddlebag - display_name = "saddle bag, horse" - path = /obj/item/storage/backpack/saddlebag - slot = slot_back - cost = 2 - -/datum/gear/utility/saddlebag_common - display_name = "saddle bag, common" - path = /obj/item/storage/backpack/saddlebag_common - slot = slot_back - cost = 2 - -/datum/gear/utility/saddlebag_common/robust - display_name = "saddle bag, robust" - path = /obj/item/storage/backpack/saddlebag_common/robust - slot = slot_back - cost = 2 - -/datum/gear/utility/saddlebag_common/vest - display_name = "taur duty vest (backpack)" - path = /obj/item/storage/backpack/saddlebag_common/vest - slot = slot_back - cost = 1 - -/datum/gear/utility/dufflebag - display_name = "dufflebag" - path = /obj/item/storage/backpack/dufflebag - slot = slot_back - cost = 2 - -/datum/gear/utility/dufflebag/black - display_name = "black dufflebag" - path = /obj/item/storage/backpack/dufflebag/fluff - -/datum/gear/utility/dufflebag/med - display_name = "medical dufflebag" - path = /obj/item/storage/backpack/dufflebag/med - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_PSYCHIATRIST) - -/datum/gear/utility/dufflebag/med/emt - display_name = "EMT dufflebag" - path = /obj/item/storage/backpack/dufflebag/emt - -/datum/gear/utility/dufflebag/sec - display_name = "security Dufflebag" - allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER) - path = /obj/item/storage/backpack/dufflebag/sec - -/datum/gear/utility/dufflebag/eng - display_name = "engineering dufflebag" - allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_ENGINEER) - path = /obj/item/storage/backpack/dufflebag/eng - -/datum/gear/utility/dufflebag/sci - display_name = "science dufflebag" - allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST) - path = /obj/item/storage/backpack/dufflebag/sci - -/datum/gear/utility/dufflebag/explorer - display_name = "away team dufflebag" - path = /obj/item/storage/backpack/dufflebag/explorer - -/datum/gear/utility/dufflebag/talon - display_name = "Talon dufflebag" - path = /obj/item/storage/backpack/dufflebag/explorer - -/datum/gear/utility/ID - display_name = "contractor identification card" - path = /obj/item/card/id/event/polymorphic/altcard - cost = 1 - -/datum/gear/utility/bs_bracelet - display_name = "bluespace bracelet" - path = /obj/item/clothing/gloves/bluespace - cost = 2 - -/datum/gear/utility/walkpod - display_name = "podzu music player" - path = /obj/item/walkpod - cost = 2 diff --git a/code/modules/client/preference_setup/loadout/loadout_vr.dm b/code/modules/client/preference_setup/loadout/loadout_vr.dm deleted file mode 100644 index 1f7a31311e..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_vr.dm +++ /dev/null @@ -1,3 +0,0 @@ -/datum/gear - var/list/ckeywhitelist - var/list/character_name \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 042d193e17..10ff92cb92 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -234,7 +234,7 @@ /datum/gear/uniform/dept/undercoat/research display_name = "scientist undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/sci - allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST) + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_XENOBOTANIST) /datum/gear/uniform/dept/undercoat/robo display_name = "roboticist undercoat (Teshari)" @@ -423,7 +423,7 @@ /datum/gear/suit/dept/cloak/research display_name = "scientist cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sci - allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST) + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_XENOBOTANIST) /datum/gear/suit/dept/cloak/research/New() ..() @@ -691,3 +691,153 @@ /datum/gear/shoes/teshwrap/New() ..() gear_tweaks += gear_tweak_free_color_choice + +///// + +/datum/gear/uniform/voxcasual + display_name = "casual wear (Vox)" + path = /obj/item/clothing/under/vox/vox_casual + sort_category = "Xenowear" + whitelisted = "Vox" + +/datum/gear/uniform/voxrobes + display_name = "comfy robes (Vox)" + path = /obj/item/clothing/under/vox/vox_robes + sort_category = "Xenowear" + whitelisted = "Vox" + +/datum/gear/accessory/vox + display_name = "storage vest (Vox)" + path = /obj/item/clothing/accessory/storage/vox + sort_category = "Xenowear" + whitelisted = "Vox" + +/datum/gear/gloves/vox + display_name = "insulated gauntlets (Vox)" + path = /obj/item/clothing/gloves/vox + sort_category = "Xenowear" + whitelisted = "Vox" + +/datum/gear/shoes/vox + display_name = "magclaws (Vox)" + path = /obj/item/clothing/shoes/magboots/vox + sort_category = "Xenowear" + whitelisted = "Vox" + +/datum/gear/mask/vox + display_name = "alien mask (Vox)" + path = /obj/item/clothing/mask/gas/swat/vox + sort_category = "Xenowear" + whitelisted = "Vox" + +/datum/gear/mask/transparent + display_name = "transparent breath mask" + path = /obj/item/clothing/mask/breath/transparent + sort_category = "Xenowear" + +/datum/gear/uniform/loincloth + display_name = "loincloth" + path = /obj/item/clothing/suit/storage/fluff/loincloth + sort_category = "Xenowear" + +// Taj clothing +/datum/gear/eyes/tajblind + display_name = "embroidered veil" + path = /obj/item/clothing/glasses/tajblind + //whitelisted = SPECIES_TAJARAN + sort_category = "Xenowear" + +/datum/gear/eyes/medical/tajblind + display_name = "medical veil (Tajara) (Medical)" + path = /obj/item/clothing/glasses/hud/health/tajblind + //whitelisted = SPECIES_TAJARAN + sort_category = "Xenowear" + +/datum/gear/eyes/meson/tajblind + display_name = "industrial veil (Tajara) (Engineering, Science)" + path = /obj/item/clothing/glasses/meson/prescription/tajblind + //whitelisted = SPECIES_TAJARAN + sort_category = "Xenowear" + +/datum/gear/eyes/material/tajblind + display_name = "mining veil (Tajara) (Mining)" + path = /obj/item/clothing/glasses/material/prescription/tajblind + //whitelisted = SPECIES_TAJARAN + sort_category = "Xenowear" + +/datum/gear/eyes/security/tajblind + display_name = "sleek veil (Tajara) (Security)" + path = /obj/item/clothing/glasses/sunglasses/sechud/tajblind + //whitelisted = SPECIES_TAJARAN + sort_category = "Xenowear" + +/datum/gear/mask/altevian_breath + display_name = "spacer tuned mask (Altevian)" + path = /obj/item/clothing/mask/altevian_breath + sort_category = "Xenowear" + +/datum/gear/uniform/altevian_outfit + description = "A uniform commonly seen worn by altevians. The material on this uniform is made of a durable thread that can handle the stress of most forms of labor." + display_name = "altevian duty jumpsuit selection (Altevian)" + whitelisted = SPECIES_ALTEVIAN + sort_category = "Xenowear" + +/datum/gear/uniform/altevian_outfit/New() + ..() + var/list/pants = list() + for(var/obj/item/clothing/under/altevian/uniform_type as anything in typesof(/obj/item/clothing/under/altevian)) + pants[initial(uniform_type.name)] = uniform_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants)) + +/datum/gear/accessory/altevian_aquila + description = "An emblem found across all altevian vessels. The specific metals and jewels denote ranks. Otherwise, it's just a pretty rat skull emblem with a set of crystals for their eyes and fangs." + display_name = "royal altevian navy emblem selection" + whitelisted = SPECIES_ALTEVIAN + sort_category = "Xenowear" + +/datum/gear/accessory/altevian_aquila/New() + ..() + var/list/badges = list( + "gold emblem" = /obj/item/clothing/accessory/altevian_badge/aquila, + "silver emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/silver, + "bronze emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/bronze, + "black emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/black, + "blue emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/exotic, + "purple emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/phoron, + "red emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/hydrogen) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(badges)) + +/datum/gear/suit/altevian_officer_suit + description = "A comfortable official suit for altevian command officers." + display_name = "altevian officer's suit selection, site manager" + whitelisted = SPECIES_ALTEVIAN + allowed_roles = list(JOB_SITE_MANAGER) + sort_category = "Xenowear" + +/datum/gear/suit/altevian_officer_suit/New() + ..() + var/list/suits = list() + for(var/ratsuit in typesof(/obj/item/clothing/suit/captunic/capjacket/altevian_admiral)) + var/obj/item/clothing/suit/captunic/capjacket/altevian_admiral/specific_ratsuit = ratsuit + suits[initial(specific_ratsuit.name)] = specific_ratsuit + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits)) + +// Taur stuff +/datum/gear/suit/taur/drake_cloak + display_name = "drake cloak (Drake-taur)" + path = /obj/item/clothing/suit/drake_cloak + sort_category = "Xenowear" + +/datum/gear/suit/taur/white_dress + display_name = "white wedding dress (Wolf/Horse-taur)" + path = /obj/item/clothing/suit/taur/dress + sort_category = "Xenowear" + +/datum/gear/suit/taur/colorable_skirt + display_name = "colorable skirt (Wolf/Horse-taur)" + path = /obj/item/clothing/suit/taur/skirt + sort_category = "Xenowear" + +/datum/gear/suit/taur/colorable_skirt/New() + ..() + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm deleted file mode 100644 index e11e126b8a..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ /dev/null @@ -1,158 +0,0 @@ -// Upstream things -///// - -/datum/gear/suit/dept/cloak/research - allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_XENOBOTANIST) - -/datum/gear/uniform/dept/undercoat/research - allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_XENOBOTANIST) - -///// - -/datum/gear/uniform/voxcasual - display_name = "casual wear (Vox)" - path = /obj/item/clothing/under/vox/vox_casual - sort_category = "Xenowear" - whitelisted = "Vox" - -/datum/gear/uniform/voxrobes - display_name = "comfy robes (Vox)" - path = /obj/item/clothing/under/vox/vox_robes - sort_category = "Xenowear" - whitelisted = "Vox" - -/datum/gear/accessory/vox - display_name = "storage vest (Vox)" - path = /obj/item/clothing/accessory/storage/vox - sort_category = "Xenowear" - whitelisted = "Vox" - -/datum/gear/gloves/vox - display_name = "insulated gauntlets (Vox)" - path = /obj/item/clothing/gloves/vox - sort_category = "Xenowear" - whitelisted = "Vox" - -/datum/gear/shoes/vox - display_name = "magclaws (Vox)" - path = /obj/item/clothing/shoes/magboots/vox - sort_category = "Xenowear" - whitelisted = "Vox" - -/datum/gear/mask/vox - display_name = "alien mask (Vox)" - path = /obj/item/clothing/mask/gas/swat/vox - sort_category = "Xenowear" - whitelisted = "Vox" - -/datum/gear/mask/transparent - display_name = "transparent breath mask" - path = /obj/item/clothing/mask/breath/transparent - sort_category = "Xenowear" - -/datum/gear/uniform/loincloth - display_name = "loincloth" - path = /obj/item/clothing/suit/storage/fluff/loincloth - sort_category = "Xenowear" - -// Taj clothing -/datum/gear/eyes/tajblind - display_name = "embroidered veil" - path = /obj/item/clothing/glasses/tajblind - //whitelisted = SPECIES_TAJARAN - sort_category = "Xenowear" - -/datum/gear/eyes/medical/tajblind - display_name = "medical veil (Tajara) (Medical)" - path = /obj/item/clothing/glasses/hud/health/tajblind - //whitelisted = SPECIES_TAJARAN - sort_category = "Xenowear" - -/datum/gear/eyes/meson/tajblind - display_name = "industrial veil (Tajara) (Engineering, Science)" - path = /obj/item/clothing/glasses/meson/prescription/tajblind - //whitelisted = SPECIES_TAJARAN - sort_category = "Xenowear" - -/datum/gear/eyes/material/tajblind - display_name = "mining veil (Tajara) (Mining)" - path = /obj/item/clothing/glasses/material/prescription/tajblind - //whitelisted = SPECIES_TAJARAN - sort_category = "Xenowear" - -/datum/gear/eyes/security/tajblind - display_name = "sleek veil (Tajara) (Security)" - path = /obj/item/clothing/glasses/sunglasses/sechud/tajblind - //whitelisted = SPECIES_TAJARAN - sort_category = "Xenowear" - -/datum/gear/mask/altevian_breath - display_name = "spacer tuned mask (Altevian)" - path = /obj/item/clothing/mask/altevian_breath - sort_category = "Xenowear" - -/datum/gear/uniform/altevian_outfit - description = "A uniform commonly seen worn by altevians. The material on this uniform is made of a durable thread that can handle the stress of most forms of labor." - display_name = "altevian duty jumpsuit selection (Altevian)" - whitelisted = SPECIES_ALTEVIAN - sort_category = "Xenowear" - -/datum/gear/uniform/altevian_outfit/New() - ..() - var/list/pants = list() - for(var/obj/item/clothing/under/altevian/uniform_type as anything in typesof(/obj/item/clothing/under/altevian)) - pants[initial(uniform_type.name)] = uniform_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants)) - -/datum/gear/accessory/altevian_aquila - description = "An emblem found across all altevian vessels. The specific metals and jewels denote ranks. Otherwise, it's just a pretty rat skull emblem with a set of crystals for their eyes and fangs." - display_name = "royal altevian navy emblem selection" - whitelisted = SPECIES_ALTEVIAN - sort_category = "Xenowear" - -/datum/gear/accessory/altevian_aquila/New() - ..() - var/list/badges = list( - "gold emblem" = /obj/item/clothing/accessory/altevian_badge/aquila, - "silver emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/silver, - "bronze emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/bronze, - "black emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/black, - "blue emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/exotic, - "purple emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/phoron, - "red emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/hydrogen) - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(badges)) - -/datum/gear/suit/altevian_officer_suit - description = "A comfortable official suit for altevian command officers." - display_name = "altevian officer's suit selection, site manager" - whitelisted = SPECIES_ALTEVIAN - allowed_roles = list(JOB_SITE_MANAGER) - sort_category = "Xenowear" - -/datum/gear/suit/altevian_officer_suit/New() - ..() - var/list/suits = list() - for(var/ratsuit in typesof(/obj/item/clothing/suit/captunic/capjacket/altevian_admiral)) - var/obj/item/clothing/suit/captunic/capjacket/altevian_admiral/specific_ratsuit = ratsuit - suits[initial(specific_ratsuit.name)] = specific_ratsuit - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits)) - -// Taur stuff -/datum/gear/suit/taur/drake_cloak - display_name = "drake cloak (Drake-taur)" - path = /obj/item/clothing/suit/drake_cloak - sort_category = "Xenowear" - -/datum/gear/suit/taur/white_dress - display_name = "white wedding dress (Wolf/Horse-taur)" - path = /obj/item/clothing/suit/taur/dress - sort_category = "Xenowear" - -/datum/gear/suit/taur/colorable_skirt - display_name = "colorable skirt (Wolf/Horse-taur)" - path = /obj/item/clothing/suit/taur/skirt - sort_category = "Xenowear" - -/datum/gear/suit/taur/colorable_skirt/New() - ..() - gear_tweaks += gear_tweak_free_color_choice diff --git a/maps/~map_system/_map_selection.dm b/maps/~map_system/_map_selection.dm index 879f058f54..47ff0d984d 100644 --- a/maps/~map_system/_map_selection.dm +++ b/maps/~map_system/_map_selection.dm @@ -5,8 +5,8 @@ /* FOR LIVE SERVER */ /*********************/ -#define USE_MAP_TETHER -//#define USE_MAP_STELLARDELIGHT +//#define USE_MAP_TETHER +#define USE_MAP_STELLARDELIGHT //#define USE_MAP_GROUNDBASE // Debug diff --git a/vorestation.dme b/vorestation.dme index cd19e14141..75496bb53a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2089,36 +2089,24 @@ #include "code\modules\client\preference_setup\general\05_background.dm" #include "code\modules\client\preference_setup\general\06_flavor.dm" #include "code\modules\client\preference_setup\loadout\gear_tweaks.dm" -#include "code\modules\client\preference_setup\loadout\gear_tweaks_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout.dm" #include "code\modules\client\preference_setup\loadout\loadout_accessories.dm" #include "code\modules\client\preference_setup\loadout\loadout_cosmetics.dm" -#include "code\modules\client\preference_setup\loadout\loadout_cosmetics_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_cyberware.dm" #include "code\modules\client\preference_setup\loadout\loadout_ears.dm" #include "code\modules\client\preference_setup\loadout\loadout_eyes.dm" -#include "code\modules\client\preference_setup\loadout\loadout_eyes_vr.dm" -#include "code\modules\client\preference_setup\loadout\loadout_fluffitems_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_fluffitems.dm" #include "code\modules\client\preference_setup\loadout\loadout_general.dm" -#include "code\modules\client\preference_setup\loadout\loadout_general_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_gloves.dm" -#include "code\modules\client\preference_setup\loadout\loadout_gloves_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_head.dm" -#include "code\modules\client\preference_setup\loadout\loadout_head_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_mask.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes.dm" -#include "code\modules\client\preference_setup\loadout\loadout_shoes_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_smoking.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit.dm" -#include "code\modules\client\preference_setup\loadout\loadout_suit_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_uni_selector.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform.dm" -#include "code\modules\client\preference_setup\loadout\loadout_uniform_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_utility.dm" -#include "code\modules\client\preference_setup\loadout\loadout_utility_vr.dm" -#include "code\modules\client\preference_setup\loadout\loadout_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_xeno.dm" -#include "code\modules\client\preference_setup\loadout\loadout_xeno_vr.dm" #include "code\modules\client\preference_setup\occupation\occupation.dm" #include "code\modules\client\preference_setup\volume_sliders\01_volume.dm" #include "code\modules\client\preference_setup\volume_sliders\02_media.dm"