diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index 5d63182988d..a072a1a8742 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -7257,8 +7257,8 @@ req_access = list("syndicate") }, /obj/item/clothing/gloves/color/latex/nitrile/ntrauma, -/obj/item/clothing/suit/toggle/labcoat/para_red, -/obj/item/clothing/suit/toggle/labcoat/para_red, +/obj/item/clothing/suit/toggle/labcoat/interdyne, +/obj/item/clothing/suit/toggle/labcoat/interdyne, /obj/item/storage/belt/medbandolier{ pixel_x = -2; pixel_y = 2 @@ -8698,11 +8698,11 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/skyrat/interdynefob/service/diner) "MB" = ( -/obj/item/clothing/suit/toggle/labcoat/hospitalgown{ +/obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown{ pixel_y = 4; pixel_x = -3 }, -/obj/item/clothing/suit/toggle/labcoat/hospitalgown{ +/obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown{ pixel_x = -7 }, /obj/structure/table/glass, diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 8f8f0187d56..7c013b90b1b 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -431,7 +431,7 @@ new /obj/item/cautery(src) new /obj/item/bonesetter(src) new /obj/item/surgical_drapes(src) - new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src) //SKYRAT EDIT ADDITION + new /obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown(src) //SKYRAT EDIT ADDITION new /obj/item/clothing/mask/surgical(src) new /obj/item/razor(src) new /obj/item/blood_filter(src) @@ -455,7 +455,7 @@ new /obj/item/surgicaldrill(src) new /obj/item/cautery(src) new /obj/item/surgical_drapes(src) - new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src) //SKYRAT EDIT ADDITION + new /obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown(src) //SKYRAT EDIT ADDITION new /obj/item/clothing/mask/surgical(src) new /obj/item/blood_filter(src) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 1f55c9d75ef..d8a3a15db92 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -222,7 +222,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/muzzle, /obj/item/clothing/mask/surgical, - /obj/item/clothing/suit/toggle/labcoat/hospitalgown, //SKYRAT EDIT ADDITION - adds surgery gowns to belts + /obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown, //SKYRAT EDIT ADDITION - adds surgery gowns to belts /obj/item/construction/plumbing, /obj/item/dnainjector, /obj/item/extinguisher/mini, diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index abf75a7ea29..8d571d3a176 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -93,7 +93,7 @@ new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src) - new /obj/item/clothing/suit/toggle/labcoat/rd(src) //SKYRAT EDIT ADDITION + new /obj/item/clothing/suit/toggle/labcoat/skyrat/rd(src) //SKYRAT EDIT ADDITION new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src) new /obj/item/clothing/head/beret/science/rd(src) new /obj/item/clothing/neck/cloak/rd(src) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index ef2c3d2dda5..d603b7177e7 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -242,7 +242,7 @@ id = "hospital_gown" build_type = PROTOLATHE materials = list(/datum/material/plastic = 2500) - build_path = /obj/item/clothing/suit/toggle/labcoat/hospitalgown + build_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown category = list("Medical Designs") departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE //SKYRAT EDIT ADDITION END diff --git a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm index a516141fce9..2893a6bf1da 100644 --- a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm +++ b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm @@ -208,8 +208,5 @@ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON gets_cropped_on_taurs = FALSE -/obj/item/clothing/suit/toggle/labcoat/roboticist - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - /obj/item/clothing/under/changeling supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm b/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm new file mode 100644 index 00000000000..3675fd8cc25 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm @@ -0,0 +1,47 @@ +/obj/item/clothing/suit/toggle/labcoat + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/suits/labcoat_digi.dmi' + +/obj/item/clothing/suit/toggle/labcoat/skyrat + name = "SR LABCOAT SUIT DEBUG" + desc = "REPORT THIS IF FOUND" + icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/labcoat.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/labcoat.dmi' + icon_state = null //Keeps this from showing up under the chameleon hat + +/obj/item/clothing/suit/toggle/labcoat/skyrat/rd + name = "research directors labcoat" + desc = "A Nanotrasen standard labcoat for certified Research Directors. It has an extra plastic-latex lining on the outside for more protection from chemical and viral hazards." + icon_state = "labcoat_rd" + body_parts_covered = CHEST|ARMS|LEGS + armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 80, FIRE = 80, ACID = 70) + +/obj/item/clothing/suit/toggle/labcoat/skyrat/highvis + name = "high vis labcoat" + desc = "A high visibility vest for emergency responders, intended to draw attention away from the blood." + icon_state = "labcoat_highvis" + blood_overlay_type = "armor" + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/suit/toggle/labcoat/skyrat/highvis/worn_overlays(mutable_appearance/standing, isinhands, icon_file) + . = ..() + if(!isinhands) + . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) + +/obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown //Intended to keep patients modest while still allowing for surgeries + name = "hospital gown" + desc = "A complicated drapery with an assortment of velcros and strings, designed to keep a patient modest during medical stay and surgeries." + icon_state = "hgown" + toggle_noun = "drapes" + body_parts_covered = NONE //Allows surgeries despite wearing it; hiding genitals is handled in /datum/sprite_accessory/genital/is_hidden() (Only place it'd work sadly) + armor = NONE + equip_delay_other = 8 + +/obj/item/clothing/suit/toggle/labcoat/roboticist //Overwrite the TG Roboticist labcoat to Black and Red (not the Interdyne labcoat though) + icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/labcoat.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/labcoat.dmi' + icon_state = "labcoat_robo_sr" + +/obj/item/clothing/suit/toggle/labcoat/medical //Renamed version of the Genetics labcoat for more generic medical purposes; just a subtype of /labcoat/ for the TG files + name = "medical labcoat" + desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." + icon_state = "labcoat_gen" diff --git a/modular_skyrat/master_files/icons/mob/clothing/suits/labcoat.dmi b/modular_skyrat/master_files/icons/mob/clothing/suits/labcoat.dmi new file mode 100644 index 00000000000..ecf0f2de15c Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/suits/labcoat.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/suits/labcoat_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/suits/labcoat_digi.dmi new file mode 100644 index 00000000000..8265b26b371 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/suits/labcoat_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/suits/labcoat.dmi b/modular_skyrat/master_files/icons/obj/clothing/suits/labcoat.dmi new file mode 100644 index 00000000000..67c42b7597f Binary files /dev/null and b/modular_skyrat/master_files/icons/obj/clothing/suits/labcoat.dmi differ diff --git a/modular_skyrat/modules/aesthetics/clothing/clothing.dm b/modular_skyrat/modules/aesthetics/clothing/clothing.dm index 4b4793867b3..81534d661bd 100644 --- a/modular_skyrat/modules/aesthetics/clothing/clothing.dm +++ b/modular_skyrat/modules/aesthetics/clothing/clothing.dm @@ -5,22 +5,9 @@ desc = "A suit that protects against biological contamination. This is a slightly outdated model from Nanotrasen Securities, using their red color-scheme and even outdated labelling. Hopefully it's still up to spec..." //To recolor this would be hellish and honestly non-sensical. So, Nanotrasen Securities' bio-suit. Plus, flavor! -/obj/item/clothing/suit/toggle/labcoat/rd - name = "research directors labcoat" - desc = "A Nanotrasen standard labcoat for Research Directors. It has extra layers for more protection." - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' - icon_state = "labcoat_rd" - body_parts_covered = CHEST|ARMS|LEGS - armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 80, FIRE = 80, ACID = 70) - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -//Th suit icon file and the head icon file in this module have unused Biosuits, may be worth re-implementing at least the yellow one (lol meth-making suit) - /* * HEAD */ - /obj/item/clothing/head/bio_hood/security desc = "A hood that protects the head and face from biological contaminants. This is a slightly outdated model from Nanotrasen Securities - you can hardly see through the foggy visor's ageing red. Hopefully it's still up to spec..." //To recolor this would be hellish and honestly non-sensical. So, Nanotrasen Securities' bio-suit. Plus, flavor! diff --git a/modular_skyrat/modules/cellguns/code/medigun_cells.dm b/modular_skyrat/modules/cellguns/code/medigun_cells.dm index 6b51bcd7f3a..358d13e7201 100644 --- a/modular_skyrat/modules/cellguns/code/medigun_cells.dm +++ b/modular_skyrat/modules/cellguns/code/medigun_cells.dm @@ -413,7 +413,7 @@ return var/mob/living/carbon/wearer = target - var/obj/item/clothing/gown = new /obj/item/clothing/suit/toggle/labcoat/hospitalgown/hardlight + var/obj/item/clothing/gown = new /obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown/hardlight if(wearer.equip_to_slot_if_possible(gown, ITEM_SLOT_OCLOTHING, 1, 1, 1)) wearer.visible_message(span_notice("The [gown] covers [wearer] body"), span_notice("The [gown] wraps around your body, covering you")) @@ -497,12 +497,12 @@ sparks.start() //Objects Used by medicells. -/obj/item/clothing/suit/toggle/labcoat/hospitalgown/hardlight +/obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown/hardlight name = "hardlight hospital gown" - desc = "A hospital Gown made out of hardlight, you can barely feel it on your body" + desc = "A hospital gown made out of hardlight - you can barely feel it on your body, especially with all the anesthetics." icon_state = "lgown" -/obj/item/clothing/suit/toggle/labcoat/hospitalgown/hardlight/dropped(mob/user) +/obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown/hardlight/dropped(mob/user) . = ..() var/mob/living/carbon/wearer = user diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm b/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm index bcd31c10d48..dc0a2255d2f 100644 --- a/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm +++ b/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm @@ -8,24 +8,6 @@ body_parts_covered = CHEST|GROIN supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/toggle/labcoat/hospitalgown - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' - name = "hospital gown" - desc = "A complicated drapery with an assortment of velcros and strings, designed to keep a patient modest during medical stay and surgeries." - icon_state = "hgown" - toggle_noun = "drapes" - body_parts_covered = NONE - armor = NONE - equip_delay_other = 8 - -/obj/item/clothing/suit/toggle/labcoat/medical - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' - name = "medical labcoat" - desc = "A modest labcoat with medical coloring, meant to distinguish personnel in the line of duty." - icon_state = "labcoat_gen" - /obj/item/clothing/suit/dutchjacketsr name = "western jacket" desc = "Botanists screaming of mangos have been rumored to wear this." 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 index 964288c743e..2fa859cf082 100644 --- 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 @@ -104,28 +104,3 @@ /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/master_files/icons/obj/clothing/suits.dmi' - worn_icon = 'modular_skyrat/master_files/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" - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/obj/item/clothing/suit/toggle/labcoat/para_red - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' - name = "red paramedic labcoat" - desc = "A red vest with reflective strips for First Responsers." - icon_state = "labcoat_pmedred" - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/obj/item/clothing/suit/toggle/labcoat/para_red/Initialize(mapload) - . = ..() - allowed += list( - /obj/item/storage/medkit, - ) - -//Costume-suits are located under other_port.dm, to keep them with their costume sets diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index 4cb381d736b..c011bb83461 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -715,7 +715,7 @@ worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi' icon_state = "plasmaman_jax" -/obj/item/clothing/suit/toggle/labcoat/rd/jax +/obj/item/clothing/suit/toggle/labcoat/skyrat/rd/jax name = "xuracorp enameled labcoat" desc = "A XuraCorp designed labcoat for Research Directors. Small triangular indents suggest a protective interior." icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi' @@ -1104,15 +1104,16 @@ icon_state = "rosepatch" // Donation reward for Cimika -/obj/item/clothing/suit/toggle/labcoat/tenrai +/obj/item/clothing/suit/toggle/labcoat/skyrat/tenrai name = "Tenrai labcoat" desc = "A labcoat crafted from a variety of pristine materials, sewn together with a frightening amount of skill. The fabric is aery, smooth as silk, and exceptionally pleasant to the touch. The golden stripes are visible in the dark, working as a beacon to the injured. A small label on the inside of it reads \"Tenrai Kitsunes Supremacy\"." base_icon_state = "tenraicoat" icon_state = "tenraicoat" icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi' worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/suit.dmi' + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/toggle/labcoat/tenrai/worn_overlays(mutable_appearance/standing, isinhands, icon_file) +/obj/item/clothing/suit/toggle/labcoat/skyrat/tenrai/worn_overlays(mutable_appearance/standing, isinhands, icon_file) . = ..() if(!isinhands) . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm index d44419d8a44..ff6d09de807 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm @@ -17,6 +17,8 @@ if(GENITAL_HIDDEN_BY_CLOTHES) if((H.w_uniform && H.w_uniform.body_parts_covered & genital_location) || (H.wear_suit && H.wear_suit.body_parts_covered & genital_location)) return TRUE + if(istype(H.wear_suit, /obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown)) //Until this file has a way to force-hide from items, this'll have to do + return TRUE else if (H.underwear != "Nude" && !(H.underwear_visibility & UNDERWEAR_HIDE_UNDIES) && genital_location == CHEST) //They're wearing not-hidden underwear, let's make sure it doesn't cover the chest (i.e. Bikinis/one-pieces) var/datum/sprite_accessory/underwear/possible_chest_covering_underwear = GLOB.underwear_list[H.underwear] if(possible_chest_covering_underwear?.covers_chest == TRUE) //covers_chest is a var added in `modular_skyrat\modules\customization\modules\mob\dead\new_player\sprite_accessories.dm` diff --git a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index 5e94a848047..e9ab3eb4418 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -120,7 +120,7 @@ /datum/loadout_item/suit/cjax name = "XuraCorp Labcoat" - item_path = /obj/item/clothing/suit/toggle/labcoat/rd/jax + item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/rd/jax ckeywhitelist = list("candlejax") /datum/loadout_item/suit/jacket/cherno @@ -380,7 +380,7 @@ /datum/loadout_item/suit/tenrai_coat name = "Tenrai Coat" - item_path = /obj/item/clothing/suit/toggle/labcoat/tenrai + item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/tenrai ckeywhitelist = list("cimika") /datum/loadout_item/neck/fluffycloak diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm index 4b98b3076fe..d8c04215c31 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -595,14 +595,9 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su restricted_roles = list(JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_CUSTOMS_AGENT) // LABCOATS -/datum/loadout_item/suit/labcoat_parared - name = "Red Paramedic Labcoat" - item_path = /obj/item/clothing/suit/toggle/labcoat/para_red - restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER, JOB_PARAMEDIC, JOB_SECURITY_MEDIC) // its a medic jacket anyway screw you - /datum/loadout_item/suit/labcoat_highvis name = "High-Vis Labcoat" - item_path = /obj/item/clothing/suit/toggle/labcoat/highvis + item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/highvis restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER, JOB_PARAMEDIC, JOB_ATMOSPHERIC_TECHNICIAN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CHEMIST, JOB_ORDERLY) // And now chemist and orderly get it too. /* diff --git a/modular_skyrat/modules/mapping/voidraptor/code/clothing.dm b/modular_skyrat/modules/mapping/voidraptor/code/clothing.dm index 294a07bfdd1..7da15c90bbf 100644 --- a/modular_skyrat/modules/mapping/voidraptor/code/clothing.dm +++ b/modular_skyrat/modules/mapping/voidraptor/code/clothing.dm @@ -11,7 +11,7 @@ new /obj/item/cautery(src) new /obj/item/bonesetter(src) new /obj/item/surgical_drapes(src) - new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src) + new /obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown(src) new /obj/item/clothing/mask/surgical(src) new /obj/item/razor(src) new /obj/item/blood_filter(src) diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm index ddad9a8e08a..5c0b78b20aa 100644 --- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm +++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm @@ -2,7 +2,7 @@ skyrat_products = list( /obj/item/radio/headset/headset_med = 3, /obj/item/clothing/gloves/color/latex/nitrile = 2, - /obj/item/clothing/suit/toggle/labcoat/hospitalgown = 5, + /obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown = 5, /obj/item/storage/belt/medbandolier = 2, /obj/item/clothing/under/rank/engineering/engineer/skyrat/hazard_chem/emt = 2, /obj/item/clothing/under/rank/medical/scrubs/skyrat/red = 4, @@ -123,7 +123,7 @@ /obj/item/clothing/suit/toggle/deckard = 2, /obj/item/clothing/suit/armor/vest/det_suit/runner = 2, /obj/item/clothing/under/rank/security/detective/runner = 2, - /obj/item/clothing/suit/toggle/labcoat/highvis = 2, + /obj/item/clothing/suit/toggle/labcoat/skyrat/highvis = 2, /obj/item/clothing/under/rank/security/detective/cowboy = 2, /obj/item/clothing/suit/jacket/det_suit/cowboyvest = 2, ) @@ -217,7 +217,7 @@ skyrat_products = list( /obj/item/radio/headset/headset_med = 0, /obj/item/clothing/gloves/color/latex/nitrile = 2, - /obj/item/clothing/suit/toggle/labcoat/hospitalgown = 5, + /obj/item/clothing/suit/toggle/labcoat/skyrat/hospitalgown = 5, /obj/item/storage/belt/medbandolier = 2, /obj/item/clothing/under/rank/engineering/engineer/skyrat/hazard_chem/emt = 2, /obj/item/clothing/under/rank/medical/scrubs/skyrat/red = 4, diff --git a/modular_skyrat/modules/roboclothes/code/robotics_clothing.dm b/modular_skyrat/modules/roboclothes/code/robotics_clothing.dm index ef52aec06b4..89e0b7a7427 100644 --- a/modular_skyrat/modules/roboclothes/code/robotics_clothing.dm +++ b/modular_skyrat/modules/roboclothes/code/robotics_clothing.dm @@ -1,8 +1,3 @@ -/obj/item/clothing/suit/toggle/labcoat/roboticist - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' - icon_state = "labcoat_robo_sr" - /obj/item/storage/backpack/science/robo name = "robotics backpack" desc = "A sleek, industrial-strength backpack issued to robotics personnel. Smells faintly of oil." diff --git a/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm b/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm index ab45b1d56ca..a47d5d674dc 100644 --- a/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm +++ b/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm @@ -1,15 +1,21 @@ -/obj/item/clothing/suit/toggle/labcoat/security_medic +/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic name = "security medic labcoat" - icon_state = "secmed_labcoat" - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' + icon_state = "secmed_labcoat" //Icon located in modular_skyrat/master_files/icons/(obj or mob)/clothing/suits/labcoat.dmi + blood_overlay_type = "armor" supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50, WOUND = 10) - allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/baton/telescopic, /obj/item/soap, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun, /obj/item/storage/medkit) -/obj/item/clothing/suit/toggle/labcoat/security_medic/blue +/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/Initialize(mapload) + . = ..() + allowed += list( + /obj/item/flashlight, + /obj/item/gun, + /obj/item/melee/baton/telescopic, + /obj/item/storage/medkit + ) + +/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue icon_state = "secmed_labcoat_blue" - worn_icon_state = "secmed_labcoat_blue" /obj/item/clothing/suit/hazardvest/security_medic name = "security medic vest" diff --git a/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm b/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm index dbec2f40404..35aab0e6970 100644 --- a/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm +++ b/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm @@ -100,9 +100,9 @@ /obj/structure/closet/secure_closet/security_medic/PopulateContents() ..() - new /obj/item/clothing/suit/toggle/labcoat/security_medic(src) + new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic(src) new /obj/item/clothing/suit/hazardvest/security_medic(src) - new /obj/item/clothing/suit/toggle/labcoat/security_medic/blue(src) + new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue(src) new /obj/item/clothing/suit/hazardvest/security_medic/blue(src) new /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic(src) new /obj/item/clothing/under/rank/security/peacekeeper/tactical(src) diff --git a/tgstation.dme b/tgstation.dme index 8be0be575ad..b3949e23ff2 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5043,6 +5043,7 @@ #include "modular_skyrat\master_files\code\modules\clothing\shoes\sneakers.dm" #include "modular_skyrat\master_files\code\modules\clothing\shoes\wheelys.dm" #include "modular_skyrat\master_files\code\modules\clothing\suits\_suits.dm" +#include "modular_skyrat\master_files\code\modules\clothing\suits\labcoat.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\_under.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\color.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\costume.dm"