diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 03e350ff6f..02115420e3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -34,7 +34,6 @@ path = /obj/item/weapon/storage/wallet/poly cost = 0 //VOREStation Edit - /datum/gear/accessory/wallet/womens display_name = "wallet, womens" path = /obj/item/weapon/storage/wallet/womens @@ -76,15 +75,25 @@ /datum/gear/accessory/holster display_name = "holster selection" + description = "Select from a number of general-purpose handgun holsters, or a baton lanyard." path = /obj/item/clothing/accessory/holster - allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective", "Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Talon Captain","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/holster/New() ..() - var/list/holsters = list() - for(var/obj/item/clothing/accessory/holster_type as anything in typesof(/obj/item/clothing/accessory/holster)) - holsters[initial(holster_type.name)] = holster_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(holsters)) + var/list/selector_holsters = list( + "holster"=/obj/item/clothing/accessory/holster, + "armpit holster, brown"=/obj/item/clothing/accessory/holster/armpit, + "armpit holster, black"=/obj/item/clothing/accessory/holster/armpit/black, + "waist holster, brown"=/obj/item/clothing/accessory/holster/waist, + "waist holster, black"=/obj/item/clothing/accessory/holster/waist/black, + "hip holster, brown"=/obj/item/clothing/accessory/holster/hip, + "hip holster, black"=/obj/item/clothing/accessory/holster/hip/black, + "leg holster, brown"=/obj/item/clothing/accessory/holster/leg, + "leg holster, black"=/obj/item/clothing/accessory/holster/leg/black, + "baton lanyard"=/obj/item/clothing/accessory/holster/waist/lanyard + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_holsters)) /datum/gear/accessory/tie display_name = "tie selection" @@ -147,35 +156,31 @@ display_name = "suit vest" path = /obj/item/clothing/accessory/vest -/datum/gear/accessory/brown_vest - display_name = "webbing, brown" - path = /obj/item/clothing/accessory/storage/brown_vest -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") // CHOMPedit: Anyone can use. +/datum/gear/accessory/webbing + display_name = "webbing, simple" + path = /obj/item/clothing/accessory/storage/webbing + cost = 1 -/datum/gear/accessory/black_vest - display_name = "webbing, black" - path = /obj/item/clothing/accessory/storage/black_vest -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") // CHOMPedit: Anyone can use. +/datum/gear/accessory/webbing_selector + display_name = "webbing selector" + description = "Select from a number of load-bearing webbings and vests. Includes the bluespace badge." + path = /obj/item/clothing/accessory/storage/bluespace + cost = 2 -/datum/gear/accessory/white_vest - display_name = "webbing, white" - path = /obj/item/clothing/accessory/storage/white_vest -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") // CHOMPedit: Anyone can use. - -/datum/gear/accessory/brown_drop_pouches - display_name = "drop pouches, brown" - path = /obj/item/clothing/accessory/storage/brown_drop_pouches -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") // CHOMPedit: Anyone can use. - -/datum/gear/accessory/black_drop_pouches - display_name = "drop pouches, black" - path = /obj/item/clothing/accessory/storage/black_drop_pouches -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") // CHOMPedit: Anyone can use. - -/datum/gear/accessory/white_drop_pouches - display_name = "drop pouches, white" - path = /obj/item/clothing/accessory/storage/white_drop_pouches -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") // CHOMPedit: Anyone can use. +/datum/gear/accessory/webbing_selector/New() + ..() + var/list/selector_loadbearinggear = list( + "webbing vest, brown"=/obj/item/clothing/accessory/storage/brown_vest, + "webbing vest, black"=/obj/item/clothing/accessory/storage/black_vest, + "webbing vest, white"=/obj/item/clothing/accessory/storage/white_vest, + "drop pouches, brown"=/obj/item/clothing/accessory/storage/brown_drop_pouches, + "drop pouches, black"=/obj/item/clothing/accessory/storage/black_drop_pouches, + "drop pouches, white"=/obj/item/clothing/accessory/storage/white_drop_pouches, + "bluespace badge"=/obj/item/clothing/accessory/storage/bluespace, + "pilot's harness"=/obj/item/clothing/accessory/storage/webbing/pilot1, + "pilot's harness, alt"=/obj/item/clothing/accessory/storage/webbing/pilot2 + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_loadbearinggear)) /datum/gear/accessory/fannypack display_name = "fannypack selection" @@ -189,11 +194,6 @@ fannys[initial(fanny_type.name)] = fanny_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(fannys)) -/datum/gear/accessory/webbing - display_name = "webbing, simple" - path = /obj/item/clothing/accessory/storage/webbing - cost = 2 - /datum/gear/accessory/chaps display_name = "chaps, brown" path = /obj/item/clothing/accessory/chaps @@ -250,7 +250,7 @@ /datum/gear/accessory/stethoscope display_name = "stethoscope" path = /obj/item/clothing/accessory/stethoscope - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Search and Rescue") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Talon Doctor") /datum/gear/accessory/locket display_name = "locket" @@ -308,7 +308,7 @@ gear_tweaks += new/datum/gear_tweak/path(hawaiian_shirts) /datum/gear/accessory/cowboy_vest - display_name = "cowboy selection" + display_name = "cowboy vest selection" path = /obj/item/clothing/accessory/cowboy_vest /datum/gear/accessory/cowboy_vest/New() @@ -346,7 +346,7 @@ display_name = "corporate press pass" path = /obj/item/clothing/accessory/badge/press -/datum/gear/accessory/pressbadge +/datum/gear/accessory/pressbadge_freelance display_name = "freelance press pass" path = /obj/item/clothing/accessory/badge/press/independent @@ -373,3 +373,183 @@ "Black, White and Grey" = /obj/item/clothing/accessory/wristbandcollection/ace ) gear_tweaks += new/datum/gear_tweak/path(wristband_lists) + +// Collars + +/datum/gear/choker //A colorable choker + display_name = "choker (colorable, tagless)" + path = /obj/item/clothing/accessory/choker + slot = slot_tie + sort_category = "Accessories" + +/datum/gear/choker/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/collar + display_name = "collar, silver" + path = /obj/item/clothing/accessory/collar/silver + slot = slot_tie + sort_category = "Accessories" + +/datum/gear/collar/New() + ..() + gear_tweaks += gear_tweak_collar_tag + +/datum/gear/collar/golden + display_name = "collar, golden" + path = /obj/item/clothing/accessory/collar/gold + +/datum/gear/collar/bell + display_name = "collar, bell" + path = /obj/item/clothing/accessory/collar/bell + +/datum/gear/collar/shock + display_name = "collar, shock" + path = /obj/item/clothing/accessory/collar/shock + +/datum/gear/collar/spike + display_name = "collar, spike" + path = /obj/item/clothing/accessory/collar/spike + +/datum/gear/collar/pink + display_name = "collar, pink" + path = /obj/item/clothing/accessory/collar/pink + +/datum/gear/collar/cowbell + display_name = "collar, cowbell" + path = /obj/item/clothing/accessory/collar/cowbell + +/datum/gear/collar/planet_earth + display_name = "collar, planet" + path = /obj/item/clothing/accessory/collar/collarplanet_earth + +/datum/gear/collar/holo + display_name = "collar, holo" + path = /obj/item/clothing/accessory/collar/holo + +/datum/gear/collar/holo/indigestible + display_name = "collar, holo (indigestible)" + path = /obj/item/clothing/accessory/collar/holo/indigestible + +/datum/gear/accessory/khcrystal + display_name = "KH Life Crystal" + path = /obj/item/weapon/storage/box/khcrystal + description = "A small necklace device that will notify an offsite cloning facility should you expire after activating it." + +/datum/gear/accessory/tronket + display_name = "metal necklace" + description = "A shiny steel chain with a vague metallic object dangling off it." + path = /obj/item/clothing/accessory/tronket + +/datum/gear/accessory/pilotpin + display_name = "pilot qualification pin" + description = "An iron pin denoting the qualification to fly spacecraft in most areas of civilized space." + path = /obj/item/clothing/accessory/solgov/specialty/pilot + +/datum/gear/accessory/flops + display_name = "drop straps" + description = "Wearing suspenders over shoulders? That's been so out for centuries and you know better." + path = /obj/item/clothing/accessory/flops + +/datum/gear/accessory/flops/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/accessory/dosimeter + display_name = "Dosimeter" + path = /obj/item/weapon/storage/box/dosimeter + description = "A small device that will warn the bearer when they are exposed to dangerous levels of radiation." + +/* +Talon pin +*/ +/datum/gear/accessory/talonpin + display_name = "Talon pin" + description = "A small enamel pin of the Talon logo." + path = /obj/item/clothing/accessory/talon + +//Rat badge + +/datum/gear/accessory/altevian_badge + display_name = "altevian badge" + path = /obj/item/clothing/accessory/altevian_badge + +/datum/gear/accessory/maid_neck + display_name = "maid neck cover" + path = /obj/item/clothing/accessory/maid_neck + +/datum/gear/accessory/maid_corset + display_name = "maid corset" + path = /obj/item/clothing/accessory/maidcorset + +//Antediluvian accessories +/datum/gear/accessory/antediluvian + display_name = "antediluvian bracers" + path = /obj/item/clothing/accessory/antediluvian + +/datum/gear/accessory/antediluvian/loin + display_name = "antediluvian loincloth" + path = /obj/item/clothing/accessory/antediluvian/loincloth + +//Replikant accessories + +/datum/gear/accessory/sleekpatch + display_name = "sleek uniform patch" + path = /obj/item/clothing/accessory/sleekpatch + +/datum/gear/accessory/poncho/roles/cloak/custom/gestaltjacket + display_name = "sleek uniform jacket" + path = /obj/item/clothing/accessory/poncho/roles/cloak/custom/gestaltjacket + +/datum/gear/accessory/replika + display_name = "replikant vest selection" + path = /obj/item/clothing/accessory/replika + +/datum/gear/accessory/replika/New() + ..() + var/list/replika_vests = list( + "controller replikant chestplate" = /obj/item/clothing/accessory/replika/klbr, + "combat-engineer replikant chestplate" = /obj/item/clothing/accessory/replika/lstr, + "security-controller replikant chestplate" = /obj/item/clothing/accessory/replika/stcr, + "security-technician replikant chestplate" = /obj/item/clothing/accessory/replika/star + ) + gear_tweaks += new/datum/gear_tweak/path(replika_vests) + +/datum/gear/accessory/insignia + display_name = "Insignia Selection" + path = /obj/item/clothing/accessory/solgov/department + +/datum/gear/accessory/insignia/New() + ..() + var/insignia = list( + "Command - Crew" = /obj/item/clothing/accessory/solgov/department/command, + "Command - Crew Short" = /obj/item/clothing/accessory/solgov/department/command/service, + "Command - Bands" = /obj/item/clothing/accessory/solgov/department/command/fleet, + "Command - Echelons" = /obj/item/clothing/accessory/solgov/department/command/army, + "Security - Crew" = /obj/item/clothing/accessory/solgov/department/security, + "Security - Crew Short" = /obj/item/clothing/accessory/solgov/department/security/service, + "Security - Bands" = /obj/item/clothing/accessory/solgov/department/security/fleet, + "Security - Echelons" = /obj/item/clothing/accessory/solgov/department/security/army, + "Medical - Crew" = /obj/item/clothing/accessory/solgov/department/medical, + "Medical - Crew Short" = /obj/item/clothing/accessory/solgov/department/medical/service, + "Medical - Bands" = /obj/item/clothing/accessory/solgov/department/medical/fleet, + "Medical - Echelons" = /obj/item/clothing/accessory/solgov/department/medical/army, + "Science - Crew" = /obj/item/clothing/accessory/solgov/department/research, + "Science - Crew Short" = /obj/item/clothing/accessory/solgov/department/research/service, + "Science - Bands" = /obj/item/clothing/accessory/solgov/department/research/fleet, + "Science - Echelons" = /obj/item/clothing/accessory/solgov/department/research/army, + "Engineering - Crew" = /obj/item/clothing/accessory/solgov/department/engineering, + "Engineering - Crew Short" = /obj/item/clothing/accessory/solgov/department/engineering/service, + "Engineering - Bands" = /obj/item/clothing/accessory/solgov/department/engineering/fleet, + "Engineering - Echelons" = /obj/item/clothing/accessory/solgov/department/engineering/army, + "Supply - Crew" = /obj/item/clothing/accessory/solgov/department/supply, + "Supply - Crew Short" = /obj/item/clothing/accessory/solgov/department/supply/service, + "Supply - Bands" = /obj/item/clothing/accessory/solgov/department/supply/fleet, + "Supply - Echelons" = /obj/item/clothing/accessory/solgov/department/supply/army, + "Service - Crew" = /obj/item/clothing/accessory/solgov/department/service, + "Service - Crew Short" = /obj/item/clothing/accessory/solgov/department/service/service, + "Service - Bands" = /obj/item/clothing/accessory/solgov/department/service/fleet, + "Service - Echelons" = /obj/item/clothing/accessory/solgov/department/service/army + ) + gear_tweaks += new/datum/gear_tweak/path(insignia) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm deleted file mode 100644 index 6e71a1cc34..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ /dev/null @@ -1,226 +0,0 @@ -// Collars - -/datum/gear/choker //A colorable choker - display_name = "choker (colorable, tagless)" - path = /obj/item/clothing/accessory/choker - slot = slot_tie - sort_category = "Accessories" - -/datum/gear/choker/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/collar - display_name = "collar, silver" - path = /obj/item/clothing/accessory/collar/silver - slot = slot_tie - sort_category = "Accessories" - -/datum/gear/collar/New() - ..() - gear_tweaks += gear_tweak_collar_tag - -/datum/gear/collar/golden - display_name = "collar, golden" - path = /obj/item/clothing/accessory/collar/gold - -/datum/gear/collar/bell - display_name = "collar, bell" - path = /obj/item/clothing/accessory/collar/bell - -/datum/gear/collar/shock - display_name = "collar, shock" - path = /obj/item/clothing/accessory/collar/shock - -/datum/gear/collar/spike - display_name = "collar, spike" - path = /obj/item/clothing/accessory/collar/spike - -/datum/gear/collar/pink - display_name = "collar, pink" - path = /obj/item/clothing/accessory/collar/pink - -/datum/gear/collar/cowbell - display_name = "collar, cowbell" - path = /obj/item/clothing/accessory/collar/cowbell - -/datum/gear/collar/planet_earth - display_name = "collar, planet" - path = /obj/item/clothing/accessory/collar/collarplanet_earth - -/datum/gear/collar/holo - display_name = "collar, holo" - path = /obj/item/clothing/accessory/collar/holo - -/datum/gear/collar/holo/indigestible - display_name = "collar, holo (indigestible)" - path = /obj/item/clothing/accessory/collar/holo/indigestible - -/datum/gear/accessory/holster - display_name = "holster selection" - allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Field Medic","Explorer","Pathfinder","Talon Captain","Talon Guard") // CHOMPedit: Readd explo - -/datum/gear/accessory/brown_vest - display_name = "webbing, brown" // CHOMPedit: Anyone can use. -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") // CHOMPedit: Anyone can use. - cost = 2 // CHOMPedit: Cost increase. - -/datum/gear/accessory/black_vest - display_name = "webbing, black" // CHOMPedit: Anyone can use. -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") // CHOMPedit: Anyone can use. - cost = 2 // CHOMPedit: Cost increase. - -/datum/gear/accessory/white_vest - display_name = "webbing, white" // CHOMPedit: Anyone can use. -// allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic") // CHOMPedit: Anyone can use. - cost = 2 // CHOMPedit: Cost increase. - -/datum/gear/accessory/brown_drop_pouches - display_name = "drop pouches, brown" // CHOMPedit: Anyone can use. -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") // CHOMPedit: Anyone can use. - cost = 2 // CHOMPedit: Cost increase. - -/datum/gear/accessory/black_drop_pouches - display_name = "drop pouches, black" // CHOMPedit: Anyone can use. -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") // CHOMPedit: Anyone can use. - cost = 2 // CHOMPedit: Cost increase. - -/datum/gear/accessory/white_drop_pouches - display_name = "drop pouches, white" // CHOMPedit: Anyone can use. -// allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic") // CHOMPedit: Anyone can use. - cost = 2 // CHOMPedit: Cost increase. - -/datum/gear/accessory/bluespace - display_name = "bluespace badge" // CHOMPedit: Anyone can use. - path = /obj/item/clothing/accessory/storage/bluespace -// allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard","Talon Miner","Pilot") // CHOMPedit: Anyone can use. - cost = 2 - -/datum/gear/accessory/webbing - cost = 1 - -/datum/gear/accessory/stethoscope - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic") //CHOMP keep explo - -/datum/gear/accessory/khcrystal - display_name = "Life Crystal" - path = /obj/item/weapon/storage/box/khcrystal - description = "A small necklace device that will notify an offsite cloning facility should you expire after activating it." - -/datum/gear/accessory/tronket - display_name = "metal necklace" - description = "A shiny steel chain with a vague metallic object dangling off it." - path = /obj/item/clothing/accessory/tronket - -/datum/gear/accessory/pilotpin - display_name = "pilot qualification pin" - description = "An iron pin denoting the qualification to fly USG spacecraft." - path = /obj/item/clothing/accessory/solgov/specialty/pilot - allowed_roles = list("Pathfinder","Pilot","Field Medic","Talon Pilot") //CHOMP keep explo - -/datum/gear/accessory/flops - display_name = "drop straps" - description = "Wearing suspenders over shoulders? That's been so out for centuries and you know better." - path = /obj/item/clothing/accessory/flops - -/datum/gear/accessory/flops/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/accessory/dosimeter - display_name = "Dosimeter" - path = /obj/item/weapon/storage/box/dosimeter - description = "A small device that will display dangerous levels of radiation." - -/* -Talon pin -*/ -/datum/gear/accessory/talonpin - display_name = "Talon pin" - description = "A small enamel pin of the Talon logo." - path = /obj/item/clothing/accessory/talon - -//Rat badge - -/datum/gear/accessory/altevian_badge - display_name = "altevian badge" - path = /obj/item/clothing/accessory/altevian_badge - -/datum/gear/accessory/maid_neck - display_name = "maid neck cover" - path = /obj/item/clothing/accessory/maid_neck - -/datum/gear/accessory/maid_corset - display_name = "maid corset" - path = /obj/item/clothing/accessory/maidcorset - -//Antediluvian accessories -/datum/gear/accessory/antediluvian - display_name = "antediluvian bracers" - path = /obj/item/clothing/accessory/antediluvian - -/datum/gear/accessory/antediluvian/loin - display_name = "antediluvian loincloth" - path = /obj/item/clothing/accessory/antediluvian/loincloth - -//Replikant accessories - -/datum/gear/accessory/sleekpatch - display_name = "sleek uniform patch" - path = /obj/item/clothing/accessory/sleekpatch - -/datum/gear/accessory/poncho/roles/cloak/custom/gestaltjacket - display_name = "sleek uniform jacket" - path = /obj/item/clothing/accessory/poncho/roles/cloak/custom/gestaltjacket - -/datum/gear/accessory/replika - display_name = "replikant vest selection" - path = /obj/item/clothing/accessory/replika - -/datum/gear/accessory/replika/New() - ..() - var/list/replika_vests = list( - "controller replikant chestplate" = /obj/item/clothing/accessory/replika/klbr, - "combat-engineer replikant chestplate" = /obj/item/clothing/accessory/replika/lstr, - "security-controller replikant chestplate" = /obj/item/clothing/accessory/replika/stcr, - "security-technician replikant chestplate" = /obj/item/clothing/accessory/replika/star - ) - gear_tweaks += new/datum/gear_tweak/path(replika_vests) - -/datum/gear/accessory/insignia - display_name = "Insignia Selection" - path = /obj/item/clothing/accessory/solgov/department - -/datum/gear/accessory/insignia/New() - ..() - var/insignia = list( - "Command - Crew" = /obj/item/clothing/accessory/solgov/department/command, - "Command - Crew Short" = /obj/item/clothing/accessory/solgov/department/command/service, - "Command - Bands" = /obj/item/clothing/accessory/solgov/department/command/fleet, - "Command - Echelons" = /obj/item/clothing/accessory/solgov/department/command/army, - "Security - Crew" = /obj/item/clothing/accessory/solgov/department/security, - "Security - Crew Short" = /obj/item/clothing/accessory/solgov/department/security/service, - "Security - Bands" = /obj/item/clothing/accessory/solgov/department/security/fleet, - "Security - Echelons" = /obj/item/clothing/accessory/solgov/department/security/army, - "Medical - Crew" = /obj/item/clothing/accessory/solgov/department/medical, - "Medical - Crew Short" = /obj/item/clothing/accessory/solgov/department/medical/service, - "Medical - Bands" = /obj/item/clothing/accessory/solgov/department/medical/fleet, - "Medical - Echelons" = /obj/item/clothing/accessory/solgov/department/medical/army, - "Science - Crew" = /obj/item/clothing/accessory/solgov/department/research, - "Science - Crew Short" = /obj/item/clothing/accessory/solgov/department/research/service, - "Science - Bands" = /obj/item/clothing/accessory/solgov/department/research/fleet, - "Science - Echelons" = /obj/item/clothing/accessory/solgov/department/research/army, - "Engineering - Crew" = /obj/item/clothing/accessory/solgov/department/engineering, - "Engineering - Crew Short" = /obj/item/clothing/accessory/solgov/department/engineering/service, - "Engineering - Bands" = /obj/item/clothing/accessory/solgov/department/engineering/fleet, - "Engineering - Echelons" = /obj/item/clothing/accessory/solgov/department/engineering/army, - "Supply - Crew" = /obj/item/clothing/accessory/solgov/department/supply, - "Supply - Crew Short" = /obj/item/clothing/accessory/solgov/department/supply/service, - "Supply - Bands" = /obj/item/clothing/accessory/solgov/department/supply/fleet, - "Supply - Echelons" = /obj/item/clothing/accessory/solgov/department/supply/army, - "Service - Crew" = /obj/item/clothing/accessory/solgov/department/service, - "Service - Crew Short" = /obj/item/clothing/accessory/solgov/department/service/service, - "Service - Bands" = /obj/item/clothing/accessory/solgov/department/service/fleet, - "Service - Echelons" = /obj/item/clothing/accessory/solgov/department/service/army - ) - gear_tweaks += new/datum/gear_tweak/path(insignia) diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 6376f2f134..2430f7700b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -34,7 +34,7 @@ path = /obj/item/clothing/shoes/boots/jackboots/knee /datum/gear/shoes/thighboots - display_name = "jackboots. thigh-length" + display_name = "jackboots, thigh-length" path = /obj/item/clothing/shoes/boots/jackboots/thigh /datum/gear/shoes/colorboots @@ -150,40 +150,24 @@ gear_tweaks += gear_tweak_free_color_choice /datum/gear/shoes/cowboy - display_name = "cowboy boots" + display_name = "cowboy boots selection" + description = "Pick from a (free) range of rootin' tootin' cowboy boot(in'). Yee-haw!" path = /obj/item/clothing/shoes/boots/cowboy -/datum/gear/shoes/cowboy/classic - display_name = "cowboy boots, classic" - path = /obj/item/clothing/shoes/boots/cowboy/classic - -/datum/gear/shoes/cowboy/brown - display_name = "cowboy boots, brown" - path = /obj/item/clothing/shoes/boots/cowboy/brown - -/datum/gear/shoes/cowboy/black - display_name = "cowboy boots, black" - path = /obj/item/clothing/shoes/boots/cowboy/black - -/datum/gear/shoes/cowboy/white - display_name = "cowboy boots, white" - path = /obj/item/clothing/shoes/boots/cowboy/white - -/datum/gear/shoes/cowboy/fancy - display_name = "cowboy boots, fancy" - path = /obj/item/clothing/shoes/boots/cowboy/fancy - -/datum/gear/shoes/cowboy/snakeskin - display_name = "cowboy boots, snake skin" - path = /obj/item/clothing/shoes/boots/cowboy/snakeskin - -/datum/gear/shoes/cowboy/green - display_name = "cowboy boots, green" - path = /obj/item/clothing/shoes/boots/cowboy/green - -/datum/gear/shoes/cowboy/blue - display_name = "cowboy boots, blue" - path = /obj/item/clothing/shoes/boots/cowboy/blue +/datum/gear/shoes/cowboy/New() + ..() + var/list/selector_uniforms = list( + "cowboy boots"=/obj/item/clothing/shoes/boots/cowboy, + "cowboy boots, classic"=/obj/item/clothing/shoes/boots/cowboy/classic, + "cowboy boots, brown"=/obj/item/clothing/shoes/boots/cowboy/brown, + "cowboy boots, black"=/obj/item/clothing/shoes/boots/cowboy/black, + "cowboy boots, white"=/obj/item/clothing/shoes/boots/cowboy/white, + "cowboy boots, fancy"=/obj/item/clothing/shoes/boots/cowboy/fancy, + "cowboy boots, snakeskin"=/obj/item/clothing/shoes/boots/cowboy/snakeskin, + "cowboy boots, green"=/obj/item/clothing/shoes/boots/cowboy/green, + "cowboy boots, blue"=/obj/item/clothing/shoes/boots/cowboy/blue + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/shoes/jungle display_name = "jungle boots" @@ -244,6 +228,7 @@ /datum/gear/shoes/boots/winter/medical display_name = "medical winter boots" path = /obj/item/clothing/shoes/boots/winter/medical + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //CHOMP keep explo /datum/gear/shoes/boots/winter/mining display_name = "mining winter boots" diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm index 1f2ebb83fd..bc8e236d5d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm @@ -1,6 +1,3 @@ -/datum/gear/shoes/boots/winter/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //CHOMP keep explo - /datum/gear/shoes/black/cuffs display_name = "legwraps, black" path = /obj/item/clothing/shoes/black/cuffs diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index a584ebd67b..ce92b9b940 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1284,10 +1284,14 @@ /obj/item/clothing/accessory/armband = 5, /obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis = 5, //VoreStation edit - cool visor!!! /obj/item/clothing/glasses/hud/security/eyepatch2 = 5, //VoreStation edit - cool eyepatch! - /obj/item/clothing/accessory/holster/armpit = 2, //VOREStation edit - gives some variety of available holsters for those who forgot to bring their own - /obj/item/clothing/accessory/holster/waist = 2, //VOREStation edit - But also reduces the number per type, so there's 8 overall rather than like, 20 - /obj/item/clothing/accessory/holster/hip = 2, //VOREStation edit - /obj/item/clothing/accessory/holster/leg = 2 //VOREStation edit + /obj/item/clothing/accessory/holster/armpit = 2, + /obj/item/clothing/accessory/holster/armpit/black = 2, + /obj/item/clothing/accessory/holster/waist = 2, + /obj/item/clothing/accessory/holster/waist/black = 2, + /obj/item/clothing/accessory/holster/hip = 2, + /obj/item/clothing/accessory/holster/hip/black = 2, + /obj/item/clothing/accessory/holster/leg = 2, + /obj/item/clothing/accessory/holster/leg/black = 2 ) req_log_access = access_hop has_logs = 1 diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index d3fb6177c4..0ff92d9b75 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -977,6 +977,8 @@ /obj/item/clothing/under/utility = 5, /obj/item/clothing/under/utility/grey = 5, /obj/item/clothing/under/utility/blue = 5, + /obj/item/clothing/under/utility/tan = 5, + /obj/item/clothing/under/utility/green = 5, /obj/item/clothing/under/fluff/v_nanovest = 5, /obj/item/clothing/under/dress/westernbustle = 5, /obj/item/clothing/under/wedding/bride_white = 5, @@ -1155,6 +1157,8 @@ /obj/item/clothing/under/utility = 50, /obj/item/clothing/under/utility/grey = 50, /obj/item/clothing/under/utility/blue = 50, + /obj/item/clothing/under/utility/tan = 50, + /obj/item/clothing/under/utility/green = 50, /obj/item/clothing/under/fluff/v_nanovest = 50, /obj/item/clothing/under/dress/westernbustle = 50, /obj/item/clothing/under/wedding/bride_white = 50, @@ -1310,7 +1314,7 @@ /obj/machinery/vending/loadout/overwear name = "Big D's Best" desc = "A special vendor using compressed matter cartridges to store large amounts of overwear!" - product_ads = "Dress your best! It's what big D would want.;Overwear for all occasions!;Big D has what you need if what you need is some form of jacket!;Need a new hoodie? Bid D has you covered.;Big D says you need a new suit!;Big D smiles when he sees you in one of his coats!" + product_ads = "Dress your best! It's what Big D would want.;Overwear for all occasions!;Big D has what you need if what you need is some form of jacket!;Need a new hoodie? Big D has you covered.;Big D says you need a new suit!;Big D smiles when he sees you in one of his coats!" icon_state = "suit" vend_delay = 16 products = list(/obj/item/clothing/suit/storage/apron = 5, @@ -1369,6 +1373,17 @@ /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 5, /obj/item/clothing/suit/storage/miljacket = 5, /obj/item/clothing/suit/storage/miljacket/alt = 5, + /obj/item/clothing/suit/storage/miljacket/patchless = 5, + /obj/item/clothing/suit/storage/miljacket/tan = 5, + /obj/item/clothing/suit/storage/miljacket/tan/patchless = 5, + /obj/item/clothing/suit/storage/miljacket/grey = 5, + /obj/item/clothing/suit/storage/miljacket/grey/patchless = 5, + /obj/item/clothing/suit/storage/miljacket/navy = 5, + /obj/item/clothing/suit/storage/miljacket/navy/patchless = 5, + /obj/item/clothing/suit/storage/miljacket/black = 5, + /obj/item/clothing/suit/storage/miljacket/black/patchless = 5, + /obj/item/clothing/suit/storage/miljacket/white = 5, + /obj/item/clothing/suit/storage/miljacket/white/patchless = 5, /obj/item/clothing/suit/storage/miljacket/green = 5, /obj/item/clothing/suit/storage/apron/overalls = 5, /obj/item/clothing/suit/storage/toggle/peacoat = 5, @@ -1461,6 +1476,17 @@ /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 100, /obj/item/clothing/suit/storage/miljacket = 100, /obj/item/clothing/suit/storage/miljacket/alt = 100, + /obj/item/clothing/suit/storage/miljacket/patchless = 100, + /obj/item/clothing/suit/storage/miljacket/tan = 100, + /obj/item/clothing/suit/storage/miljacket/tan/patchless = 100, + /obj/item/clothing/suit/storage/miljacket/grey = 100, + /obj/item/clothing/suit/storage/miljacket/grey/patchless = 100, + /obj/item/clothing/suit/storage/miljacket/navy = 100, + /obj/item/clothing/suit/storage/miljacket/navy/patchless = 100, + /obj/item/clothing/suit/storage/miljacket/black = 100, + /obj/item/clothing/suit/storage/miljacket/black/patchless = 100, + /obj/item/clothing/suit/storage/miljacket/white = 100, + /obj/item/clothing/suit/storage/miljacket/white/patchless = 100, /obj/item/clothing/suit/storage/miljacket/green = 100, /obj/item/clothing/suit/storage/apron/overalls = 100, /obj/item/clothing/suit/storage/toggle/peacoat = 100, diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 771fdd6451..847218cfe8 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 5fcd744132..6f571e4773 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2142,7 +2142,6 @@ #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_accessories_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_accessories_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_cosmetics.dm" #include "code\modules\client\preference_setup\loadout\loadout_cosmetics_vr.dm"