cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 08:36:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[semi modular][ready]adds the collars to the dorm vendor, two blue gl… (#5530)

Browse Source 
* [semi modular][ready]adds the collars to the dorm vendor, two blue gloves to the medidrobe on request

* ballgags

Co-authored-by: louiseedwardstuart <bonniefluff>
This commit is contained in:
death and coding
2021-05-08 23:44:08 +01:00
committed by GitHub
parent 8cca693252
commit c6c0a5941f
5 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/wardrobes.dm
+1
View File
@@ -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
modular_skyrat/modules/customization/icons/mob/clothing/mask.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

modular_skyrat/modules/customization/icons/obj/clothing/masks.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

modular_skyrat/modules/customization/modules/clothing/masks/breath.dm
+14
View File
@@ -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"
modular_skyrat/modules/nsfw/vendors/code/naughty_vendor.dm
Vendored
+9 -2
View File
@@ -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