diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index 5dd3a1fb299..fd4d6e08dbd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -94,3 +94,15 @@ /datum/gear/mask/wrestling/New() gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/mask/masquerade + display_name = "masquerade mask selection" + path = /obj/item/clothing/mask/masquerade + +/datum/gear/mask/masquerade/New() + ..() + var/list/masks = list() + for(var/mask in typesof(/obj/item/clothing/mask/masquerade)) + var/obj/item/clothing/mask/mask_type = mask + masks[initial(mask_type.name)] = mask_type + gear_tweaks += new/datum/gear_tweak/path(sortTim(masks, GLOBAL_PROC_REF(cmp_text_asc))) diff --git a/code/modules/clothing/masks/masquerade_mask.dm b/code/modules/clothing/masks/masquerade_mask.dm new file mode 100644 index 00000000000..5d7e060769f --- /dev/null +++ b/code/modules/clothing/masks/masquerade_mask.dm @@ -0,0 +1,24 @@ + +//Sprites and code ported from Nova Sector +//Sprites licensed under CC 3.0 BY-SA +/obj/item/clothing/mask/masquerade + name = "masquerade mask" + desc = "You'll never guess who's under that mask, it's the perfect disguise!" + flags_inv = HIDEFACE + icon_state = "masquerade" + + +/obj/item/clothing/mask/masquerade/feathered + name = "feathered masquerade mask" + desc = "You'll never guess who's under that mask, it's the perfect disguise! This one even has a feather, to make it fancier!" + icon_state = "masquerade_feather" + +/obj/item/clothing/mask/masquerade/two_colors + name = "split masquerade mask" + desc = "You'll never guess who's under that mask, it's the perfect disguise! There's even two colors, to add to the confusion!" + icon_state = "masquerade_twotone" + +/obj/item/clothing/mask/masquerade/two_colors/feathered + name = "feathered split masquerade mask" + desc = "You'll never guess who's under that mask, it's the perfect disguise! There's even two colors AND a feather, making it the most fancy masquerade mask yet!" + icon_state = "masquerade_twotonefeather" diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index c51d0f06bac..d6ba7092c9c 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -1466,6 +1466,10 @@ /obj/item/clothing/mask/gas/plaguedoctor/fluff = 3, /obj/item/clothing/under/owl = 3, /obj/item/clothing/mask/gas/owl_mask = 3, + /obj/item/clothing/mask/masquerade = 3, + /obj/item/clothing/mask/masquerade/feathered = 3, + /obj/item/clothing/mask/masquerade/two_colors = 3, + /obj/item/clothing/mask/masquerade/two_colors/feathered = 3, /obj/item/clothing/under/waiter = 3, /obj/item/clothing/suit/storage/apron = 3, /obj/item/clothing/under/pirate = 3, @@ -1552,6 +1556,10 @@ /obj/item/clothing/mask/gas/plaguedoctor/fluff = 600, /obj/item/clothing/under/owl = 400, /obj/item/clothing/mask/gas/owl_mask = 400, + /obj/item/clothing/mask/masquerade = 100, + /obj/item/clothing/mask/masquerade/feathered = 100, + /obj/item/clothing/mask/masquerade/two_colors = 100, + /obj/item/clothing/mask/masquerade/two_colors/feathered = 100, /obj/item/clothing/under/waiter = 100, /obj/item/clothing/suit/storage/apron = 200, /obj/item/clothing/under/pirate = 300, diff --git a/icons/inventory/face/item.dmi b/icons/inventory/face/item.dmi index 349b03df956..19e1a65dceb 100644 Binary files a/icons/inventory/face/item.dmi and b/icons/inventory/face/item.dmi differ diff --git a/icons/inventory/face/mob.dmi b/icons/inventory/face/mob.dmi index 028fb01ba65..8ce692c6b61 100644 Binary files a/icons/inventory/face/mob.dmi and b/icons/inventory/face/mob.dmi differ diff --git a/vorestation.dme b/vorestation.dme index b5f6da73fa1..f37b7dee1df 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2537,6 +2537,7 @@ #include "code\modules\clothing\masks\gasmask.dm" #include "code\modules\clothing\masks\gasmask_vr.dm" #include "code\modules\clothing\masks\hailer.dm" +#include "code\modules\clothing\masks\masquerade_mask.dm" #include "code\modules\clothing\masks\miscellaneous.dm" #include "code\modules\clothing\masks\miscellaneous_vr.dm" #include "code\modules\clothing\masks\shiny_vr.dm"