cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-13 08:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Returns the clear masks. (#18413)

Browse Source 
Co-authored-by: Tost <Tost>
This commit is contained in:
TheToaster98
2025-09-04 20:09:13 +02:00
committed by GitHub
parent 4424dde5d0
commit 9e9fdfe1ff
21 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/atmospherics.dm
+2 -2
View File
@@ -94,7 +94,7 @@
name = "Internals crate"
desc = "A set of 3 gas masks and air tanks."
contains = list(
/obj/item/clothing/mask/gas = 3,
/obj/item/clothing/mask/gas/clear = 3,
/obj/item/tank/air = 3
)
cost = 10
@@ -111,7 +111,7 @@
/obj/item/tank/emergency/oxygen/engi = 4,
/obj/item/clothing/suit/space/emergency = 4,
/obj/item/clothing/head/helmet/space/emergency = 4,
/obj/item/clothing/mask/gas = 4
/obj/item/clothing/mask/gas/clear = 4
)
cost = 35
containertype = /obj/structure/closet/crate/aether
code/datums/supplypacks/hydroponics.dm
+1 -1
View File
@@ -156,7 +156,7 @@
contains = list(
/obj/item/material/knife/machete/hatchet = 2,
/obj/item/reagent_containers/spray/plantbgone = 4,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/mask/gas/clear = 2,
/obj/item/grenade/chem_grenade/antiweed = 2,
/obj/item/material/twohanded/fireaxe/scythe
)
code/datums/supplypacks/medical.dm
+3 -3
View File
@@ -216,7 +216,7 @@
/obj/item/clothing/suit/storage/toggle/labcoat/emt,
/obj/item/clothing/under/rank/medical/paramedic,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/under/rank/medical/paramedic_alt,
/obj/item/clothing/accessory/stethoscope,
/obj/item/storage/firstaid/adv,
@@ -330,7 +330,7 @@
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/head/bio_hood/cmo,
/obj/item/clothing/shoes/white = 4,
/obj/item/clothing/mask/gas = 4,
/obj/item/clothing/mask/gas/clear = 4,
/obj/item/tank/oxygen = 4,
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves
@@ -412,7 +412,7 @@
contains = list(
/obj/item/clothing/suit/bio_suit/virology = 3,
/obj/item/clothing/head/bio_hood/virology = 3,
/obj/item/clothing/mask/gas = 3,
/obj/item/clothing/mask/gas/clear = 3,
/obj/item/tank/oxygen = 3,
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves
code/datums/supplypacks/security.dm
+1 -1
View File
@@ -705,7 +705,7 @@
/obj/item/clothing/under/rank/security = 3,
/obj/item/clothing/suit/bio_suit/security = 3,
/obj/item/clothing/shoes/white = 3,
/obj/item/clothing/mask/gas = 3,
/obj/item/clothing/mask/gas/clear = 3,
/obj/item/tank/oxygen = 3,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/storage/box/gloves
code/game/objects/random/maintenance.dm
+1 -1
View File
@@ -38,7 +38,7 @@ something, make sure it's not in one of the other lists.*/
prob(3);/obj/item/cell/high,
prob(2);/obj/item/cell/super,
prob(5);/obj/random/cigarettes,
prob(3);/obj/item/clothing/mask/gas,
prob(3);/obj/item/clothing/mask/gas/clear,
prob(2);/obj/item/clothing/mask/gas/half,
prob(4);/obj/item/clothing/mask/breath,
prob(2);/obj/item/reagent_containers/glass/rag,
code/game/objects/structures/crates_lockers/closets/l3closet.dm
+3 -3
View File
@@ -17,7 +17,7 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/virology,
/obj/item/clothing/head/bio_hood/virology,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/tank/oxygen)
@@ -35,7 +35,7 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/janitor = 2,
/obj/item/clothing/head/bio_hood/janitor = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/mask/gas/clear = 2,
/obj/item/tank/emergency/oxygen/engi = 2)
@@ -60,4 +60,4 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/general = 3,
/obj/item/clothing/head/bio_hood/general = 3,
/obj/item/clothing/mask/gas = 3)
/obj/item/clothing/mask/gas/clear = 3)
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+1 -1
View File
@@ -52,7 +52,7 @@
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/fingerless,
/obj/item/tank/emergency/oxygen,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/head/soft,
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+2 -2
View File
@@ -96,7 +96,7 @@
/obj/item/radio/headset/alt/headset_eng,
/obj/item/radio/headset/earbud/headset_eng,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/glasses/meson,
/obj/item/cartridge/engineering,
/obj/item/taperoll/engineering,
@@ -134,7 +134,7 @@
/obj/item/radio/headset/alt/headset_eng,
/obj/item/radio/headset/earbud/headset_eng,
/obj/item/clothing/suit/storage/hazardvest/atmos, //VOREStation edit. Eng locker gets regular haz-vest, atmos gets the themed one of their own
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/cartridge/atmos,
/obj/item/taperoll/atmos,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos,
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+1 -1
View File
@@ -38,7 +38,7 @@
/obj/structure/closet/secure_closet/hydroponics/sci/Initialize(mapload)
starts_with += /obj/item/clothing/head/bio_hood/scientist
starts_with += /obj/item/clothing/suit/bio_suit/scientist
starts_with += /obj/item/clothing/mask/gas // VOREStation Edit: Gasmasks we use are different
starts_with += /obj/item/clothing/mask/gas/clear // VOREStation Edit: Gasmasks we use are different
if(prob(1))
starts_with += /obj/item/chainsaw
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+2 -2
View File
@@ -104,7 +104,7 @@
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/antitoxin,
/obj/item/storage/belt/medical/emt,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/suit/storage/toggle/labcoat/emt,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/para,
@@ -156,7 +156,7 @@
/obj/item/clothing/head/beret/medical/cmo,
/obj/item/clothing/head/beret/medical/cmo/blue,
/obj/item/storage/box/freezer,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/taperoll/medical,
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/head/bio_hood/cmo,
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+2 -2
View File
@@ -9,7 +9,7 @@
/obj/item/clothing/shoes/white,
/obj/item/radio/headset/headset_sci,
/obj/item/tank/air,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/clothing/shoes/boots/winter/science)
@@ -48,7 +48,7 @@
/obj/item/radio/headset/alt/heads/rd,
/obj/item/radio/headset/earbud/heads/rd,
/obj/item/tank/air,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/flash,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/clothing/suit/storage/hooded/wintercoat/science/rd,
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+5 -5
View File
@@ -54,7 +54,7 @@
/obj/structure/closet/emcloset/legacy
starts_with = list(
/obj/item/tank/oxygen,
/obj/item/clothing/mask/gas)
/obj/item/clothing/mask/gas/clear)
/*
* Fire Closet
@@ -66,7 +66,7 @@
starts_with = list(
/obj/item/clothing/suit/fire,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,
/obj/item/clothing/head/hardhat/red)
@@ -74,7 +74,7 @@
/obj/structure/closet/firecloset/full
starts_with = list(
/obj/item/clothing/suit/fire,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/flashlight,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,
@@ -83,7 +83,7 @@
/obj/structure/closet/firecloset/full/double
starts_with = list(
/obj/item/clothing/suit/fire = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/mask/gas/clear = 2,
/obj/item/flashlight = 2,
/obj/item/tank/oxygen/red = 2,
/obj/item/extinguisher = 2,
@@ -207,7 +207,7 @@
starts_with = list(
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/flashlight,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,
code/game/objects/structures/crates_lockers/closets/walllocker.dm
+1 -1
View File
@@ -214,7 +214,7 @@
starts_with = list(
/obj/item/clothing/suit/fire,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/flashlight,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,
code/modules/clothing/suits/jobs.dm
+1 -1
View File
@@ -175,7 +175,7 @@
blood_overlay_type = "armor"
allowed = list (/obj/item/analyzer, /obj/item/flashlight, /obj/item/multitool, /obj/item/pipe_painter, /obj/item/radio, /obj/item/t_scanner,
/obj/item/tool/crowbar, /obj/item/tool/screwdriver, /obj/item/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, /obj/item/tank/emergency/oxygen,
/obj/item/clothing/mask/gas, /obj/item/taperoll/engineering, /obj/item/taperoll/atmos, /obj/item/analyzer, /obj/item/extinguisher/mini) //VOREStation edit. Few more tools that can be put on vests
/obj/item/clothing/mask/gas/clear, /obj/item/taperoll/engineering, /obj/item/taperoll/atmos, /obj/item/analyzer, /obj/item/extinguisher/mini) //VOREStation edit. Few more tools that can be put on vests
body_parts_covered = UPPER_TORSO
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 20)
maps/offmap_vr/talon/talon_v2.dm
+1 -1
View File
@@ -446,7 +446,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/item/clamp,
/obj/item/radio/headset/talon,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/taperoll/atmos,
/obj/item/tank/emergency/oxygen/engi,
/obj/item/clothing/head/helmet/space/void/refurb/engineering/talon,
maps/stellar_delight/stellar_delight1.dmm
+3 -3
View File
@@ -2146,12 +2146,12 @@
/area/stellardelight/deck1/miningshuttle)
"dV" = (
/obj/structure/table/rack/shelf/steel,
/obj/item/clothing/mask/gas{
/obj/item/clothing/mask/gas/clear{
pixel_x = 3;
pixel_y = 3
},
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas{
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/mask/gas/clear{
pixel_x = -3;
pixel_y = -3
},
maps/stellar_delight/stellar_delight2.dmm
+1 -1
View File
@@ -8222,7 +8222,7 @@
"ry" = (
/obj/structure/table/rack,
/obj/item/tank/jetpack,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/space/void/captain,
/obj/item/clothing/head/helmet/space/void/captain,
/obj/structure/window/reinforced,
maps/tether/tether-01-surface1.dmm
+10 -10
View File
@@ -1809,7 +1809,7 @@
/area/maintenance/lower/xenoflora)
"ads" = (
/obj/structure/table/rack,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat,
/obj/item/tank/emergency/oxygen/engi,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -3742,10 +3742,10 @@
dir = 4
},
/obj/structure/table/rack,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/tank/emergency/oxygen/engi,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/tank/emergency/oxygen/engi,
/turf/simulated/floor/tiled,
@@ -4174,7 +4174,7 @@
dir = 4
},
/obj/random/maintenance/clean,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/random/maintenance/engineering,
/turf/simulated/floor/plating,
/area/storage/surface_eva)
@@ -8380,7 +8380,7 @@
dir = 9
},
/obj/machinery/door/window/southleft,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat,
/obj/item/tank/emergency/oxygen/engi,
/obj/structure/sign/nosmoking_2{
@@ -8400,7 +8400,7 @@
dir = 5
},
/obj/machinery/door/window/southright,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat,
/obj/item/tank/emergency/oxygen/engi,
/turf/simulated/floor/tiled/dark,
@@ -9494,7 +9494,7 @@
},
/obj/structure/window/reinforced,
/obj/machinery/door/window/northleft,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat,
/obj/item/tank/emergency/oxygen/engi,
/obj/structure/sign/fire{
@@ -9512,7 +9512,7 @@
},
/obj/structure/window/reinforced,
/obj/machinery/door/window/northright,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat,
/obj/item/tank/emergency/oxygen/engi,
/turf/simulated/floor/tiled/dark,
@@ -31248,7 +31248,7 @@
/area/tether/surfacebase/lowernorthhall)
"dxY" = (
/obj/structure/table/rack,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat,
/obj/item/tank/emergency/oxygen/engi,
/turf/simulated/floor/tiled/techfloor,
@@ -31376,7 +31376,7 @@
/area/tether/surfacebase/security/brig)
"dPY" = (
/obj/structure/table/rack,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/tank/emergency/oxygen/engi,
/turf/simulated/floor/tiled/techfloor,
maps/tether/tether-02-surface2.dmm
+10 -10
View File
@@ -4651,12 +4651,12 @@
dir = 4
},
/obj/structure/table/rack/shelf/steel,
/obj/item/clothing/mask/gas{
/obj/item/clothing/mask/gas/clear{
pixel_x = 3;
pixel_y = 3
},
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas{
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/mask/gas/clear{
pixel_x = -3;
pixel_y = -3
},
@@ -15248,9 +15248,9 @@
dir = 8;
layer = 2.9
},
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/mask/gas/clear,
/obj/item/gps/command,
/obj/item/gps/command,
/obj/item/gps/command,
@@ -17316,14 +17316,14 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
"aEu" = (
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/structure/closet/walllocker_double{
@@ -23008,7 +23008,7 @@
},
/obj/item/clothing/suit/fire/firefighter,
/obj/item/tank/oxygen,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/extinguisher,
/obj/item/clothing/head/hardhat/red,
/obj/item/clothing/glasses/meson,
maps/tether/tether-03-surface3.dmm
+7 -7
View File
@@ -6979,10 +6979,10 @@
/area/library)
"akN" = (
/obj/structure/closet,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/mask/gas/clear,
/obj/effect/floor_decal/techfloor{
dir = 8
},
@@ -29804,7 +29804,7 @@
"baf" = (
/obj/structure/table/rack,
/obj/item/tank/jetpack/oxygen,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
@@ -33808,7 +33808,7 @@
dir = 4
},
/obj/random/maintenance/clean,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/random/maintenance/engineering,
/turf/simulated/floor/plating,
/area/tether/surfacebase/topairlock)
@@ -34327,7 +34327,7 @@
/area/tether/surfacebase/topairlock)
"biB" = (
/obj/structure/table/rack,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat,
/obj/item/tank/emergency/oxygen/engi,
/obj/machinery/light{
maps/tether/tether-07-solars.dmm
+2 -2
View File
@@ -989,7 +989,7 @@
"cz" = (
/obj/structure/table/rack,
/obj/machinery/door/window/eastleft,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/tank/emergency/oxygen/engi,
/obj/structure/window/basic{
@@ -1218,7 +1218,7 @@
"cW" = (
/obj/structure/table/rack,
/obj/machinery/door/window/eastright,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/tank/emergency/oxygen/engi,
/obj/structure/window/basic,