Skip to content

Commit

Permalink
[MIRROR] [MDB IGNORE] adds atmospheric gloves, small resprite of fire…
Browse files Browse the repository at this point in the history
…fighter gear, repaths stupid glove paths (#4153)

Original PR: tgstation/tgstation#72736
-----
## About The Pull Request
repaths a lot of gloves off /color because they were incredibly stupid
firefighter gear has gotten an update (it doesnt cover hands anymore
though, you need something else)
firefighter helmets no longer hide your mask or glasses

![image](https://user-images.githubusercontent.com/23585223/212542599-c004d0e4-c141-40b4-a1bb-c838f9893c4b.png)
fixed engine goggles starting with darkness vision
to the atmos lockers adds atmospheric gloves, a pair of thick (chunky
fingers) gloves that are fireproof and fire protective, slightly shock
resistant and let you fireman carry people faster.
atmospheric firefighter helmets now are a subtype of welding hardhats,
you can enable a welding visor.
welding hardhats change mode with right click instead of altclick

## Why It's Good For The Game
im not a good spriter but i think this resprite makes them fit nicer
with other engi equipment
lets me firefighter rp

## Changelog
:cl:
add: Atmospheric Gloves, thick gloves that are fully fireproof and fire
protective and let you fireman carry people faster.
fix: fixes engine goggles starting with darkness vision
qol: firefighter helmets can now enable a welding visor
qol: welding hardhats change mode with right click instead of altclick
balance: firesuits no longer protect your hands
/:cl:

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
  • Loading branch information
3 people committed Jan 19, 2023
1 parent 13ee885 commit 4cfa2c9
Show file tree
Hide file tree
Showing 70 changed files with 400 additions and 378 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/TheDerelict.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/oldstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomZLevels/moonoutpost19.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomZLevels/undergroundoutpost45.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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{
Expand Down
34 changes: 17 additions & 17 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
18 changes: 9 additions & 9 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down

0 comments on commit 4cfa2c9

Please sign in to comment.