diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 43c25084cb5..55b7a18c936 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1058,7 +1058,6 @@ /obj/item/clothing/shoes/singerb = 1,/obj/item/clothing/under/singerb = 1, /obj/item/clothing/suit/hooded/carp_costume = 1,/obj/item/clothing/suit/hooded/bee_costume = 1, /obj/item/clothing/suit/snowman = 1,/obj/item/clothing/head/snowman = 1, - /obj/item/clothing/mask/joy = 1, /obj/item/clothing/head/cueball = 1,/obj/item/clothing/under/scratch = 1) contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1, /obj/item/clothing/mask/balaclava=1, /obj/item/clothing/mask/horsehead = 2) premium = list(/obj/item/clothing/suit/hgpirate = 1, /obj/item/clothing/head/hgpiratecap = 1, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 6e429dd3958..ee0c5ec0fb7 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -139,12 +139,6 @@ w_class = 2 gas_transfer_coefficient = 0.90 -/obj/item/clothing/mask/joy - name = "joy mask" - desc = "Express your happiness or hide your sorrows with this face with tears of joy cutout." - icon_state = "joy" - flags = MASKCOVERSMOUTH - flags_inv = HIDEFACE /obj/item/clothing/mask/pig name = "pig mask" diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index a8dc0d7a0ea..8e37ab08a84 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 e5e658a0d68..8faec500e7b 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ