diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm index 258a7a05f49fe..bec4bf2d35001 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm @@ -499,7 +499,7 @@ /obj/structure/rack, /obj/machinery/light/small/broken/directional/east, /obj/item/pickaxe, -/obj/item/clothing/head/utility/hardhat/weldhat/orange, +/obj/item/clothing/head/utility/hardhat/welding/orange, /turf/open/floor/iron/smooth{ initial_gas_mix = "ICEMOON_ATMOS" }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 869b2fcb226a2..4272c40ee0937 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -756,7 +756,7 @@ "fj" = ( /obj/structure/table/glass, /obj/structure/reagent_dispensers/wall/virusfood/directional/north, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/structure/disposalpipe/segment, diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 1ae164b47802f..f8ef39efa428b 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -3815,7 +3815,7 @@ /area/space/nearstation) "Ds" = ( /obj/structure/closet/crate/bin, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /turf/open/floor/iron/dark, /area/ruin/space/ks13/medical/morgue) "Du" = ( diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm index d11bcc3217129..c116cc1dc2839 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm @@ -183,7 +183,7 @@ /area/ruin/space/has_grav/powered/hilbertresearchfacility) "ex" = ( /obj/structure/table/reinforced/rglass, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/glasses/science, /turf/open/floor/mineral/titanium/tiled/blue, /area/ruin/space/has_grav/powered/hilbertresearchfacility) @@ -2098,7 +2098,7 @@ dir = 4 }, /obj/item/clothing/suit/toggle/labcoat, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/hilbertresearchfacility) diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm index f6d3c45fcd294..9fd1af234dd3d 100644 --- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm +++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm @@ -450,7 +450,7 @@ /area/ruin/space/has_grav/powered/cat_man) "bu" = ( /obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/surgical_drapes, /turf/open/floor/iron/white/side{ dir = 8 diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 48eda5d8e1a93..5771d3f543f0c 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -1192,7 +1192,7 @@ /obj/item/t_scanner, /obj/item/screwdriver/power, /obj/item/storage/belt/utility, -/obj/item/clothing/head/utility/hardhat/weldhat, +/obj/item/clothing/head/utility/hardhat/welding, /turf/open/floor/plating, /area/ruin/space/ancientstation/beta/supermatter) "ec" = ( diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 7e0576d5c2c30..3f2db0a1f6eff 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -2651,7 +2651,7 @@ /area/awaymission/moonoutpost19/research) "gV" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/clothing/suit/apron/surgical, /obj/structure/alien/weeds, @@ -2789,7 +2789,7 @@ /area/awaymission/moonoutpost19/research) "hn" = ( /obj/structure/closet/crate/bin, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/trash/chips, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/broken/directional/north, @@ -2820,7 +2820,7 @@ req_access = list("away_maintenance") }, /obj/item/storage/backpack/satchel/science, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /turf/open/floor/iron/cafeteria{ dir = 5 }, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index f6cded1d874f9..e5c1c78f344a9 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -3602,7 +3602,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "iL" = ( /obj/machinery/light/small/directional/north, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/structure/closet/emcloset, /turf/open/floor/iron{ heat_capacity = 1e+006 @@ -4256,7 +4256,7 @@ /area/awaymission/undergroundoutpost45/central) "kd" = ( /obj/item/storage/backpack/satchel/science, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/suit/toggle/labcoat/science, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet{ diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index b8f422a834ce6..b02a2f16130b7 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -4603,7 +4603,7 @@ "bdC" = ( /obj/structure/table, /obj/item/storage/box/bodybags, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/effect/turf_decal/trimline/neutral/warning{ dir = 1 }, @@ -11810,8 +11810,8 @@ /obj/item/defibrillator/loaded, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, /obj/item/storage/belt/medical{ pixel_y = 3 }, @@ -14056,7 +14056,7 @@ /area/station/science/explab) "dpI" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/gas, /obj/item/clothing/glasses/science, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -14340,7 +14340,7 @@ /obj/item/storage/backpack/duffelbag/med/surgery, /obj/structure/window/reinforced/spawner/west, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/suit/apron/surgical, /turf/open/floor/iron/dark, /area/station/medical/surgery/theatre) @@ -14573,7 +14573,7 @@ pixel_x = 2; pixel_y = 4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/healthanalyzer, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -29554,8 +29554,8 @@ "hfa" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science{ pixel_y = 3 }, @@ -46737,7 +46737,7 @@ /area/station/maintenance/department/science) "lon" = ( /obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/surgical_drapes, /obj/item/clothing/suit/apron/surgical, /obj/structure/window/reinforced{ @@ -57117,7 +57117,7 @@ }, /obj/structure/table/reinforced/rglass, /obj/item/storage/bag/bio, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -64700,7 +64700,7 @@ dir = 9 }, /obj/machinery/light/small/directional/west, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/neck/stethoscope, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -65775,8 +65775,8 @@ /obj/item/defibrillator/loaded, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, /obj/item/storage/belt/medical{ pixel_y = 3 }, @@ -65805,7 +65805,7 @@ /area/station/hallway/primary/central/aft) "qaq" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/restraints/handcuffs, /obj/item/clothing/mask/muzzle, /obj/effect/turf_decal/tile/red{ @@ -72421,7 +72421,7 @@ /obj/item/healthanalyzer{ pixel_y = 3 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/hud/health, /turf/open/floor/iron, @@ -77441,7 +77441,7 @@ /area/station/science/xenobiology) "sTG" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science, /obj/structure/sign/poster/official/science{ pixel_x = -32 @@ -79292,7 +79292,7 @@ /obj/structure/table/glass, /obj/item/storage/backpack/duffelbag/med/surgery, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/suit/apron/surgical, /turf/open/floor/iron/dark, /area/station/medical/surgery/theatre) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 17fdd2c876f33..003b571b1005e 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -6461,8 +6461,8 @@ /obj/item/defibrillator/loaded{ pixel_y = 3 }, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, /turf/open/floor/iron/dark, /area/station/medical/storage) "bVv" = ( @@ -24653,7 +24653,7 @@ /area/station/commons/lounge) "hzz" = ( /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/science, @@ -39492,7 +39492,7 @@ dir = 1; pixel_y = 2 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/storage/backpack/duffelbag/med/surgery, /obj/effect/turf_decal/tile/neutral/full, @@ -41353,8 +41353,8 @@ /obj/item/defibrillator/loaded{ pixel_y = 3 }, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, /turf/open/floor/iron/dark, /area/station/medical/storage) "mMM" = ( @@ -41615,7 +41615,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/cmo) "mQE" = ( -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, @@ -70629,7 +70629,7 @@ /area/station/science/xenobiology) "vPE" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/surgical_drapes, /obj/item/razor, /obj/machinery/airalarm/directional/north, @@ -71780,7 +71780,7 @@ dir = 1 }, /obj/structure/rack, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /turf/open/floor/plating, /area/station/security/prison/safe) "whb" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index d2a25441862bd..c7d6d038f9f1d 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -20251,7 +20251,7 @@ /area/station/security/office) "fPQ" = ( /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/healthanalyzer, /obj/item/reagent_containers/spray/cleaner{ pixel_x = -3; @@ -23239,7 +23239,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/storage/backpack/duffelbag/sec/surgery{ pixel_y = 5 }, @@ -25047,7 +25047,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/clothing/suit/apron/surgical, /obj/item/clipboard{ @@ -27533,7 +27533,7 @@ name = "medical locker" }, /obj/structure/grille/broken, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /turf/open/floor/plating, /area/station/maintenance/port/greater) @@ -30961,8 +30961,8 @@ /area/station/cargo/storage) "iIF" = ( /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science{ pixel_x = 4; pixel_y = 4 @@ -39644,8 +39644,8 @@ /area/station/medical/pharmacy) "lko" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, /obj/item/storage/box/disks{ pixel_y = 5 }, @@ -41256,7 +41256,7 @@ /area/station/service/chapel) "lHy" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/paper/guides/jobs/medical/morgue, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -44171,8 +44171,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, /obj/item/storage/box/monkeycubes{ pixel_x = 2; pixel_y = 5 @@ -46384,7 +46384,7 @@ "nij" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/mask/surgical, /obj/item/mmi, @@ -49170,7 +49170,7 @@ /area/station/commons/locker) "obU" = ( /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, @@ -61370,7 +61370,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/clothing/suit/apron/surgical, /obj/machinery/firealarm/directional/east, @@ -77362,7 +77362,7 @@ dir = 1 }, /obj/structure/noticeboard/directional/west, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/hemostat, /turf/open/floor/iron/dark, /area/station/maintenance/fore) diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index 03c58b5c4b09c..54e668bd12b5f 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_maps/map_files/LimaStation/LimaStation.dmm @@ -398,7 +398,7 @@ c_tag = "Science - Robotics Surgical Lab"; network = list("ss13","rd") }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/razor{ pixel_x = -6 }, @@ -7761,7 +7761,7 @@ /area/station/medical/treatment_center) "dgU" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/mask/surgical, /obj/item/razor, @@ -29450,7 +29450,7 @@ dir = 5 }, /obj/structure/closet/l3closet, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /turf/open/floor/iron/white, /area/station/medical/virology) "loi" = ( @@ -34353,7 +34353,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/structure/table/glass, /obj/item/clothing/mask/surgical, /obj/item/reagent_containers/spray/cleaner, @@ -38278,8 +38278,8 @@ pixel_y = 2 }, /obj/item/clothing/glasses/hud/health, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex/nitrile, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 }, @@ -42419,8 +42419,8 @@ /obj/item/storage/box/syringes{ pixel_y = 5 }, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, /turf/open/floor/iron/dark, @@ -42777,8 +42777,8 @@ pixel_y = 2 }, /obj/item/clothing/glasses/hud/health, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex/nitrile, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -55124,7 +55124,7 @@ dir = 6 }, /obj/structure/closet/l3closet, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /turf/open/floor/iron/white, /area/station/medical/virology) "uJB" = ( @@ -56338,8 +56338,8 @@ pixel_x = 2; pixel_y = 2 }, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron/showroomfloor, /area/station/science/genetics) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 19a7d398eed31..10c7a591f4373 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -970,7 +970,7 @@ /area/station/security/brig) "atf" = ( /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/surgical_drapes, /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/power/apc/auto_name/directional/north, @@ -13815,7 +13815,7 @@ /area/station/commons/storage/art) "feV" = ( /obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -14102,7 +14102,7 @@ /area/station/medical/medbay/central) "fiK" = ( /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/surgical_drapes, /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -29574,7 +29574,7 @@ pixel_y = 3 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/clothing/gloves/color/latex{ +/obj/item/clothing/gloves/latex{ pixel_x = 4; pixel_y = 9 }, @@ -42522,8 +42522,8 @@ "pfK" = ( /obj/machinery/light/directional/north, /obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/reagent_containers/spray/cleaner{ @@ -54320,7 +54320,7 @@ /area/station/medical/psychology) "tgD" = ( /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/science, @@ -60332,7 +60332,7 @@ /area/station/hallway/secondary/exit/departure_lounge) "vkO" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/reagent_containers/spray/cleaner, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -60555,10 +60555,10 @@ "vok" = ( /obj/structure/table/reinforced, /obj/machinery/light/directional/north, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, /obj/item/wrench/medical, /turf/open/floor/iron/dark, /area/station/medical/storage) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 06c41caaad848..40363928a291a 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -21283,7 +21283,7 @@ /area/station/commons/storage/primary) "huq" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex{ +/obj/item/clothing/gloves/latex{ pixel_x = 129; pixel_y = 71 }, @@ -30643,7 +30643,7 @@ /area/station/engineering/supermatter/room) "lPs" = ( /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/surgical_drapes, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -36006,7 +36006,7 @@ /obj/item/storage/box/monkeycubes{ layer = 3.1 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/stack/sheet/mineral/plasma{ amount = 2 }, @@ -40901,7 +40901,7 @@ /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) "qDG" = ( -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/surgical_drapes, /obj/structure/window/reinforced{ dir = 1 @@ -43612,7 +43612,7 @@ /area/station/security/office) "rQb" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -45753,7 +45753,7 @@ /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "sUa" = ( -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, @@ -46669,7 +46669,7 @@ /obj/item/reagent_containers/dropper{ pixel_y = 8 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science, /turf/open/floor/iron, /area/station/science/xenobiology) @@ -55119,7 +55119,7 @@ /area/station/service/library) "xfB" = ( /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/surgical_drapes, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -56926,8 +56926,8 @@ /area/station/cargo/storage) "xWs" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 9f8340082b2fe..57f4dcc7748ab 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -5409,7 +5409,7 @@ /obj/item/hemostat{ pixel_x = -4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/blue{ diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsleft_attachment_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsleft_attachment_2.dmm index 5255ec36954d0..99bf105a4ae83 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsleft_attachment_2.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsleft_attachment_2.dmm @@ -4,7 +4,7 @@ /area/station/maintenance/port/aft) "c" = ( /obj/effect/turf_decal/sand/plating, -/obj/item/clothing/head/utility/hardhat/weldhat/orange, +/obj/item/clothing/head/utility/hardhat/welding/orange, /turf/open/floor/plating, /area/station/maintenance/port/aft) "f" = ( diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_uppermedsci_attachment_a_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_uppermedsci_attachment_a_1.dmm index 69462f5e3fa8d..df0942d76e68c 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_uppermedsci_attachment_a_1.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_uppermedsci_attachment_a_1.dmm @@ -7,7 +7,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, /obj/item/storage/box/bodybags, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/effect/spawner/random/medical/surgery_tool, /turf/open/floor/iron/smooth, /area/station/maintenance/department/medical) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index fcd21c2c290a6..efcd150f4bfe6 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -7226,8 +7226,8 @@ dir = 10 }, /obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/reagent_containers/spray/cleaner{ @@ -18315,7 +18315,7 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/machinery/camera/directional/north{ c_tag = "Medical - Morgue"; @@ -47886,7 +47886,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/healthanalyzer, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/hud/health, @@ -51047,7 +51047,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science, /turf/open/floor/iron/white, /area/station/science/lobby) @@ -59259,8 +59259,8 @@ /area/station/science/ordnance) "voA" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/item/storage/belt/medical, diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm index fabf3b1f04b1f..2af2f613e9f78 100644 --- a/_maps/shuttles/emergency_casino.dmm +++ b/_maps/shuttles/emergency_casino.dmm @@ -761,7 +761,7 @@ /obj/item/hemostat{ pixel_x = -4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/surgicaldrill, /obj/item/cautery, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 1145e32777368..f92959b8ca096 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -798,7 +798,7 @@ dir = 4 }, /obj/item/clothing/suit/apron/surgical, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/surgical_drapes, /obj/item/razor, diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index 3ddb2439d686e..1f882289e1b22 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -167,7 +167,7 @@ /obj/item/hemostat{ pixel_x = -4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/blue{ diff --git a/_maps/shuttles/emergency_lima.dmm b/_maps/shuttles/emergency_lima.dmm index 2ffb3ee6773b3..9a4ce5d1169e7 100644 --- a/_maps/shuttles/emergency_lima.dmm +++ b/_maps/shuttles/emergency_lima.dmm @@ -746,7 +746,7 @@ /area/shuttle/escape) "VZ" = ( /obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/healthanalyzer, /turf/open/floor/mineral/titanium/white, diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 8f03cebb398e5..0f05c000f8784 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -692,7 +692,7 @@ /obj/item/hemostat{ pixel_x = -4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/surgicaldrill, /obj/item/cautery, diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index 60fc6978fdeff..1a65f3d201fa6 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -305,7 +305,7 @@ /obj/item/hemostat{ pixel_x = -4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/structure/table/reinforced, /obj/item/surgicaldrill, diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index 6de48977e50a5..93cb58c35e479 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -531,7 +531,7 @@ /obj/item/hemostat{ pixel_x = -4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/radio/intercom/directional/west, /obj/item/surgicaldrill, diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm index a08b1d382a15c..b42b429b69421 100644 --- a/_maps/shuttles/emergency_omega.dmm +++ b/_maps/shuttles/emergency_omega.dmm @@ -452,7 +452,7 @@ /obj/item/hemostat{ pixel_x = -4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet/directional/west, diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 1b792b6c9af11..70dbdcf980db1 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -349,7 +349,7 @@ /obj/item/hemostat{ pixel_x = -4 }, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/structure/table/reinforced, /obj/item/surgicaldrill, diff --git a/_maps/shuttles/emergency_shadow.dmm b/_maps/shuttles/emergency_shadow.dmm index a26b02dec42f4..edd175f05e30a 100644 --- a/_maps/shuttles/emergency_shadow.dmm +++ b/_maps/shuttles/emergency_shadow.dmm @@ -922,7 +922,7 @@ /obj/machinery/light/directional/north, /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/mask/surgical, -/obj/item/clothing/gloves/color/latex/nitrile{ +/obj/item/clothing/gloves/latex/nitrile{ pixel_y = 4 }, /turf/open/floor/iron/dark, diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm index 95ad4502d6e7a..3c5c3d8d2f946 100644 --- a/_maps/shuttles/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator_advanced.dmm @@ -922,7 +922,7 @@ pixel_y = 4 }, /obj/item/book/manual/wiki/surgery, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/clothing/suit/apron/surgical, /obj/structure/table/reinforced, diff --git a/_maps/shuttles/ruin_cyborg_mothership.dmm b/_maps/shuttles/ruin_cyborg_mothership.dmm index 2c0304a424aa8..2b385aa35e5fa 100644 --- a/_maps/shuttles/ruin_cyborg_mothership.dmm +++ b/_maps/shuttles/ruin_cyborg_mothership.dmm @@ -790,7 +790,7 @@ "PP" = ( /obj/structure/table, /obj/effect/turf_decal/bot, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/razor, /obj/structure/mirror/directional/west, diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 172d6fcbce484..4120bd9ef8edd 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -1478,7 +1478,7 @@ /area/shuttle/abandoned/medbay) "di" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/clothing/suit/apron/surgical, /obj/effect/decal/cleanable/dirt/dust, diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index b823e7755e0b7..c4c3dc7110410 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -960,7 +960,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science, /turf/open/floor/iron/dark, /area/shuttle/abandoned) diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index 02fb9aae6f746..a834b0f1e911d 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -927,7 +927,7 @@ /area/shuttle/sbc_starfury) "ds" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/clothing/suit/apron/surgical, /obj/machinery/airalarm/directional/north{ diff --git a/_maps/templates/holodeck_medicalsim.dmm b/_maps/templates/holodeck_medicalsim.dmm index 8a82cfbed69b4..689dbd8f6f788 100644 --- a/_maps/templates/holodeck_medicalsim.dmm +++ b/_maps/templates/holodeck_medicalsim.dmm @@ -16,7 +16,7 @@ /area/template_noop) "aL" = ( /obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/mask/surgical, /obj/structure/window{ diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm index 95f212174b109..1a7c0d5c01860 100644 --- a/_maps/templates/lazy_templates/nukie_base.dmm +++ b/_maps/templates/lazy_templates/nukie_base.dmm @@ -2016,7 +2016,7 @@ }, /obj/structure/table/glass/plasmaglass, /obj/structure/reagent_dispensers/wall/virusfood/directional/north, -/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/latex, /obj/item/healthanalyzer{ pixel_y = 3 }, diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 5354689d30782..c9e0141acf536 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -60,12 +60,12 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_MIME = /obj/item/clothing/gloves/color/white, DYE_CLOWN = /obj/item/clothing/gloves/color/rainbow, DYE_QM = /obj/item/clothing/gloves/color/brown, - DYE_CAPTAIN = /obj/item/clothing/gloves/color/captain, + DYE_CAPTAIN = /obj/item/clothing/gloves/captain, DYE_HOP = /obj/item/clothing/gloves/color/grey, DYE_HOS = /obj/item/clothing/gloves/color/black, - DYE_CE = /obj/item/clothing/gloves/color/chief_engineer, + DYE_CE = /obj/item/clothing/gloves/chief_engineer, DYE_RD = /obj/item/clothing/gloves/color/grey, - DYE_CMO = /obj/item/clothing/gloves/color/latex/nitrile, + DYE_CMO = /obj/item/clothing/gloves/latex/nitrile, DYE_REDCOAT = /obj/item/clothing/gloves/color/white, DYE_SYNDICATE = /obj/item/clothing/gloves/combat, DYE_CENTCOM = /obj/item/clothing/gloves/combat diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm index a32a2c33f5b2e..ffab6095cafb3 100644 --- a/code/game/objects/effects/spawners/costume.dm +++ b/code/game/objects/effects/spawners/costume.dm @@ -74,7 +74,7 @@ name = "referee costume spawner" items = list( /obj/item/clothing/mask/whistle, - /obj/item/clothing/gloves/color/latex, + /obj/item/clothing/gloves/latex, /obj/item/clothing/shoes/laceup, /obj/item/clothing/head/soft/black, /obj/item/clothing/under/costume/referee, diff --git a/code/game/objects/items/storage/boxes/clothes_boxes.dm b/code/game/objects/items/storage/boxes/clothes_boxes.dm index 9ef22a04ea8c5..67f1fcc9a67ac 100644 --- a/code/game/objects/items/storage/boxes/clothes_boxes.dm +++ b/code/game/objects/items/storage/boxes/clothes_boxes.dm @@ -7,7 +7,7 @@ /obj/item/storage/box/gloves/PopulateContents() for(var/i in 1 to 7) - new /obj/item/clothing/gloves/color/latex(src) + new /obj/item/clothing/gloves/latex(src) /obj/item/storage/box/masks name = "box of sterile masks" diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index e2351fbf7675a..210b772f08941 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -54,7 +54,7 @@ new /obj/item/clothing/suit/hooded/wintercoat/captain(src) new /obj/item/clothing/suit/jacket/capjacket(src) new /obj/item/clothing/glasses/sunglasses/gar/giga(src) - new /obj/item/clothing/gloves/color/captain(src) + new /obj/item/clothing/gloves/captain(src) new /obj/item/clothing/head/costume/crown/fancy(src) new /obj/item/clothing/head/hats/caphat(src) new /obj/item/clothing/head/hats/caphat/parade(src) @@ -107,7 +107,7 @@ new /obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs(src) new /obj/item/clothing/suit/hooded/wintercoat/medical/cmo(src) new /obj/item/clothing/suit/toggle/labcoat/cmo(src) - new /obj/item/clothing/gloves/color/latex/nitrile(src) + new /obj/item/clothing/gloves/latex/nitrile(src) new /obj/item/clothing/head/beret/medical/cmo(src) new /obj/item/clothing/head/utility/surgerycap/cmo(src) new /obj/item/clothing/neck/cloak/cmo(src) @@ -118,9 +118,9 @@ new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src) new /obj/item/clothing/suit/hooded/wintercoat/engineering/ce(src) new /obj/item/clothing/glasses/meson/engine(src) - new /obj/item/clothing/gloves/color/chief_engineer(src) + new /obj/item/clothing/gloves/chief_engineer(src) new /obj/item/clothing/head/utility/hardhat/white(src) - new /obj/item/clothing/head/utility/hardhat/weldhat/white(src) + new /obj/item/clothing/head/utility/hardhat/welding/white(src) new /obj/item/clothing/neck/cloak/ce(src) new /obj/item/clothing/shoes/sneakers/brown(src) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 183660b70ae7d..8a4edef3111d9 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -78,7 +78,7 @@ new /obj/item/storage/belt/holster/chameleon(src) // 1 tc new /obj/item/card/emag/doorjack(src) // 3 tc replaced the emag with the doorjack new /obj/item/grenade/c4(src) // 1 tc - new /obj/item/clothing/gloves/color/latex/nitrile(src) // ~1 tc for whole outfit + new /obj/item/clothing/gloves/latex/nitrile(src) // ~1 tc for whole outfit new /obj/item/clothing/mask/gas/clown_hat(src) new /obj/item/clothing/under/suit/black_really(src) new /obj/item/clothing/neck/tie/red/hitman(src) @@ -141,7 +141,7 @@ new /obj/item/gun/ballistic/automatic/sniper_rifle(src) // 12 tc new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) // 5 tc new /obj/item/clothing/glasses/thermal/syndi(src) // 4 tc - new /obj/item/clothing/gloves/color/latex/nitrile(src) // ~ 1 tc for outfit + new /obj/item/clothing/gloves/latex/nitrile(src) // ~ 1 tc for outfit new /obj/item/clothing/mask/gas/clown_hat(src) new /obj/item/clothing/under/suit/black_really(src) new /obj/item/clothing/neck/tie/red/hitman(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index f2f7c59e0c8a5..146f56178db20 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -85,7 +85,8 @@ new /obj/item/holosign_creator/atmos(src) new /obj/item/watertank/atmos(src) new /obj/item/clothing/suit/utility/fire/atmos(src) + new /obj/item/clothing/gloves/atmos(src) new /obj/item/clothing/mask/gas/atmos(src) - new /obj/item/clothing/head/utility/hardhat/atmos(src) + new /obj/item/clothing/head/utility/hardhat/welding/atmos(src) new /obj/item/clothing/glasses/meson/engine/tray(src) new /obj/item/extinguisher/advanced(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 1d3dd7f6391ec..c5dc37c46cb4e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -39,7 +39,7 @@ ..() new /obj/item/radio/headset/headset_med(src) new /obj/item/defibrillator/loaded(src) - new /obj/item/clothing/gloves/color/latex/nitrile(src) + new /obj/item/clothing/gloves/latex/nitrile(src) new /obj/item/storage/belt/medical(src) new /obj/item/clothing/glasses/hud/health(src) return diff --git a/code/modules/antagonists/creep/creep.dm b/code/modules/antagonists/creep/creep.dm index 0479e19e98924..ce098bc5f071b 100644 --- a/code/modules/antagonists/creep/creep.dm +++ b/code/modules/antagonists/creep/creep.dm @@ -61,7 +61,7 @@ name = "Obsessed (Preview only)" uniform = /obj/item/clothing/under/misc/overalls - gloves = /obj/item/clothing/gloves/color/latex + gloves = /obj/item/clothing/gloves/latex mask = /obj/item/clothing/mask/surgical neck = /obj/item/camera suit = /obj/item/clothing/suit/apron diff --git a/code/modules/antagonists/heretic/knowledge/side_void_blade.dm b/code/modules/antagonists/heretic/knowledge/side_void_blade.dm index 2ffec3761d311..a317196fae607 100644 --- a/code/modules/antagonists/heretic/knowledge/side_void_blade.dm +++ b/code/modules/antagonists/heretic/knowledge/side_void_blade.dm @@ -18,7 +18,7 @@ ) required_atoms = list( /obj/item/clothing/suit = 1, - /obj/item/clothing/gloves/color/latex = 1, + /obj/item/clothing/gloves/latex = 1, ) limit = 1 cost = 1 diff --git a/code/modules/antagonists/nukeop/outfits.dm b/code/modules/antagonists/nukeop/outfits.dm index cb08771860ff2..4b8560dc9186a 100644 --- a/code/modules/antagonists/nukeop/outfits.dm +++ b/code/modules/antagonists/nukeop/outfits.dm @@ -118,7 +118,7 @@ uniform = /obj/item/clothing/under/syndicate/scrubs suit = /obj/item/clothing/suit/toggle/labcoat/interdyne head = /obj/item/clothing/head/beret/medical - gloves = /obj/item/clothing/gloves/color/latex + gloves = /obj/item/clothing/gloves/latex neck = /obj/item/clothing/neck/stethoscope glasses = /obj/item/clothing/glasses/hud/health mask = /obj/item/clothing/mask/breath/medical diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm index b80ab552c4d50..6150fd6d5e4d1 100644 --- a/code/modules/cargo/packs/emergency.dm +++ b/code/modules/cargo/packs/emergency.dm @@ -25,7 +25,7 @@ /obj/item/clothing/suit/bio_suit = 2, /obj/item/storage/bag/bio, /obj/item/reagent_containers/syringe/antiviral = 2, - /obj/item/clothing/gloves/color/latex/nitrile = 2, + /obj/item/clothing/gloves/latex/nitrile = 2, ) crate_name = "bio suit crate" diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index f1bc00e8be7d3..38a55df8aa320 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -22,7 +22,7 @@ vision_flags = NONE darkness_view = 2 - invis_view = SEE_INVISIBLE_LIVING + lighting_alpha = null var/list/modes = list(MODE_NONE = MODE_MESON, MODE_MESON = MODE_TRAY, MODE_TRAY = MODE_NONE) var/mode = MODE_NONE diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 9ea6c5679365e..6f302279531f1 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -1,113 +1,3 @@ -/obj/item/clothing/gloves/color - dying_key = DYE_REGISTRY_GLOVES - greyscale_colors = null - -/obj/item/clothing/gloves/color/yellow - desc = "These gloves provide protection against electric shock. The thickness of the rubber makes your fingers seem bigger." - name = "insulated gloves" - icon_state = "yellow" - inhand_icon_state = "ygloves" - siemens_coefficient = 0 - armor_type = /datum/armor/color_yellow - resistance_flags = NONE - custom_price = PAYCHECK_CREW * 10 - custom_premium_price = PAYCHECK_COMMAND * 6 - cut_type = /obj/item/clothing/gloves/cut - clothing_traits = list(TRAIT_CHUNKYFINGERS) - -/datum/armor/color_yellow - bio = 50 - -/obj/item/clothing/gloves/color/yellow/heavy - name = "ceramic-lined insulated gloves" - desc = "A cheaper make of the standard insulated gloves, using internal ceramic lining to make up for the sub-par rubber material. The extra weight makes them more bulky to use." - slowdown = 1 - w_class = WEIGHT_CLASS_NORMAL - -/obj/item/toy/sprayoncan - name = "spray-on insulation applicator" - desc = "What is the number one problem facing our station today?" - icon = 'icons/obj/clothing/gloves.dmi' - icon_state = "sprayoncan" - -/obj/item/toy/sprayoncan/afterattack(atom/target, mob/living/carbon/user, proximity) - if(iscarbon(target) && proximity) - var/mob/living/carbon/C = target - var/mob/living/carbon/U = user - var/success = C.equip_to_slot_if_possible(new /obj/item/clothing/gloves/color/yellow/sprayon, ITEM_SLOT_GLOVES, qdel_on_fail = TRUE, disable_warning = TRUE) - if(success) - if(C == user) - C.visible_message(span_notice("[U] sprays their hands with glittery rubber!")) - else - C.visible_message(span_warning("[U] sprays glittery rubber on the hands of [C]!")) - else - C.visible_message(span_warning("The rubber fails to stick to [C]'s hands!")) - -/obj/item/clothing/gloves/color/yellow/sprayon - desc = "How're you gonna get 'em off, nerd?" - name = "spray-on insulated gloves" - icon_state = "sprayon" - inhand_icon_state = null - item_flags = DROPDEL - armor_type = /datum/armor/none - resistance_flags = ACID_PROOF - var/charges_remaining = 10 - -/obj/item/clothing/gloves/color/yellow/sprayon/Initialize(mapload) - .=..() - ADD_TRAIT(src, TRAIT_NODROP, INNATE_TRAIT) - -/obj/item/clothing/gloves/color/yellow/sprayon/equipped(mob/user, slot) - . = ..() - RegisterSignal(user, COMSIG_LIVING_SHOCK_PREVENTED, PROC_REF(use_charge)) - RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(use_charge)) - -/obj/item/clothing/gloves/color/yellow/sprayon/proc/use_charge() - SIGNAL_HANDLER - - charges_remaining-- - if(charges_remaining <= 0) - var/turf/location = get_turf(src) - location.visible_message(span_warning("[src] crumble[p_s()] away into nothing.")) // just like my dreams after working with .dm - qdel(src) - -/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap - desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly." - name = "budget insulated gloves" - icon_state = "yellow" - inhand_icon_state = "ygloves" - greyscale_colors = null - siemens_coefficient = 1 //Set to a default of 1, gets overridden in Initialize() - armor_type = /datum/armor/color_fyellow - resistance_flags = NONE - cut_type = /obj/item/clothing/gloves/cut - -/datum/armor/color_fyellow - bio = 25 - -/obj/item/clothing/gloves/color/fyellow/Initialize(mapload) - . = ..() - siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5) - -/obj/item/clothing/gloves/color/fyellow/old - desc = "Old and worn out insulated gloves, hopefully they still work." - name = "worn out insulated gloves" - -/obj/item/clothing/gloves/color/fyellow/old/Initialize(mapload) - . = ..() - siemens_coefficient = pick(0,0,0,0.5,0.5,0.5,0.75) - -/obj/item/clothing/gloves/cut - desc = "These gloves would protect the wearer from electric shock... if the fingers were covered." - name = "fingerless insulated gloves" - icon_state = "yellowcut" - inhand_icon_state = "ygloves" - greyscale_colors = null - clothing_traits = list(TRAIT_FINGERPRINT_PASSTHROUGH) - -/obj/item/clothing/gloves/cut/heirloom - desc = "The old gloves your great grandfather stole from Engineering, many moons ago. They've seen some tough times recently." - /obj/item/clothing/gloves/color/black desc = "These gloves are fire-resistant." name = "black gloves" @@ -209,92 +99,9 @@ icon_state = "brown" greyscale_colors = "#83613d" -/obj/item/clothing/gloves/color/captain - desc = "Regal blue gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier. Swanky." - name = "captain's gloves" - icon_state = "captain" - inhand_icon_state = null - greyscale_colors = null - siemens_coefficient = 0 - cold_protection = HANDS - min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT - heat_protection = HANDS - max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT - strip_delay = 60 - armor_type = /datum/armor/color_captain - resistance_flags = NONE - -/datum/armor/color_captain - bio = 90 - fire = 70 - acid = 50 - -/obj/item/clothing/gloves/color/chief_engineer - desc = "These gloves provide excellent heat and electric insulation. They are so thin you can barely feel them." - name = "advanced insulated gloves" - icon_state = "ce_insuls" - inhand_icon_state = null - greyscale_colors = null - siemens_coefficient = 0 - cold_protection = HANDS - min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT - heat_protection = HANDS - max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT - resistance_flags = NONE - -/obj/item/clothing/gloves/color/latex - name = "latex gloves" - desc = "Cheap sterile gloves made from latex. Provides quicker carrying from a good grip." - icon_state = "latex" - inhand_icon_state = "latex_gloves" - greyscale_colors = null - siemens_coefficient = 0.3 - armor_type = /datum/armor/color_latex - clothing_traits = list(TRAIT_QUICK_CARRY, TRAIT_FINGERPRINT_PASSTHROUGH) - resistance_flags = NONE - -/datum/armor/color_latex - bio = 100 - -/obj/item/clothing/gloves/color/latex/nitrile - name = "nitrile gloves" - desc = "Pricy sterile gloves that are thicker than latex. Excellent grip ensures very fast carrying of patients along with the faster use time of various chemical related items." - icon_state = "nitrile" - inhand_icon_state = "greyscale_gloves" - greyscale_colors = "#99eeff" - clothing_traits = list(TRAIT_QUICKER_CARRY, TRAIT_FASTMED) - -/obj/item/clothing/gloves/color/latex/engineering - name = "tinker's gloves" - desc = "Overdesigned engineering gloves that have automated construction subrutines dialed in, allowing for faster construction while worn." - icon = 'icons/obj/clothing/gloves.dmi' - inhand_icon_state = "greyscale_gloves" - icon_state = "clockwork_gauntlets" - greyscale_colors = "#db6f05" - siemens_coefficient = 0.8 - armor_type = /datum/armor/latex_engineering - clothing_traits = list(TRAIT_QUICK_BUILD) - custom_materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000) - -/datum/armor/latex_engineering - bio = 70 - /obj/item/clothing/gloves/color/white name = "white gloves" desc = "These look pretty fancy." icon_state = "white" greyscale_colors = "#ffffff" custom_price = PAYCHECK_CREW - -/obj/item/clothing/gloves/kim - name = "aerostatic gloves" - desc = "Breathable red gloves for expert handling of a pen and notebook." - icon_state = "aerostatic_gloves" - greyscale_colors = "#a63814" - -/obj/item/clothing/gloves/maid - name = "maid arm covers" - desc = "Cylindrical looking tubes that go over your arm, weird." - icon_state = "maid_arms" - inhand_icon_state = null - greyscale_colors = null diff --git a/code/modules/clothing/gloves/costume.dm b/code/modules/clothing/gloves/costume.dm new file mode 100644 index 0000000000000..e7d23ac870f2b --- /dev/null +++ b/code/modules/clothing/gloves/costume.dm @@ -0,0 +1,12 @@ +/obj/item/clothing/gloves/maid + name = "maid arm covers" + desc = "Cylindrical looking tubes that go over your arm, weird." + icon_state = "maid_arms" + inhand_icon_state = null + greyscale_colors = null + +/obj/item/clothing/gloves/kim + name = "aerostatic gloves" + desc = "Breathable red gloves for expert handling of a pen and notebook." + icon_state = "aerostatic_gloves" + greyscale_colors = "#a63814" diff --git a/code/modules/clothing/gloves/insulated.dm b/code/modules/clothing/gloves/insulated.dm new file mode 100644 index 0000000000000..ffd4b98c0bc94 --- /dev/null +++ b/code/modules/clothing/gloves/insulated.dm @@ -0,0 +1,122 @@ +/obj/item/clothing/gloves/color + dying_key = DYE_REGISTRY_GLOVES + greyscale_colors = null + +/obj/item/clothing/gloves/color/yellow + desc = "These gloves provide protection against electric shock. The thickness of the rubber makes your fingers seem bigger." + name = "insulated gloves" + icon_state = "yellow" + inhand_icon_state = "ygloves" + siemens_coefficient = 0 + armor_type = /datum/armor/color_yellow + resistance_flags = NONE + custom_price = PAYCHECK_CREW * 10 + custom_premium_price = PAYCHECK_COMMAND * 6 + cut_type = /obj/item/clothing/gloves/cut + clothing_traits = list(TRAIT_CHUNKYFINGERS) + +/datum/armor/color_yellow + bio = 50 + +/obj/item/clothing/gloves/color/yellow/heavy + name = "ceramic-lined insulated gloves" + desc = "A cheaper make of the standard insulated gloves, using internal ceramic lining to make up for the sub-par rubber material. The extra weight makes them more bulky to use." + slowdown = 1 + w_class = WEIGHT_CLASS_NORMAL + +/obj/item/toy/sprayoncan + name = "spray-on insulation applicator" + desc = "What is the number one problem facing our station today?" + icon = 'icons/obj/clothing/gloves.dmi' + icon_state = "sprayoncan" + +/obj/item/toy/sprayoncan/afterattack(atom/target, mob/living/carbon/user, proximity) + if(iscarbon(target) && proximity) + var/mob/living/carbon/C = target + var/mob/living/carbon/U = user + var/success = C.equip_to_slot_if_possible(new /obj/item/clothing/gloves/color/yellow/sprayon, ITEM_SLOT_GLOVES, qdel_on_fail = TRUE, disable_warning = TRUE) + if(success) + if(C == user) + C.visible_message(span_notice("[U] sprays their hands with glittery rubber!")) + else + C.visible_message(span_warning("[U] sprays glittery rubber on the hands of [C]!")) + else + C.visible_message(span_warning("The rubber fails to stick to [C]'s hands!")) + +/obj/item/clothing/gloves/color/yellow/sprayon + desc = "How're you gonna get 'em off, nerd?" + name = "spray-on insulated gloves" + icon_state = "sprayon" + inhand_icon_state = null + item_flags = DROPDEL + armor_type = /datum/armor/none + resistance_flags = ACID_PROOF + var/charges_remaining = 10 + +/obj/item/clothing/gloves/color/yellow/sprayon/Initialize(mapload) + .=..() + ADD_TRAIT(src, TRAIT_NODROP, INNATE_TRAIT) + +/obj/item/clothing/gloves/color/yellow/sprayon/equipped(mob/user, slot) + . = ..() + RegisterSignal(user, COMSIG_LIVING_SHOCK_PREVENTED, PROC_REF(use_charge)) + RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(use_charge)) + +/obj/item/clothing/gloves/color/yellow/sprayon/proc/use_charge() + SIGNAL_HANDLER + + charges_remaining-- + if(charges_remaining <= 0) + var/turf/location = get_turf(src) + location.visible_message(span_warning("[src] crumble[p_s()] away into nothing.")) // just like my dreams after working with .dm + qdel(src) + +/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap + desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly." + name = "budget insulated gloves" + icon_state = "yellow" + inhand_icon_state = "ygloves" + greyscale_colors = null + siemens_coefficient = 1 //Set to a default of 1, gets overridden in Initialize() + armor_type = /datum/armor/color_fyellow + resistance_flags = NONE + cut_type = /obj/item/clothing/gloves/cut + +/datum/armor/color_fyellow + bio = 25 + +/obj/item/clothing/gloves/color/fyellow/Initialize(mapload) + . = ..() + siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5) + +/obj/item/clothing/gloves/color/fyellow/old + desc = "Old and worn out insulated gloves, hopefully they still work." + name = "worn out insulated gloves" + +/obj/item/clothing/gloves/color/fyellow/old/Initialize(mapload) + . = ..() + siemens_coefficient = pick(0,0,0,0.5,0.5,0.5,0.75) + +/obj/item/clothing/gloves/cut + desc = "These gloves would protect the wearer from electric shock... if the fingers were covered." + name = "fingerless insulated gloves" + icon_state = "yellowcut" + inhand_icon_state = "ygloves" + greyscale_colors = null + clothing_traits = list(TRAIT_FINGERPRINT_PASSTHROUGH) + +/obj/item/clothing/gloves/cut/heirloom + desc = "The old gloves your great grandfather stole from Engineering, many moons ago. They've seen some tough times recently." + +/obj/item/clothing/gloves/chief_engineer + desc = "These gloves provide excellent heat and electric insulation. They are so thin you can barely feel them." + name = "advanced insulated gloves" + icon_state = "ce_insuls" + inhand_icon_state = null + greyscale_colors = null + siemens_coefficient = 0 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT + resistance_flags = NONE diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm index ad54adbdffa14..75bb5d9eb874f 100644 --- a/code/modules/clothing/gloves/special.dm +++ b/code/modules/clothing/gloves/special.dm @@ -73,3 +73,73 @@ clothing_traits = list(TRAIT_DOUBLE_TAP) icon_state = "black" greyscale_colors = "#2f2e31" + +/obj/item/clothing/gloves/captain + desc = "Regal blue gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier. Swanky." + name = "captain's gloves" + icon_state = "captain" + inhand_icon_state = null + greyscale_colors = null + siemens_coefficient = 0 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT + strip_delay = 60 + armor_type = /datum/armor/captain_gloves + resistance_flags = NONE + +/datum/armor/captain_gloves + bio = 90 + fire = 70 + acid = 50 + +/obj/item/clothing/gloves/latex + name = "latex gloves" + desc = "Cheap sterile gloves made from latex. Provides quicker carrying from a good grip." + icon_state = "latex" + inhand_icon_state = "latex_gloves" + greyscale_colors = null + siemens_coefficient = 0.3 + armor_type = /datum/armor/latex_gloves + clothing_traits = list(TRAIT_QUICK_CARRY, TRAIT_FINGERPRINT_PASSTHROUGH) + resistance_flags = NONE + +/datum/armor/latex_gloves + bio = 100 + +/obj/item/clothing/gloves/latex/nitrile + name = "nitrile gloves" + desc = "Pricy sterile gloves that are thicker than latex. Excellent grip ensures very fast carrying of patients along with the faster use time of various chemical related items." + icon_state = "nitrile" + inhand_icon_state = "greyscale_gloves" + greyscale_colors = "#99eeff" + clothing_traits = list(TRAIT_QUICKER_CARRY, TRAIT_FASTMED) + +/obj/item/clothing/gloves/tinkerer + name = "tinker's gloves" + desc = "Overdesigned engineering gloves that have automated construction subrutines dialed in, allowing for faster construction while worn." + inhand_icon_state = "greyscale_gloves" + icon_state = "clockwork_gauntlets" + greyscale_colors = "#db6f05" + siemens_coefficient = 0.8 + armor_type = /datum/armor/tinker_gloves + clothing_traits = list(TRAIT_QUICK_BUILD) + custom_materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000) + resistance_flags = NONE + +/datum/armor/tinker_gloves + bio = 70 + +/obj/item/clothing/gloves/atmos + name = "atmospheric extrication gloves" + desc = "Heavy duty gloves for firefighters. These are thick, non-flammable and let you carry people faster." + icon_state = "atmos" + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + resistance_flags = FIRE_PROOF + siemens_coefficient = 0.3 + clothing_traits = list(TRAIT_QUICKER_CARRY, TRAIT_CHUNKYFINGERS) + clothing_flags = THICKMATERIAL diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index d20483970f0b9..358b957e29ea0 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -106,27 +106,7 @@ hat_type = "dblue" dog_fashion = null -/obj/item/clothing/head/utility/hardhat/atmos - icon_state = "hardhat0_atmos" - inhand_icon_state = null - hat_type = "atmos" - dog_fashion = null - name = "atmospheric technician's firefighting helmet" - desc = "A firefighter's helmet, able to keep the user cool in any situation." - clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | PLASMAMAN_HELMET_EXEMPT | HEADINTERNALS - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT - heat_protection = HEAD - max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - cold_protection = HEAD - min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF - -/obj/item/clothing/head/utility/hardhat/atmos/worn_overlays(mutable_appearance/standing, isinhands, icon_file) - . = ..() - if(!isinhands) - . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) - -/obj/item/clothing/head/utility/hardhat/weldhat +/obj/item/clothing/head/utility/hardhat/welding name = "welding hard hat" desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight AND welding shield! The bulb seems a little smaller though." light_range = 3 //Needs a little bit of tradeoff @@ -139,50 +119,48 @@ visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT visor_flags_inv = HIDEEYES | HIDEFACE | HIDESNOUT visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + ///Icon state of the welding visor. + var/visor_state = "weldvisor" -/obj/item/clothing/head/utility/hardhat/weldhat/Initialize(mapload) +/obj/item/clothing/head/utility/hardhat/welding/Initialize(mapload) . = ..() update_appearance() -/obj/item/clothing/head/utility/hardhat/weldhat/attack_self(mob/living/user) - toggle_helmet_light(user) - -/obj/item/clothing/head/utility/hardhat/weldhat/AltClick(mob/user) - if(user.canUseTopic(src, be_close = TRUE)) - toggle_welding_screen(user) +/obj/item/clothing/head/utility/hardhat/welding/attack_self_secondary(mob/user, modifiers) + toggle_welding_screen(user) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN -/obj/item/clothing/head/utility/hardhat/weldhat/ui_action_click(mob/user, actiontype) +/obj/item/clothing/head/utility/hardhat/welding/ui_action_click(mob/user, actiontype) if(istype(actiontype, /datum/action/item_action/toggle_welding_screen)) toggle_welding_screen(user) return return ..() -/obj/item/clothing/head/utility/hardhat/weldhat/proc/toggle_welding_screen(mob/living/user) +/obj/item/clothing/head/utility/hardhat/welding/proc/toggle_welding_screen(mob/living/user) if(weldingvisortoggle(user)) playsound(src, 'sound/mecha/mechmove03.ogg', 50, TRUE) //Visors don't just come from nothing update_appearance() -/obj/item/clothing/head/utility/hardhat/weldhat/worn_overlays(mutable_appearance/standing, isinhands) +/obj/item/clothing/head/utility/hardhat/welding/worn_overlays(mutable_appearance/standing, isinhands) . = ..() if(isinhands) return - . += mutable_appearance('icons/mob/clothing/head/utility.dmi', "weldhelmet") if(!up) - . += mutable_appearance('icons/mob/clothing/head/utility.dmi', "weldvisor") + . += mutable_appearance('icons/mob/clothing/head/utility.dmi', visor_state) -/obj/item/clothing/head/utility/hardhat/weldhat/update_overlays() +/obj/item/clothing/head/utility/hardhat/welding/update_overlays() . = ..() if(!up) - . += "weldvisor" + . += visor_state -/obj/item/clothing/head/utility/hardhat/weldhat/orange +/obj/item/clothing/head/utility/hardhat/welding/orange icon_state = "hardhat0_orange" inhand_icon_state = null hat_type = "orange" -/obj/item/clothing/head/utility/hardhat/weldhat/white +/obj/item/clothing/head/utility/hardhat/welding/white desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight AND welding shield!" //This bulb is not smaller icon_state = "hardhat0_white" inhand_icon_state = null @@ -194,11 +172,34 @@ cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT -/obj/item/clothing/head/utility/hardhat/weldhat/dblue +/obj/item/clothing/head/utility/hardhat/welding/dblue icon_state = "hardhat0_dblue" inhand_icon_state = null hat_type = "dblue" +/obj/item/clothing/head/utility/hardhat/welding/atmos + icon_state = "hardhat0_atmos" + inhand_icon_state = null + hat_type = "atmos" + dog_fashion = null + name = "atmospheric firefighter helmet" + desc = "A firefighter's helmet, able to keep the user cool in any situation. Comes with a light and a welding visor." + clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | PLASMAMAN_HELMET_EXEMPT | HEADINTERNALS + heat_protection = HEAD + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + cold_protection = HEAD + min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + visor_flags_cover = NONE + flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT + visor_flags_inv = NONE + visor_state = "weldvisor_atmos" + +/obj/item/clothing/head/utility/hardhat/welding/atmos/worn_overlays(mutable_appearance/standing, isinhands, icon_file) + . = ..() + if(!isinhands) + . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) + /obj/item/clothing/head/utility/hardhat/pumpkinhead name = "carved pumpkin" desc = "A jack o' lantern! Believed to ward off evil spirits." diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 31a51e7103d78..06ec7bd402375 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -391,7 +391,7 @@ /obj/item/stack/sheet/iron/fifty = 1, /obj/item/stack/sheet/plasteel/twenty = 1, ) - head = /obj/item/clothing/head/utility/hardhat/weldhat + head = /obj/item/clothing/head/utility/hardhat/welding mask = /obj/item/clothing/mask/gas/atmos l_hand = /obj/item/areaeditor/blueprints diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index a55a8f078dc4e..5c9a43baafc9c 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -181,7 +181,7 @@ name = "Captain Plasmaman" uniform = /obj/item/clothing/under/plasmaman/captain - gloves = /obj/item/clothing/gloves/color/captain //Too iconic to be replaced with a plasma version + gloves = /obj/item/clothing/gloves/captain //Too iconic to be replaced with a plasma version head = /obj/item/clothing/head/helmet/space/plasmaman/captain /datum/outfit/plasmaman/head_of_personnel diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 7b2a6faf23da2..75d9e2ab1ba77 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -146,7 +146,7 @@ shoes = /obj/item/clothing/shoes/sneakers/white ears = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/thermal/monocle - gloves = /obj/item/clothing/gloves/color/latex + gloves = /obj/item/clothing/gloves/latex head = /obj/item/clothing/head/utility/welding mask = /obj/item/clothing/mask/surgical l_pocket = /obj/item/knife/kitchen diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 8f345a268c9b0..b0b87b70d2d4a 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -57,6 +57,9 @@ /obj/item/clothing/suit/utility/fire/firefighter icon_state = "firesuit" inhand_icon_state = "firefighter" + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS + cold_protection = CHEST|GROIN|LEGS|FEET|ARMS + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS /obj/item/clothing/suit/utility/fire/heavy name = "heavy firesuit" @@ -66,11 +69,15 @@ slowdown = 1.5 /obj/item/clothing/suit/utility/fire/atmos - name = "firesuit" + name = "atmospheric firesuit" desc = "An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame." icon_state = "atmos_firesuit" - inhand_icon_state = null + inhand_icon_state = "firefighter_atmos" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS + cold_protection = CHEST|GROIN|LEGS|FEET|ARMS + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS + flags_inv = HIDESHOES|HIDEJUMPSUIT /* * Bomb protection diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index d27fd463cee0d..8708730a82716 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -67,7 +67,7 @@ belt = /obj/item/modular_computer/pda/heads/captain ears = /obj/item/radio/headset/heads/captain/alt glasses = /obj/item/clothing/glasses/sunglasses - gloves = /obj/item/clothing/gloves/color/captain + gloves = /obj/item/clothing/gloves/captain head = /obj/item/clothing/head/hats/caphat shoes = /obj/item/clothing/shoes/laceup diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 608cfb7ba0d67..2b2e3b0fcb8d0 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -53,7 +53,7 @@ belt = /obj/item/storage/belt/medical/paramedic ears = /obj/item/radio/headset/headset_med head = /obj/item/clothing/head/soft/paramedic - gloves = /obj/item/clothing/gloves/color/latex/nitrile + gloves = /obj/item/clothing/gloves/latex/nitrile shoes = /obj/item/clothing/shoes/sneakers/blue l_pocket = /obj/item/modular_computer/pda/medical/paramedic diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm index 394e0b566decb..1c300f1b3ccac 100644 --- a/code/modules/mafia/outfits.dm +++ b/code/modules/mafia/outfits.dm @@ -108,7 +108,7 @@ name = "Mafia Obsessed" uniform = /obj/item/clothing/under/misc/overalls shoes = /obj/item/clothing/shoes/sneakers/white - gloves = /obj/item/clothing/gloves/color/latex + gloves = /obj/item/clothing/gloves/latex mask = /obj/item/clothing/mask/surgical suit = /obj/item/clothing/suit/apron diff --git a/code/modules/mob_spawn/corpses/mob_corpses.dm b/code/modules/mob_spawn/corpses/mob_corpses.dm index 11657484b7660..ccedb6ad3f757 100644 --- a/code/modules/mob_spawn/corpses/mob_corpses.dm +++ b/code/modules/mob_spawn/corpses/mob_corpses.dm @@ -207,7 +207,7 @@ uniform = /obj/item/clothing/under/rank/medical/scrubs/green suit = /obj/item/clothing/suit/apron/surgical shoes = /obj/item/clothing/shoes/sneakers/white - gloves = /obj/item/clothing/gloves/color/latex/nitrile + gloves = /obj/item/clothing/gloves/latex/nitrile ears = /obj/item/radio/headset back = /obj/item/storage/backpack/satchel/med id = /obj/item/card/id/advanced diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 7317aa5f68a24..efcbbb314e97c 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -397,7 +397,7 @@ id = "eng_gloves" build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000) - build_path = /obj/item/clothing/gloves/color/latex/engineering + build_path = /obj/item/clothing/gloves/tinkerer category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING ) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 5e4623ee15c01..8e582c2f8ad8d 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -104,7 +104,7 @@ /obj/item/clothing/head/beret/engi = 3, /obj/item/clothing/mask/bandana/striped/engineering = 3, /obj/item/clothing/head/utility/hardhat = 3, - /obj/item/clothing/head/utility/hardhat/weldhat = 3, + /obj/item/clothing/head/utility/hardhat/welding = 3, ) refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe payment_department = ACCOUNT_ENG @@ -542,7 +542,7 @@ /obj/item/clothing/suit/jacket/det_suit/noir = 1, /obj/item/clothing/head/fedora = 2, /obj/item/clothing/gloves/color/black = 2, - /obj/item/clothing/gloves/color/latex = 2, + /obj/item/clothing/gloves/latex = 2, /obj/item/clothing/under/rank/security/detective/disco = 1, /obj/item/clothing/suit/jacket/det_suit/disco = 1, /obj/item/clothing/shoes/discoshoes = 1, diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 8fe58bdc028c3..b977a6ed11c97 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head/utility.dmi b/icons/mob/clothing/head/utility.dmi index bd4318891c80a..24036e71d59fc 100644 Binary files a/icons/mob/clothing/head/utility.dmi and b/icons/mob/clothing/head/utility.dmi differ diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi index 19b276a2a111a..539eb8594d85d 100644 Binary files a/icons/mob/clothing/suits/utility.dmi and b/icons/mob/clothing/suits/utility.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index a7d01e566e97b..c00da21600f3f 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/head/utility.dmi b/icons/obj/clothing/head/utility.dmi index adbda30d8310e..4946264173efb 100644 Binary files a/icons/obj/clothing/head/utility.dmi and b/icons/obj/clothing/head/utility.dmi differ diff --git a/icons/obj/clothing/suits/utility.dmi b/icons/obj/clothing/suits/utility.dmi index 4e465fdd42aa5..7c8ce468350ea 100644 Binary files a/icons/obj/clothing/suits/utility.dmi and b/icons/obj/clothing/suits/utility.dmi differ diff --git a/talestation_modules/code/fluff_module/item_dispensers.dm b/talestation_modules/code/fluff_module/item_dispensers.dm index b17c24a277d44..a3cb6fedf4069 100644 --- a/talestation_modules/code/fluff_module/item_dispensers.dm +++ b/talestation_modules/code/fluff_module/item_dispensers.dm @@ -160,7 +160,7 @@ /obj/structure/item_dispenser/latex icon_state = "dispenser_gloves" - stock = /obj/item/clothing/gloves/color/latex + stock = /obj/item/clothing/gloves/latex stocked = TRUE /obj/structure/item_dispenser/mask @@ -198,7 +198,7 @@ /obj/structure/item_dispenser/latex/empty icon_state = "dispenser_gloves" - stock = /obj/item/clothing/gloves/color/latex + stock = /obj/item/clothing/gloves/latex stocked = FALSE /obj/structure/item_dispenser/mask/empty diff --git a/tgstation.dme b/tgstation.dme index 6cb3fde1888f1..5d1403e03c182 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2950,6 +2950,8 @@ #include "code\modules\clothing\gloves\boxing.dm" #include "code\modules\clothing\gloves\color.dm" #include "code\modules\clothing\gloves\combat.dm" +#include "code\modules\clothing\gloves\costume.dm" +#include "code\modules\clothing\gloves\insulated.dm" #include "code\modules\clothing\gloves\plasmaman.dm" #include "code\modules\clothing\gloves\special.dm" #include "code\modules\clothing\gloves\tacklers.dm"