diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 83a85adc5e2..f35d0e7075c 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -87,7 +87,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items ) = 1, list(//equipment - /obj/item/clothing/mask/gas = 1, + /obj/item/clothing/mask/gas/alt = 1, //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas = 1, /obj/item/radio/headset = 1, /obj/item/storage/backpack = 1, /obj/item/clothing/shoes/sneakers/black = 1, diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 2893f17606e..39bd1b1b163 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -285,7 +285,7 @@ /obj/item/clothing/suit/toggle/labcoat/science = 3, /obj/item/clothing/shoes/sneakers/white = 3, /obj/item/radio/headset/headset_sci = 2, - /obj/item/clothing/mask/gas = 3) + /obj/item/clothing/mask/gas/alt = 3) //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas = 3) generate_items_inside(items_inside,src) return 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 f1898e19956..060f9666913 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -65,7 +65,7 @@ ..() new /obj/item/clothing/suit/fire/firefighter(src) - new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/mask/gas/alt(src) //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas(src) new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) new /obj/item/clothing/head/hardhat/red(src) @@ -73,7 +73,7 @@ /obj/structure/closet/firecloset/full/PopulateContents() new /obj/item/clothing/suit/fire/firefighter(src) - new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/mask/gas/alt(src) //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas(src) new /obj/item/flashlight(src) new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) diff --git a/modular_skyrat/master_files/icons/mob/clothing/mask.dmi b/modular_skyrat/master_files/icons/mob/clothing/mask.dmi new file mode 100644 index 00000000000..65d37e6bca5 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/mask.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi b/modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi index c0f1c0f3d72..d93dbc3ba5e 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi and b/modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/masks.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/masks.dmi index 7ffe9192a84..790f37a5cb3 100644 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/masks.dmi and b/modular_skyrat/modules/customization/icons/obj/clothing/masks.dmi differ diff --git a/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm b/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm index ac344b863e5..f29b48967f7 100644 --- a/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm +++ b/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm @@ -11,3 +11,9 @@ desc = "A face-covering mask that can be connected to an air supply. This one doesn't obscure your face however." icon_state = "gas_clear" flags_inv = HIDEEYES + +/obj/item/clothing/mask/gas/alt + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/masks.dmi' + icon_state = "gas_alt2" + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/mask.dmi' +