diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index cb1e1fb6d40..80cf8b8d4d1 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -128,12 +128,19 @@ /obj/item/clothing/under/costume/kimono/sakura = 1, /obj/item/clothing/under/costume/kimono/fancy = 1, /obj/item/clothing/under/costume/kamishimo = 1, + /obj/item/clothing/head/costume/kabuto = 1, + /obj/item/clothing/suit/costume/samurai = 1, /obj/item/clothing/under/costume/vic_vest = 1, /obj/item/clothing/under/costume/vic_vest/red = 1, /obj/item/clothing/under/costume/vic_vest/blue = 1, /obj/item/clothing/under/costume/vic_vest/red_alt = 1, + /obj/item/clothing/suit/costume/tailcoat = 3, + /obj/item/clothing/head/costume/widehat = 1, /obj/item/clothing/under/costume/vic_dress = 1, + /obj/item/clothing/suit/costume/vic_dresscoat = 1, + /obj/item/clothing/head/costume/widehat/red = 1, /obj/item/clothing/under/costume/vic_dress/red = 1, + /obj/item/clothing/suit/costume/vic_dresscoat/red = 1, /obj/item/clothing/under/costume/dutch = 1, /obj/item/clothing/under/costume/loincloth/sensor = 1, /obj/item/clothing/under/costume/loincloth/cloth/sensor = 1) //SKYRAT EDIT ADDITION END diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index db88b9f26f0..d1be544c6c1 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -75,6 +75,11 @@ /obj/item/clothing/under/dress/littleblack = 2, //SKYRAT EDIT ADDITION /obj/item/clothing/under/dress/pinktutu = 2, //SKYRAT EDIT ADDITION /obj/item/clothing/suit/jacket = 2, + /obj/item/clothing/suit/toggle/jacket = 2, //SKYRAT EDIT ADDITION START - Jacket/Flannels Port + /obj/item/clothing/suit/toggle/jacket/flannel = 2, + /obj/item/clothing/suit/toggle/jacket/flannel/red = 2, + /obj/item/clothing/suit/toggle/jacket/flannel/aqua = 2, + /obj/item/clothing/suit/toggle/jacket/flannel/brown = 2, //SKYRAT EDIT ADDITION END /obj/item/clothing/suit/hooded/wintercoat = 2, /obj/item/clothing/suit/jacket/puffer/vest = 2, /obj/item/clothing/suit/jacket/puffer = 2, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index c2c7b744a49..5772a4e221a 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -31,7 +31,8 @@ /obj/item/clothing/under/rank/security/officer/grey = 3, /obj/item/clothing/under/pants/khaki = 3, /obj/item/clothing/under/rank/security/officer/blueshirt = 3, - /obj/item/clothing/under/utility/sec = 3) //SKYRAT EDIT ADDITION + /obj/item/clothing/under/utility/sec/old = 3, //SKYRAT EDIT ADDITION START + /obj/item/clothing/suit/toggle/jacket/sec/old = 3) //SKYRAT EDIT ADDITION END premium = list(/obj/item/clothing/under/rank/security/officer/formal = 3, /obj/item/clothing/suit/security/officer = 3, /obj/item/clothing/head/beret/sec/navyofficer = 3) @@ -63,8 +64,9 @@ /obj/item/clothing/under/rank/medical/doctor/green = 4, /obj/item/clothing/under/rank/medical/doctor/purple = 4, /obj/item/clothing/under/rank/medical/doctor = 4, - /obj/item/clothing/under/utility/med = 4, //SKYRAT EDIT ADDITION - /obj/item/clothing/under/utility/haz_white = 2, //SKYRAT EDIT ADDITION + /obj/item/clothing/under/utility/med = 4, //SKYRAT EDIT ADDITION START + /obj/item/clothing/suit/toggle/jacket/med = 4, + /obj/item/clothing/under/utility/haz_white = 2, //SKYRAT EDIT ADDITION END /obj/item/clothing/suit/toggle/labcoat = 4, /obj/item/clothing/suit/toggle/labcoat/paramedic = 4, /obj/item/clothing/shoes/sneakers/white = 4, @@ -93,6 +95,7 @@ /obj/item/clothing/under/rank/engineering/engineer = 3, /obj/item/clothing/under/rank/engineering/engineer/skirt = 3, /obj/item/clothing/under/utility/eng = 3, //SKYRAT EDIT ADDITION + /obj/item/clothing/suit/toggle/jacket/engi = 3, //SKYRAT EDIT ADDITION /obj/item/clothing/under/misc/overalls = 3, // SKYRAT EDIT ADDITION /obj/item/clothing/under/rank/engineering/engineer/hazard = 3, /obj/item/clothing/under/utility/haz_green = 3, //SKYRAT EDIT ADDITION @@ -141,8 +144,9 @@ products = list(/obj/item/clothing/suit/hooded/wintercoat/cargo = 3, /obj/item/clothing/under/rank/cargo/tech = 3, /obj/item/clothing/under/rank/cargo/tech/skirt = 3, - /obj/item/clothing/under/misc/cargo_long = 3, //SKYRAT EDIT ADDITION - /obj/item/clothing/under/utility/cargo = 3, //SKYRAT EDIT ADDITION + /obj/item/clothing/under/misc/cargo_long = 3, //SKYRAT EDIT ADDITION START + /obj/item/clothing/under/utility/cargo = 3, + /obj/item/clothing/suit/toggle/jacket/supply = 3, //SKYRAT EDIT ADDITION END /obj/item/clothing/shoes/sneakers/black = 3, /obj/item/clothing/gloves/fingerless = 3, /obj/item/clothing/head/soft = 3, @@ -194,6 +198,7 @@ /obj/item/clothing/under/rank/rnd/scientist = 3, /obj/item/clothing/under/rank/rnd/scientist/skirt = 3, /obj/item/clothing/under/utility/sci = 3, //SKYRAT EDIT ADDITION + /obj/item/clothing/suit/toggle/jacket/sci = 3, //SKYRAT EDIT ADDITION /obj/item/clothing/suit/toggle/labcoat/science = 3, /obj/item/clothing/shoes/sneakers/white = 3, /obj/item/radio/headset/headset_sci = 3, @@ -267,6 +272,7 @@ /obj/item/clothing/suit/apron/purple_bartender = 2, /obj/item/clothing/head/soft/black = 2, /obj/item/clothing/shoes/sneakers/black = 2, + /obj/item/clothing/suit/hooded/wintercoat/bartender = 2, //SKYRAT EDIT ADDITION /obj/item/reagent_containers/glass/rag = 2, /obj/item/storage/box/beanbag = 1, /obj/item/clothing/suit/armor/vest/alt = 1, @@ -499,6 +505,7 @@ /obj/item/clothing/shoes/laceup = 2, /obj/item/clothing/suit/det_suit/grey = 1, /obj/item/clothing/suit/det_suit/noir = 1, + /obj/item/clothing/suit/toggle/labcoat/highvis = 2, //SKYRAT EDIT ADDITION /obj/item/clothing/head/fedora = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/gloves/color/latex = 2, diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/head.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/head.dmi index 08579ad978a..0040b644d6a 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/head.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/head.dmi differ diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi index 5ac686719b9..033911a8df1 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi differ diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi index ff65ce34660..b5d14da2cf7 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/hats.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/hats.dmi index 350b48ba072..a3511022113 100644 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/hats.dmi and b/modular_skyrat/modules/customization/icons/obj/clothing/hats.dmi differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi index 24006f1fd65..d918ca57642 100644 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi and b/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi index 3e23433d442..dfd9068eae2 100644 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi and b/modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_skyrat/modules/customization/modules/client/loadout/head.dm b/modular_skyrat/modules/customization/modules/client/loadout/head.dm index 0756c61c492..d22f5950e27 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/head.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/head.dm @@ -74,6 +74,14 @@ name = "Maid Headband" path = /obj/item/clothing/head/maid +/datum/loadout_item/head/widehat + name = "Wide Black Hat" + path = /obj/item/clothing/head/costume/widehat + +/datum/loadout_item/head/widehat_red + name = "Wide Red Hat" + path = /obj/item/clothing/head/costume/widehat/red + /datum/loadout_item/head/cardboard name = "Cardboard Helmet" path = /obj/item/clothing/head/cardborg diff --git a/modular_skyrat/modules/customization/modules/client/loadout/suit.dm b/modular_skyrat/modules/customization/modules/client/loadout/suit.dm index 3df21159929..9ace67d772e 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/suit.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/suit.dm @@ -28,6 +28,35 @@ path = /obj/item/clothing/suit/wornshirt extra_info = LOADOUT_INFO_ONE_COLOR +/datum/loadout_item/suit/tailcoat + name = "Tailcoat" + path = /obj/item/clothing/suit/costume/tailcoat + +/datum/loadout_item/suit/dresscoat + name = "Black Dresscoat" + path = /obj/item/clothing/suit/costume/vic_dresscoat + +/datum/loadout_item/suit/dresscoat_red + name = "Red Dresscoat" + path = /obj/item/clothing/suit/costume/vic_dresscoat/red + +/*Flannels go inside Misc*/ +/datum/loadout_item/suit/flannel_black + name = "Black Flannel" + path = /obj/item/clothing/suit/toggle/jacket/flannel + +/datum/loadout_item/suit/flannel_red + name = "Red Flannel" + path = /obj/item/clothing/suit/toggle/jacket/flannel/red + +/datum/loadout_item/suit/flannel_aqua + name = "Aqua Flannel" + path = /obj/item/clothing/suit/toggle/jacket/flannel/aqua + +/datum/loadout_item/suit/flannel_brown + name = "Brown Flannel" + path = /obj/item/clothing/suit/toggle/jacket/flannel/brown + //COATS /datum/loadout_item/suit/coat subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS @@ -62,6 +91,10 @@ name = "Bomber jacket" path = /obj/item/clothing/suit/jacket +/datum/loadout_item/suit/jacket/jacketbomber_alt + name = "Bomber Jacket w/ Zipper" + path = /obj/item/clothing/suit/toggle/jacket + /datum/loadout_item/suit/jacket/jacketleather name = "Leather jacket" path = /obj/item/clothing/suit/jacket/leather @@ -138,6 +171,11 @@ path = /obj/item/clothing/suit/hooded/wintercoat/hydro restricted_roles = list("Head of Personnel", "Botanist") // Reserve it to Botanists and their boss, the Head of Personnel +/datum/loadout_item/suit/job/coat_bar + name = "Bartender winter coat" + path = /obj/item/clothing/suit/hooded/wintercoat/bartender + restricted_roles = list("Head of Personnel", "Bartender") //Reserved for Bartenders and their head-of-staff + /datum/loadout_item/suit/job/coat_cargo name = "Cargo winter coat" path = /obj/item/clothing/suit/hooded/wintercoat/cargo @@ -162,3 +200,51 @@ name = "warden navyblue jacket" path = /obj/item/clothing/suit/armor/vest/warden/navyblue restricted_roles = list("Warden") + +/datum/loadout_item/suit/job/security_jacket + name = "Security Jacket" + path = /obj/item/clothing/suit/toggle/jacket/sec + restricted_roles = list("Head of Security", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant") + restricted_desc = "All Security Personnel" + +/datum/loadout_item/suit/job/engi_jacket + name = "Engineering Jacket" + path = /obj/item/clothing/suit/toggle/jacket/engi + restricted_roles = list("Chief Engineer", "Station Engineer", "Atmospheric Technician") + restricted_desc = "All Engineering Personnel" + +/datum/loadout_item/suit/job/sci_jacket + name = "Science Jacket" + path = /obj/item/clothing/suit/toggle/jacket/sci + restricted_roles = list("Research Director", "Scientist", "Roboticist", "Geneticist") + restricted_desc = "All Science Personnel" + +/datum/loadout_item/suit/job/med_jacket + name = "Medbay Jacket" + path = /obj/item/clothing/suit/toggle/jacket/med + restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Chemist", "Virologist") + restricted_desc = "All Medical Personnel" + +/datum/loadout_item/suit/job/supply_jacket + name = "Supply Jacket" + path = /obj/item/clothing/suit/toggle/jacket/supply + restricted_roles = list("Quartermaster", "Cargo Technician", "Miner") + restricted_desc = "All Cargo Personnel" + +/datum/loadout_item/suit/job/supply_head_jacket + name = "Quartermaster's Jacket" + path = /obj/item/clothing/suit/toggle/jacket/supply/head + restricted_roles = list("Quartermaster") + restricted_desc = "Quartermaster Only" + +/datum/loadout_item/suit/job/labcoat_parared + name = "Red Paramedic Labcoat" + path = /obj/item/clothing/suit/toggle/labcoat/para_red + restricted_roles = list("Chief Medical Officer", "Paramedic") + restricted_desc = "Medical First Responders" + +/datum/loadout_item/suit/job/labcoat_highvis + name = "High-Vis Labcoat" + path = /obj/item/clothing/suit/toggle/labcoat/highvis + restricted_roles = list("Chief Medical Officer", "Paramedic", "Atmospheric Technician", "Detective") + restricted_desc = "First Responders and Detective" diff --git a/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm b/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm index 522b2d88a88..5e6ca021f0a 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm @@ -523,8 +523,8 @@ /datum/loadout_item/uniform/job/para_red name = "Red Paramedic Jumpsuit" path = /obj/item/clothing/under/utility/para_red - restricted_roles = list("Paramedic") - restricted_desc = "Paramedic" + restricted_roles = list("Chief Medical Officer", "Paramedic") + restricted_desc = "Medical First Responders" /*// Trekie things //TOS diff --git a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/other_port.dm b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/other_port.dm index 1054aa35f43..638379e84ba 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/other_port.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/other_port.dm @@ -127,6 +127,22 @@ icon_state = "bathrobe" body_parts_covered = CHEST|GROIN +/obj/item/clothing/suit/costume/samurai + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + name = "samurai armor" + desc = "A set of ancient-Japan Samurai armor. Despite being a cheap replica, it's still remarkably heavy." + icon_state = "samurai" + mutant_variants = NONE + +/obj/item/clothing/head/costume/kabuto + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/head.dmi' + name = "kabuto" + desc = "An ancient-Japan armored helmet - or a replica of one, at least." + icon_state = "kabuto" + mutant_variants = NONE + //Victorian Clothes /obj/item/clothing/under/costume/vic_vest icon = 'modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi' @@ -168,6 +184,37 @@ icon_state = "dutch" body_parts_covered = CHEST|GROIN|ARMS|LEGS +/obj/item/clothing/suit/costume/tailcoat + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + name = "victorian tailcoat" + desc = "A fancy tailcoat to make your suit seem even more lavish." + icon_state = "tailcoat" + mutant_variants = NONE + +/obj/item/clothing/suit/costume/vic_dresscoat + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + name = "victorian dresscoat" + desc = "An elaborate coat to go over an old-Earth Victorian Period dress. Much thinner fabric than you'd expected." + icon_state = "vickyblack" + mutant_variants = NONE + +/obj/item/clothing/suit/costume/vic_dresscoat/red + icon_state = "vickyred" + +/obj/item/clothing/head/costume/widehat + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/head.dmi' + name = "wide black hat" + desc = "A fancy old hat to match fancy old dresses." + icon_state = "widehat_black" + mutant_variants = NONE + +/obj/item/clothing/head/costume/widehat/red + name = "wide red hat" + icon_state = "widehat_red" + //Misc /obj/item/clothing/under/misc/greyshirt icon = 'modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi' diff --git a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/readme.md b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/readme.md index 808c4a77418..1b753df4d6d 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/readme.md +++ b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/readme.md @@ -12,6 +12,10 @@ It also ports: Several departmental/head-of-staff berets; All items are avaliable through either the Loadout, Vendors, or Both. + +PART 2! +Ports the rest of what I was given with the utility uniforms, namely the Suits that go with all the previously added outfits. Also tweaks some of the previously added items (i.e., making the gas/chemical haz-uniform actually acidproof) + ### TG Proc/File Changes: To show items in vendors: diff --git a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm new file mode 100644 index 00000000000..2cf4ab76721 --- /dev/null +++ b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm @@ -0,0 +1,110 @@ +//Bartender Winter coat, with the ability to hold shakers/beakers/rags in its suit storage slot +/obj/item/clothing/suit/hooded/wintercoat/bartender + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + name = "bartender's winter coat" + desc = "A heavy jacket made from wool originally stolen from the chef's goat. This new design is made to fit the classic suit-and-tie aesthetic, but without the hypothermia." + icon_state = "coatbar" + mutant_variants = NONE + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/food/drinks/flask, /obj/item/reagent_containers/glass/rag) + hoodtype = /obj/item/clothing/head/hooded/winterhood/bartender + +/obj/item/clothing/head/hooded/winterhood/bartender + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/head.dmi' + icon_state = "winterhood_bar" + +//Base Jacket - same stats as /obj/item/clothing/suit/jacket, just toggleable and serving as the base for all the departmental jackets and flannels +/obj/item/clothing/suit/toggle/jacket + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + name = "bomber jacket" + desc = "A warm bomber jacket, with synthetic-wool lining to keep you nice and warm in the depths of space. Aviators not included." + icon_state = "bomberalt" + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio) + body_parts_covered = CHEST|ARMS|GROIN + cold_protection = CHEST|ARMS|GROIN + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + mutant_variants = NONE + togglename = "zipper" + +//Job Jackets +/obj/item/clothing/suit/toggle/jacket/engi + name = "engineering jacket" + desc = "A comfortable jacket in engineering yellow." + icon_state = "engi_dep_jacket" + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 20, FIRE = 30, ACID = 45, WOUND = 0) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) + +/obj/item/clothing/suit/toggle/jacket/sci + name = "science jacket" + desc = "A comfortable jacket in science purple." + icon_state = "sci_dep_jacket" + armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, WOUND = 0) + +/obj/item/clothing/suit/toggle/jacket/med + name = "medbay jacket" + desc = "A comfortable jacket in medical blue." + icon_state = "med_dep_jacket" + armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 50, RAD = 0, FIRE = 0, ACID = 45, WOUND = 0) + +/obj/item/clothing/suit/toggle/jacket/supply + name = "cargo jacket" + desc = "A comfortable jacket in supply brown." + icon_state = "supply_dep_jacket" + +/obj/item/clothing/suit/toggle/jacket/supply/head + name = "quartermaster's jacket" + desc = "Even if people refuse to recognize you as a head, they can recognize you as a badass." + icon_state = "qmjacket" + +/obj/item/clothing/suit/toggle/jacket/sec + name = "security jacket" + desc = "A comfortable jacket in security blue. Probably against uniform regulations." + icon_state = "sec_dep_jacket" + armor = list(MELEE = 25, BULLET = 15, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 0, RAD = 0, FIRE = 0, ACID = 45, WOUND = 0) + +/obj/item/clothing/suit/toggle/jacket/sec/old //Oldsec (Red) + icon_state = "sec_dep_jacket_old" + +//Flannels +/obj/item/clothing/suit/toggle/jacket/flannel + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + name = "flannel jacket" + desc = "A cozy and warm plaid flannel jacket. Praised by Lumberjacks and Truckers alike." + icon_state = "flannel" + body_parts_covered = CHEST|ARMS //Being a bit shorter, flannels dont cover quite as much as the rest of the woolen jackets (- GROIN) + cold_protection = CHEST|ARMS + heat_protection = CHEST|ARMS //As a plus side, they're more insulating, protecting a bit from the heat as well + +/obj/item/clothing/suit/toggle/jacket/flannel/red + name = "red flannel jacket" + icon_state = "flannel_red" + +/obj/item/clothing/suit/toggle/jacket/flannel/aqua + name = "aqua flannel jacket" + icon_state = "flannel_aqua" + +/obj/item/clothing/suit/toggle/jacket/flannel/brown + name = "brown flannel jacket" + icon_state = "flannel_brown" + +//Labcoats +/obj/item/clothing/suit/toggle/labcoat/highvis + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + name = "high vis labcoat" + desc = "A high visibility vest for emergency responders, intended to draw attention away from the blood." + icon_state = "labcoat_highvis" + mutant_variants = NONE + +/obj/item/clothing/suit/toggle/labcoat/para_red + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + name = "red paramedic labcoat" + desc = "A red vest with reflective strips for First Responsers." + icon_state = "labcoat_pmedred" + mutant_variants = NONE + +//Costume-suits are located under other_port.dm, to keep them with their costume sets diff --git a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm index 033b2b7164f..64a69b1557e 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm @@ -38,6 +38,9 @@ icon_state = "util_sec" armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 30, ACID = 30, WOUND = 10) //Same stats as default security jumpsuit +/obj/item/clothing/under/utility/sec/old //Oldsec (Red) + icon_state = "util_sec_old" + /obj/item/clothing/under/utility/com name = "command utility uniform" desc = "A utility uniform worn by Station Command." @@ -57,15 +60,17 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 10, RAD = 0, FIRE = 0, ACID = 0) //Same stats as the paramedic uniform /obj/item/clothing/under/utility/haz_green - name = "gas hazard uniform" + name = "chemical hazard uniform" desc = "A hazard uniform with additional protection from gas and chemical hazards, at the cost of less fire- and radiation-proofing." icon_state = "hazard_green" can_adjust = TRUE armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, RAD = 0, FIRE = 20, ACID = 60) + resistance_flags = ACID_PROOF /obj/item/clothing/under/utility/haz_white - name = "hazard EMT uniform" + name = "chem-hazard EMT uniform" desc = "An EMT uniform used for first responders in situations involving gas and/or chemical hazards. The label reads, \"Not designed for prolonged exposure\"." icon_state = "hazard_white" can_adjust = TRUE armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, RAD = 0, FIRE = 10, ACID = 50) //Worse stats than the proper hazard uniform + resistance_flags = ACID_PROOF diff --git a/tgstation.dme b/tgstation.dme index 858b7ad80e3..912ab89f215 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3713,6 +3713,7 @@ #include "modular_skyrat\modules\customization\modules\clothing\under\skirts_dresses.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\sweaters.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\utility_port\other_port.dm" +#include "modular_skyrat\modules\customization\modules\clothing\under\utility_port\suits_port.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\utility_port\utility.dm" #include "modular_skyrat\modules\customization\modules\clothing\~donator\donator_clothing.dm" #include "modular_skyrat\modules\customization\modules\food_and_drinks\recipes\drinks_recipes.dm"