diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index fd850073d88..a6d1e9e48a6 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -20,27 +20,32 @@ /obj/item/clothing/head/pin/pink icon_state = "pinkpin" + addblends = null name = "pink hair hat" /obj/item/clothing/head/pin/clover icon_state = "cloverpin" name = "clover pin" + addblends = null desc = "A hair pin in the shape of a clover leaf." /obj/item/clothing/head/pin/butterfly icon_state = "butterflypin" name = "butterfly pin" + addblends = null desc = "A hair pin in the shape of a bright blue butterfly." /obj/item/clothing/head/pin/magnetic icon_state = "magnetpin" name = "magnetic 'pin'" + addblends = null desc = "Finally, a hair pin even a Morpheus chassis can use." matter = list(DEFAULT_WALL_MATERIAL = 10) /obj/item/clothing/head/pin/flower name = "red flower pin" icon_state = "hairflower" + addblends = null desc = "Smells nice." /obj/item/clothing/head/pin/flower/blue @@ -82,6 +87,7 @@ /obj/item/clothing/head/pin/bow/big/red icon_state = "redribbon" name = "red ribbon" + addblends = null /obj/item/clothing/head/powdered_wig name = "powdered wig" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 0fc1bff7920..63259fc65e8 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -27,6 +27,12 @@ return gas_filtered +/obj/item/clothing/mask/gas/clear + name = "gas mask" + desc = "A face-covering mask with a transparent faceplate that can be connected to an air supply." + icon_state = "gas_clear" + flags_inv = null + /obj/item/clothing/mask/gas/half name = "face mask" desc = "A compact, durable gas mask that can be connected to an air supply." diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 1965a5873ac..2dbda7a6151 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -78,7 +78,7 @@ name = "Radiation Hood" icon_state = "rad" desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation" -// flags_inv = BLOCKHAIR + flags_inv = BLOCKHAIR item_flags = THICKMATERIAL body_parts_covered = HEAD|FACE|EYES armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100) diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index cf2530e2192..1df73dc1116 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index d1c15d8b614..e99e3a5d364 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/spacesuit.dmi b/icons/mob/spacesuit.dmi index 42184eff115..188593823ef 100644 Binary files a/icons/mob/spacesuit.dmi and b/icons/mob/spacesuit.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index f31ee294903..e45ec909331 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 9e50b538ac9..a3daa966cf9 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 8d0e7de5e87..164a90c0c16 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ