Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent

maid fetish content pr
This commit is contained in:
silicons
2020-07-21 19:20:52 -07:00
committed by GitHub
10 changed files with 34 additions and 1 deletions

View File

@@ -196,3 +196,15 @@
transfer_prints = FALSE
strip_mod = 5
strip_silence = TRUE
/obj/item/clothing/gloves/evening
name = "evening gloves"
desc = "Thin, pretty gloves intended for use in regal feminine attire, but knowing Space China these are just for some maid fetish."
icon_state = "evening"
item_state = "evening"
strip_delay = 40
equip_delay_other = 20
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
strip_mod = 0.9
custom_price = PRICE_ALMOST_CHEAP

View File

@@ -446,3 +446,10 @@
/obj/item/clothing/head/kepi/old
icon_state = "kepi_old"
desc = "A flat, white circular cap with a visor, that demands some honor from it's wearer."
/obj/item/clothing/head/maid
name = "maid headband"
desc = "Maid in China."
icon_state = "maid"
item_state = "maid"
dynamic_hair_suffix = ""

View File

@@ -84,8 +84,10 @@
/obj/item/clothing/suit/poncho = 1,
/obj/item/clothing/suit/poncho/green = 1,
/obj/item/clothing/suit/poncho/red = 1,
/obj/item/clothing/head/maid = 1,
/obj/item/clothing/under/costume/maid = 1,
/obj/item/clothing/under/rank/civilian/janitor/maid = 1,
/obj/item/clothing/gloves/evening = 1,
/obj/item/clothing/glasses/cold=1,
/obj/item/clothing/glasses/heat=1,
/obj/item/clothing/suit/whitedress = 1,

View File

@@ -6,8 +6,10 @@
product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
vend_reply = "Have fun, you shameless pervert!"
products = list(
/obj/item/clothing/head/maid = 5,
/obj/item/clothing/under/costume/maid = 5,
/obj/item/clothing/under/rank/civilian/janitor/maid = 5,
/obj/item/clothing/gloves/evening = 5,
/obj/item/clothing/neck/petcollar = 5,
/obj/item/clothing/neck/petcollar/choker = 5,
/obj/item/clothing/neck/petcollar/leather = 5,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 KiB

After

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

View File

@@ -3,6 +3,11 @@
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/fingerless
/datum/gear/evening
name = "Evening gloves"
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/evening
/datum/gear/goldring
name = "A gold ring"
category = SLOT_GLOVES
@@ -20,4 +25,4 @@
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/ring/diamond
cost = 4

View File

@@ -48,6 +48,11 @@
category = SLOT_HEAD
path = /obj/item/clothing/head/that
/datum/gear/maidband
name = "Maid headband"
category = SLOT_HEAD
path= /obj/item/clothing/head/maid
/datum/gear/flakhelm
name = "Flak Helmet"
category = SLOT_HEAD