diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 438e456c9dc..769f1644e8d 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -14,6 +14,50 @@ "Vox" = 'icons/mob/species/vox/mask.dmi' ) +// **** Welding gas mask **** + +/obj/item/clothing/mask/gas/welding + name = "welding mask" + desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd." + icon_state = "weldingmask" + item_state = "weldingmask" + m_amt = 3000 + g_amt = 1000 + var/up = 0 + flash_protect = 2 + tint = 2 + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + origin_tech = "materials=2;engineering=2" + action_button_name = "Toggle Welding Helmet" + +/obj/item/clothing/mask/gas/welding/attack_self() + toggle() + + +/obj/item/clothing/mask/gas/welding/verb/toggle() + set category = "Object" + set name = "Adjust welding mask" + set src in usr + + if(usr.canmove && !usr.stat && !usr.restrained()) + if(src.up) + src.up = !src.up + src.flags |= (MASKCOVERSEYES) + flags_inv |= (HIDEEYES) + icon_state = initial(icon_state) + usr << "You flip the [src] down to protect your eyes." + flash_protect = 2 + tint = 2 + else + src.up = !src.up + src.flags &= ~(MASKCOVERSEYES) + flags_inv &= ~(HIDEEYES) + icon_state = "[initial(icon_state)]up" + usr << "You push the [src] up out of your face." + flash_protect = 0 + tint = 0 + usr.update_inv_wear_mask() //so our mob-overlays update + //Bane gas mask /obj/item/clothing/mask/banemask name = "bane mask" diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm index 71d47e0012d..10a6a18ee31 100644 --- a/code/modules/research/designs/equipment_designs.dm +++ b/code/modules/research/designs/equipment_designs.dm @@ -89,4 +89,14 @@ build_type = PROTOLATHE materials = list("$metal" = 4000, "$bananium" = 1000) build_path = /obj/item/weapon/bikehorn/airhorn + category = list("Equipment") + +/datum/design/welding_mask + name = "Welding Gas Mask" + desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd." + id = "weldingmask" + req_tech = list("materials" = 2, "engineering" = 2) + build_type = PROTOLATHE + materials = list("$metal" = 4000, "$glass" = 1000) + build_path = /obj/item/clothing/mask/gas/welding category = list("Equipment") \ No newline at end of file diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 056771e3ea3..8cd0536ff84 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 09247ec05ea..5c9b9bd9050 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ