diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index a8017631bd..b06636ea2e 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -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 diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 73675257e4..416d0d2383 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -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 = "" diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 9dfb4c76a0..260b124283 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -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, diff --git a/code/modules/vending/kinkmate.dm b/code/modules/vending/kinkmate.dm index c416d87439..df8a4e8a96 100644 --- a/code/modules/vending/kinkmate.dm +++ b/code/modules/vending/kinkmate.dm @@ -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, diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 856fe2149a..e372291939 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 167332b630..53b491cce7 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 535ae0d241..1c596a6a0f 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index b349161f8e..23a2142049 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 72e6e91cfc..e9e8e3939b 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -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 - + diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index a02c98a9f0..2156c9c481 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -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