From 2d3a306dea918c3016d79ddd235ede71e74ab865 Mon Sep 17 00:00:00 2001 From: Belsima <31827220+Belsima@users.noreply.github.com> Date: Mon, 27 Nov 2017 20:21:49 -0500 Subject: [PATCH] Loadout additions + fixes. (#4339) * Loadout additions + fixes. * Selection fix. --- .../loadout/loadout_accessories.dm | 13 ++++- .../loadout/loadout_cosmetics.dm | 14 +++-- .../preference_setup/loadout/loadout_eyes.dm | 16 +++--- .../loadout/loadout_general.dm | 8 +-- .../preference_setup/loadout/loadout_head.dm | 51 +++++++++++-------- .../loadout/loadout_smoking.dm | 27 ++++++---- .../preference_setup/loadout/loadout_suit.dm | 4 ++ .../loadout/loadout_uniform.dm | 2 +- .../loadout/loadout_utility.dm | 4 ++ .../preference_setup/loadout/loadout_xeno.dm | 24 ++++++--- 10 files changed, 108 insertions(+), 55 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index bf1796ea29c..8782bf0c137 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -199,7 +199,7 @@ /datum/gear/accessory/sweater - display_name = "Sweater Selection" + display_name = "sweater selection" path = /obj/item/clothing/accessory/sweater /datum/gear/accessory/sweater/New() @@ -231,4 +231,13 @@ /datum/gear/accessory/bracelet/friendship display_name = "friendship bracelet" - path = /obj/item/clothing/accessory/bracelet/friendship \ No newline at end of file + path = /obj/item/clothing/accessory/bracelet/friendship + +/datum/gear/accessory/stethoscope + display_name = "stethoscope" + path = /obj/item/clothing/accessory/stethoscope + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic") + +/datum/gear/accessory/locket + display_name = "locket" + path = /obj/item/clothing/accessory/locket \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm index a9b9ddbf2ce..7e9b25070ae 100644 --- a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm +++ b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm @@ -1,16 +1,20 @@ -/datum/gear/lipstick +/datum/gear/cosmetic/lipstick/black display_name = "lipstick, black" path = /obj/item/weapon/lipstick/black - sort_category = "Cosmetics" -/datum/gear/lipstick/jade +/datum/gear/cosmetic/lipstick/jade display_name = "lipstick, jade" path = /obj/item/weapon/lipstick/jade -/datum/gear/lipstick/purple +/datum/gear/cosmetic/lipstick/purple display_name = "lipstick, purple" path = /obj/item/weapon/lipstick/purple -/datum/gear/lipstick/red +/datum/gear/cosmetic/lipstick display_name = "lipstick, red" path = /obj/item/weapon/lipstick + +/datum/gear/cosmetic + display_name = "purple comb" + path = /obj/item/weapon/haircomb + sort_category = "Cosmetics" \ 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 5f4791eca63..9058ad72115 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -18,14 +18,18 @@ path = /obj/item/clothing/glasses/regular/hipster /datum/gear/eyes/glasses/monocle - display_name = "Monocle" + display_name = "monocle" path = /obj/item/clothing/glasses/monocle -/datum/gear/eyes/scanning_goggles +/datum/gear/eyes/goggles + display_name = "plain goggles" + path = /obj/item/clothing/glasses/goggles + +/datum/gear/eyes/goggles/scanning display_name = "scanning goggles" path = /obj/item/clothing/glasses/regular/scanners -/datum/gear/eyes/sciencegoggles +/datum/gear/eyes/goggles/science display_name = "Science Goggles" path = /obj/item/clothing/glasses/science @@ -73,7 +77,7 @@ allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director") /datum/gear/eyes/meson/prescription - display_name = "Optical Meson Scanners, prescription (Engineering)" + display_name = "Optical Meson Scanners, prescription (Engineering, Science)" path = /obj/item/clothing/glasses/meson/prescription /datum/gear/eyes/material @@ -86,11 +90,11 @@ path = /obj/item/clothing/glasses/material/prescription /datum/gear/eyes/meson/aviator - display_name = "Optical Meson Aviators, (Engineering)" + display_name = "Optical Meson Aviators, (Engineering, Science)" path = /obj/item/clothing/glasses/meson/aviator /datum/gear/eyes/meson/aviator/prescription - display_name = "Optical Meson Aviators, prescription (Engineering)" + display_name = "Optical Meson Aviators, prescription (Engineering, Science)" path = /obj/item/clothing/glasses/meson/aviator/prescription /datum/gear/eyes/glasses/fakesun diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 860869883fc..34a806fe325 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -2,6 +2,10 @@ display_name = "cane" path = /obj/item/weapon/cane +/datum/gear/cane/white + display_name = "white cane" + path = /obj/item/weapon/cane/whitecane + /datum/gear/dice display_name = "dice pack" path = /obj/item/weapon/storage/pill_bottle/dice @@ -62,10 +66,6 @@ ..() gear_tweaks += new/datum/gear_tweak/reagents(lunchables_drink_reagents()) -/datum/gear/comb - display_name = "purple comb" - path = /obj/item/weapon/haircomb - /datum/gear/lunchbox display_name = "lunchbox" description = "A little lunchbox." diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index bbaca4c3636..394432e9d88 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -114,9 +114,13 @@ path = /obj/item/clothing/head/soft/yellow /datum/gear/head/cap/white - display_name = "cap, white" + display_name = "cap (colorable)" path = /obj/item/clothing/head/soft/mime +/datum/gear/head/cap/white/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + /datum/gear/head/cap/mbill display_name = "cap, bill" path = /obj/item/clothing/head/soft/mbill @@ -154,7 +158,7 @@ path = /obj/item/clothing/head/fedora/grey /datum/gear/head/hairflower - display_name = "hair flower pin" + display_name = "hair flower pin (colorable)" path = /obj/item/clothing/head/hairflower/white /datum/gear/head/hairflower/New() @@ -162,21 +166,17 @@ gear_tweaks = list(gear_tweak_free_color_choice) /datum/gear/head/hardhat - display_name = "hardhat, yellow" + display_name = "hardhat selection" path = /obj/item/clothing/head/hardhat cost = 2 -/datum/gear/head/hardhat/blue - display_name = "hardhat, blue" - path = /obj/item/clothing/head/hardhat/dblue - -/datum/gear/head/hardhat/orange - display_name = "hardhat, orange" - path = /obj/item/clothing/head/hardhat/orange - -/datum/gear/head/hardhat/red - display_name = "hardhat, red" - path = /obj/item/clothing/head/hardhat/red +/datum/gear/head/hardhat/New() + ..() + var/list/hardhats = list() + for(var/hardhat in typesof(/obj/item/clothing/head/hardhat)) + var/obj/item/clothing/head/hardhat/hardhat_type = hardhat + hardhats[initial(hardhat_type.name)] = hardhat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hardhats)) /datum/gear/head/boater display_name = "hat, boatsman" @@ -194,22 +194,30 @@ display_name = "hat, tophat" path = /obj/item/clothing/head/that -/datum/gear/head/philosopher_wig +/datum/gear/head/wig/philosopher display_name = "natural philosopher's wig" path = /obj/item/clothing/head/philosopher_wig +/datum/gear/head/wig + display_name = "powdered wig" + path = /obj/item/clothing/head/powdered_wig + /datum/gear/head/ushanka display_name = "ushanka" path = /obj/item/clothing/head/ushanka /datum/gear/head/santahat - display_name = "santa hat, red (holiday)" + display_name = "santa hat" path = /obj/item/clothing/head/santa cost = 2 -/datum/gear/head/santahat/green - display_name = "santa hat, green (holiday)" - path = /obj/item/clothing/head/santa/green +/datum/gear/head/santahat/New() + ..() + var/list/santahats = list() + for(var/santahat in typesof(/obj/item/clothing/head/santa)) + var/obj/item/clothing/head/santa/santahat_type = santahat + santahats[initial(santahat_type.name)] = santahat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(santahats)) /datum/gear/head/hijab display_name = "hijab" @@ -243,11 +251,14 @@ ..() gear_tweaks = list(gear_tweak_free_color_choice) - /datum/gear/head/kitty display_name = "kitty ears" path = /obj/item/clothing/head/kitty +/datum/gear/head/rabbit + display_name = "rabbit ears" + path = /obj/item/clothing/head/rabbitears + /datum/gear/head/beanie display_name = "beanie" path = /obj/item/clothing/head/beanie diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index 28fa92f860c..cbedca3a675 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -1,20 +1,29 @@ -/datum/gear/smokingpipe - display_name = "pipe, smoking" + +/datum/gear/pipe + display_name = "pipe" path = /obj/item/clothing/mask/smokable/pipe -/datum/gear/cornpipe - display_name = "pipe, corn" - path = /obj/item/clothing/mask/smokable/pipe/cobpipe +/datum/gear/pipe/New() + ..() + var/list/pipes = list() + for(var/pipe_style in typesof(/obj/item/clothing/mask/smokable/pipe)) + var/obj/item/clothing/mask/smokable/pipe/pipe = pipe_style + pipes[initial(pipe.name)] = pipe + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pipes)) /datum/gear/matchbook display_name = "matchbook" path = /obj/item/weapon/storage/box/matches -/datum/gear/zippo - display_name = "Zippo Selection" +/datum/gear/lighter + display_name = "cheap lighter" + path = /obj/item/weapon/flame/lighter + +/datum/gear/lighter/zippo + display_name = "Zippo selection" path = /obj/item/weapon/flame/lighter/zippo -/datum/gear/zippo/New() +/datum/gear/lighter/zippo/New() ..() var/list/zippos = list() for(var/zippo in typesof(/obj/item/weapon/flame/lighter/zippo)) @@ -40,4 +49,4 @@ for(var/cigarette in (typesof(/obj/item/weapon/storage/fancy/cigarettes) - typesof(/obj/item/weapon/storage/fancy/cigarettes/killthroat))) var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand = cigarette cigarettes[initial(cigarette_brand.name)] = cigarette_brand - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes)) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes)) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 82631635af3..918a7f2a92f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -6,6 +6,10 @@ sort_category = "Suits and Overwear" cost = 2 +/datum/gear/suit/greatcoat + display_name = "greatcoat" + path = /obj/item/clothing/suit/greatcoat + /datum/gear/suit/leather_coat display_name = "leather coat" path = /obj/item/clothing/suit/leathercoat diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 836146d11ff..8a36bb59275 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -349,7 +349,7 @@ /datum/gear/uniform/whitewedding display_name= "white wedding dress" - path = /obj/item/clothing/under/dress/white + path = /obj/item/clothing/under/wedding/bride_white /datum/gear/uniform/skirts display_name = "executive skirt" diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 2338b22c68e..b21b257a494 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -13,6 +13,10 @@ path = /obj/item/device/communicator cost = 0 +/datum/gear/utility/camera + display_name = "camera" + path = /obj/item/device/camera + /datum/gear/utility/codex display_name = "the traveler's guide to vir" path = /obj/item/weapon/book/codex/lore/vir diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 3ace6ac9983..7e4a082ff7e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -43,25 +43,33 @@ bandtypes[initial(band.name)] = band gear_tweaks += new/datum/gear_tweak/path(sortAssoc(bandtypes)) -/datum/gear/ears/skrell/cloth/male - display_name = "male headtail cloth (Skrell)" +/datum/gear/ears/skrell/cloth/short + display_name = "short headtail cloth (Skrell)" path = /obj/item/clothing/ears/skrell/cloth_male/black sort_category = "Xenowear" whitelisted = "Skrell" -/datum/gear/ears/skrell/cloth/male/New() +/datum/gear/ears/skrell/cloth/short/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) + var/list/shorttypes = list() + for(var/short_style in typesof(/obj/item/clothing/ears/skrell/cloth_male)) + var/obj/item/clothing/ears/skrell/cloth_male/short = short_style + shorttypes[initial(short.name)] = short + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorttypes)) -/datum/gear/ears/skrell/cloth/female - display_name = "female headtail cloth (Skrell)" +/datum/gear/ears/skrell/cloth/long + display_name = "long headtail cloth (Skrell)" path = /obj/item/clothing/ears/skrell/cloth_female/black sort_category = "Xenowear" whitelisted = "Skrell" -/datum/gear/ears/skrell/cloth/female/New() +/datum/gear/ears/skrell/cloth/long/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) + var/list/longtypes = list() + for(var/long_style in typesof(/obj/item/clothing/ears/skrell/cloth_female)) + var/obj/item/clothing/ears/skrell/cloth_female/long = long_style + longtypes[initial(long.name)] = long + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(longtypes)) /datum/gear/ears/skrell/colored/band display_name = "Colored bands (Skrell)"