diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 944c77d3bda..9898e36e02c 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -74,6 +74,7 @@ /obj/item/clothing/head/beret/job/med = 4, //SKYRAT EDIT ADDITION /obj/item/clothing/suit/apron/surgical = 4, /obj/item/clothing/mask/surgical = 4, + /obj/item/clothing/gloves/color/latex/nitrile = 2, //SKYRAT EDIT ADDITION /obj/item/clothing/suit/toggle/labcoat/hospitalgown = 4) //SKYRAT EDIT ADDITION refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe payment_department = ACCOUNT_MED diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/mask.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/mask.dmi index 1ac18a79e49..e0656dba552 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/mask.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/mask.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 ba282456d60..6df9a725f2b 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 7355ff00709..744d08edbc4 100644 --- a/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm +++ b/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm @@ -159,3 +159,17 @@ worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/mask.dmi' icon_state = "gp5_mask" +/obj/item/clothing/mask/muzzle/ball + name = "ballgag" + desc = "I'm pretty fuckin far from okay." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/masks.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/mask.dmi' + icon_state = "ballgag" + +/obj/item/clothing/mask/muzzle/ring + name = "ring gag" + desc = "A mouth wrap seemingly designed to hold the mouth open." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/masks.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/mask.dmi' + icon_state = "ringgag" + diff --git a/modular_skyrat/modules/nsfw/vendors/code/naughty_vendor.dm b/modular_skyrat/modules/nsfw/vendors/code/naughty_vendor.dm index 52e471b9c61..7a064802882 100644 --- a/modular_skyrat/modules/nsfw/vendors/code/naughty_vendor.dm +++ b/modular_skyrat/modules/nsfw/vendors/code/naughty_vendor.dm @@ -21,7 +21,13 @@ /obj/item/clothing/under/misc/poly_bottomless = 4, /obj/item/clothing/under/misc/poly_tanktop = 4, /obj/item/clothing/under/misc/poly_tanktop/female = 4, - /obj/item/clothing/neck/human_petcollar= 8, + /obj/item/clothing/mask/muzzle/ring = 4, + /obj/item/clothing/mask/muzzle/ball = 4, + /obj/item/clothing/neck/human_petcollar = 8, + /obj/item/clothing/neck/human_petcollar/locked/cowcollar = 3, + /obj/item/clothing/neck/human_petcollar/locked/bellcollar = 5, + /obj/item/clothing/neck/human_petcollar/locked/spikecollar = 3, + /obj/item/clothing/neck/human_petcollar/locked/cross = 3, /obj/item/clothing/neck/human_petcollar/choker = 4, /obj/item/restraints/handcuffs/fake = 8, /obj/item/clothing/glasses/blindfold = 8, @@ -43,7 +49,8 @@ premium = list( /obj/item/clothing/under/dress/corset = 4, /obj/item/clothing/under/pants/chaps = 4, - /obj/item/clothing/accessory/skullcodpiece/fake = 4 + /obj/item/clothing/accessory/skullcodpiece/fake = 4, + /obj/item/clothing/neck/human_petcollar/locked/holocollar = 3 ) refill_canister = /obj/item/vending_refill/kink