Skip to content

Makes surgical masks mapped in near anesthetic tanks & cleans up dupe code #12190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
CujoGaming wants to merge 2 commits into
base: master
Choose a base branch
from
+30 −45
Draft

Makes surgical masks mapped in near anesthetic tanks & cleans up dupe code #12190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f00dc91
remove dupe code, makes masks more common
CujoGaming Jul 16, 2026
13e88a6
no longer adjustable since it has no sprites, bring clothing flags fr…
CujoGaming Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@
"fi" = (
/obj/structure/table/reinforced/rglass,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/muzzle,
/turf/open/floor/iron/icemoon,
/area/ruin/space/ancientstation/beta/medbay)
"fj" = (
Expand Down Expand Up @@ -6056,7 +6056,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/muzzle,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/rnd)
"GM" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/InfestedFlotilla.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6277,7 +6277,7 @@
/obj/structure/table,
/obj/structure/window/reinforced/tinted/frosted/spawner/directional/east,
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/muzzle,
/obj/item/tank/internals/anesthetic,
/turf/open/floor/plastic,
/area/ruin/space/has_grav/infested_flotilla)
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/oldstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4618,7 +4618,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/muzzle,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/rnd)
"sL" = (
Expand Down Expand Up @@ -5950,7 +5950,7 @@
"BQ" = (
/obj/structure/table/reinforced/rglass,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/muzzle,
/turf/open/floor/iron/airless,
/area/ruin/space/ancientstation/beta/medbay)
"BX" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/BoxStation/BoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16228,7 +16228,7 @@
},
/obj/structure/table,
/obj/item/clothing/gloves/latex,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/muzzle,
/obj/item/tank/internals/anesthetic,
/turf/open/floor/iron/white,
/area/station/science/robotics/lab)
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,11 +969,11 @@
/obj/item/tank/internals/anesthetic{
pixel_x = -3
},
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle{
pixel_y = 3
},
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle,
/obj/item/clothing/mask/breath/muzzle{
pixel_y = -3
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/Graveyard/Graveyard.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20868,11 +20868,11 @@
/obj/item/tank/internals/anesthetic{
pixel_x = -3
},
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle{
pixel_y = -3
},
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle,
/obj/item/clothing/mask/breath/muzzle{
pixel_y = 3
},
/obj/effect/turf_decal/trimline/blue/filled/line,
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/LeadPoisoningStation/LeadPoisoningStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8703,13 +8703,13 @@
/obj/item/tank/internals/anesthetic{
pixel_x = 3
},
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle{
pixel_y = -3
},
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle{
pixel_y = 3
},
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/muzzle,
/turf/open/floor/iron/diagonal,
/area/station/medical/surgery)
"eqg" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,11 +560,11 @@
/obj/item/tank/internals/anesthetic{
pixel_x = -3
},
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle{
pixel_y = -3
},
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle,
/obj/item/clothing/mask/breath/muzzle{
pixel_y = 3
},
/obj/structure/window/reinforced/spawner/directional/west,
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/Oshan/Oshan.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11266,7 +11266,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
/obj/item/clothing/mask/surgical,
/obj/item/clothing/mask/breath/muzzle,
/obj/effect/turf_decal/trimline/blue/corner{
dir = 8
},
Expand Down Expand Up @@ -28570,8 +28570,8 @@
/obj/item/storage/toolbox/electrical/medical,
/obj/item/tank/internals/anesthetic,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/muzzle,
/obj/item/clothing/mask/breath/muzzle,
/obj/item/wheelchair,
/obj/item/wheelchair,
/obj/item/wheelchair,
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/PubbyStation/PubbyStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1750,7 +1750,7 @@
/obj/structure/rack,
/obj/item/clothing/suit/jacket/straight_jacket,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/muzzle,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/Theseus/Theseus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72617,13 +72617,13 @@
/obj/item/tank/internals/anesthetic{
pixel_x = -3
},
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle{
pixel_y = -3
},
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle{
pixel_y = -3
},
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle{
pixel_y = -3
},
/obj/machinery/button/door/directional/north{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/emergency_bballhooper.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/table,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath/medical{
/obj/item/clothing/mask/breath/muzzle{
pixel_x = 5;
pixel_y = 2
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/infiltrator_basic.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@
},
/obj/item/clothing/under/syndicate/scrubs,
/obj/item/clothing/gloves/latex/nitrile,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/breath/muzzle,
/obj/item/tank/internals/anesthetic,
/turf/open/floor/iron,
/area/shuttle/syndicate/medical)
Expand Down
4 changes: 3 additions & 1 deletion code/modules/clothing/masks/breath.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@
righthand_file = 'icons/mob/inhands/clothing/masks_righthand.dmi'
body_parts_covered = NONE
flags_cover = NONE
armor_type = /datum/armor/breath_muzzle
clothing_flags = MASKINTERNALS | BLOCKS_SPEECH
armor_type = /datum/armor/muzzle_breath
equip_delay_other = 25 // my sprite has 4 straps, a-la a head harness. takes a while to equip, longer than a muzzle
adjustable = FALSE //no sprites :(

/*
/obj/item/clothing/mask/breath/muzzle/Initialize(mapload)
Expand Down
17 changes: 0 additions & 17 deletions code/modules/clothing/masks/muzzle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,6 @@
return
return ..()

/obj/item/clothing/mask/breath/muzzle
name = "surgery mask"
desc = "To silence those pesky patients before putting them under."
icon_state = "breathmuzzle"
inhand_icon_state = "breathmuzzle"
lefthand_file = 'icons/mob/inhands/clothing/masks_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing/masks_righthand.dmi'
body_parts_covered = NONE
flags_cover = NONE
clothing_flags = MASKINTERNALS | BLOCKS_SPEECH
armor_type = /datum/armor/muzzle_breath
equip_delay_other = 25 // my sprite has 4 straps, a-la a head harness. takes a while to equip, longer than a muzzle

/obj/item/clothing/mask/breath/muzzle/examine(mob/user)
. = ..()
. += "Does not block surgery on covered bodyparts."

/datum/armor/muzzle_breath
bio = 100

Expand Down
Loading