diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 3b6e54aba46..18300d3d2ff 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -104,7 +104,7 @@ /obj/item/weapon/storage/box/survival/fill() ..() - new /obj/item/clothing/mask/breath( src ) + new /obj/item/clothing/mask/gas/alt( src ) new /obj/item/weapon/tank/emergency_oxygen(src) for(var/obj/item/thing in contents) thing.autodrobe_no_remove = 1 @@ -119,7 +119,7 @@ /obj/item/weapon/storage/box/engineer/fill() ..() - new /obj/item/clothing/mask/breath( src ) + new /obj/item/clothing/mask/gas/alt( src ) new /obj/item/weapon/tank/emergency_oxygen/engi( src ) for(var/obj/item/thing in contents) thing.autodrobe_no_remove = 1 diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 6513e315451..ad5e3c45465 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -706,6 +706,7 @@ /obj/item/clothing/head/helmet/augment = 0.1, /obj/item/clothing/mask/balaclava = 1, /obj/item/clothing/mask/gas = 1.5, + /obj/item/clothing/mask/gas/old = 1.0, /obj/item/clothing/mask/gas/cyborg = 0.7, /obj/item/clothing/mask/gas/owl_mask = 0.5, /obj/item/clothing/mask/gas/syndicate = 0.4, diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index ff96e8ea97e..c4697a3e615 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -41,9 +41,9 @@ new /obj/item/airbubble(src) if ("tank") new /obj/item/weapon/tank/emergency_oxygen/engi(src) - new /obj/item/clothing/mask/breath(src) + new /obj/item/clothing/mask/gas/alt(src) new /obj/item/weapon/tank/emergency_oxygen/engi(src) - new /obj/item/clothing/mask/breath(src) + new /obj/item/clothing/mask/gas/alt(src) new /obj/item/device/oxycandle(src) new /obj/item/device/oxycandle(src) new /obj/item/airbubble(src) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 06321fb129f..4ea24f78f93 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -27,6 +27,18 @@ return filtered +/obj/item/clothing/mask/gas/alt + desc = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air. Doesn't seem to mask the face as much as older designs." + flags_inv = HIDEEARS + item_state = "gas_alt_alt" + icon_state = "gas_alt_alt" + +/obj/item/clothing/mask/gas/old + desc = "A face-covering mask that can be connected to an air supply. Seems to be an old, outdated design." + filtered_gases = list("sleeping_agent") + item_state = "gas_mask" + icon_state = "gas_mask" + //Plague Dr suit can be found in clothing/suits/bio.dm /obj/item/clothing/mask/gas/plaguedoctor name = "plague doctor mask" diff --git a/html/changelogs/burgerbb - implementation.yml b/html/changelogs/burgerbb - implementation.yml new file mode 100644 index 00000000000..1043d33f7ef --- /dev/null +++ b/html/changelogs/burgerbb - implementation.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: BurgerBB + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Implements new gasmask sprites and replaces them with the breath mask in emergency boxes as well as some lockers." diff --git a/html/changelogs/dronz - sprites.yml b/html/changelogs/dronz - sprites.yml new file mode 100644 index 00000000000..e8425b78a85 --- /dev/null +++ b/html/changelogs/dronz - sprites.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: DronzTheWolf + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Adds new gas mask sprites." diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 8575387a196..70bd0bc79f4 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi index f9e92f92a97..2df21e7f1ee 100644 Binary files a/icons/mob/species/tajaran/mask.dmi and b/icons/mob/species/tajaran/mask.dmi differ diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/species/unathi/mask.dmi index 09892403a0b..8a0a98c8f60 100644 Binary files a/icons/mob/species/unathi/mask.dmi and b/icons/mob/species/unathi/mask.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index faf8251ba91..52af5fcb6b3 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ