From ae8fba14fab4f9bb4cb1cb3e9d14525914b13e6d Mon Sep 17 00:00:00 2001 From: Minty <120209597+MintyPhresh@users.noreply.github.com> Date: Mon, 23 Mar 2026 08:17:15 -0400 Subject: [PATCH] Adds "Lewd Toys" section to loadout, as well as 6 clothing items (#5367) ## About The Pull Request Adds the following items to a new subcategory in the Toys category of the loadout: - Buttplug - Corset - Deprivation Helmet - Dildo - Fleshlight - Hypno Goggles - Latex Gas Mask - Leash - Leather Whip - MOD Hypnotic Visor Module - Shibari Ropes - Strapon - Venom Milker I didn't add more than this because I got lazy and didn't wanna do the rest. Figured this would be a decent spread, but if you hit that like button, subscribe, and comment down below what YOU want to see next, I will add it when I get the chance. Also adds the following clothing items to their respective slots: - Latex Maid Apron - Misc. Accessories - Latex Gloves - Gloves - Stripper Outfit - Under - Latex Maid Costume - Under - Ballet Heels - Formal Shoes - Latex Socks - Shoes Also fixes a runtime where people starting with the hypnogoggles would try to unequip the goggles from nothing. ## Why It's Good For The Game - Provides certain cosmetics for free that you'd otherwise have to pay for or latejoin and hit the free interlink lustwish for. - Streamlines ERP by making some items available without having to stop for supplies. ## Why It's Bad For The Game - People might get flashbanged by the dildos and stuff while browsing for toys. If this is something we think we should be concerned about, I'd need help implementing some sort of hide feature for the tab. - Increased availability of ERP items will make it easier to be obnoxious with these items. I have no proposed solution for this. ## Proof Of Testing image ## Changelog :cl: add: 13 Lewd toys and 6 clothes items added to the loadout. /:cl: --- .../code/lewd_clothing/hypnogoggles.dm | 2 + .../modules/loadout/categories/accessories.dm | 4 ++ .../code/modules/loadout/categories/gloves.dm | 3 + .../code/modules/loadout/categories/shoes.dm | 8 +++ .../code/modules/loadout/categories/toys.dm | 56 +++++++++++++++++++ .../code/modules/loadout/categories/under.dm | 10 +++- 6 files changed, 80 insertions(+), 3 deletions(-) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm index da17f505de3..2dae63afbe2 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm @@ -34,6 +34,8 @@ /obj/item/clothing/glasses/hypno/dropped(mob/user)//Removing hypnosis on unequip . = ..() + if(!victim) //prevents a runtime where it tries to unequip from a nonexistent victim + return if(!(victim.glasses == src)) return victim.cure_trauma_type(/datum/brain_trauma/very_special/induced_hypnosis, TRAUMA_RESILIENCE_MAGIC) diff --git a/modular_zubbers/code/modules/loadout/categories/accessories.dm b/modular_zubbers/code/modules/loadout/categories/accessories.dm index c8b9cf91e0e..5213887025b 100644 --- a/modular_zubbers/code/modules/loadout/categories/accessories.dm +++ b/modular_zubbers/code/modules/loadout/categories/accessories.dm @@ -29,6 +29,10 @@ name = "Purple Armband" item_path = /obj/item/clothing/accessory/armband/science/nonsec +/datum/loadout_item/accessory/lewdapron + name = "Latex Maid Apron" + item_path = /obj/item/clothing/accessory/lewdapron + //No red armband for obvious reasons. /* diff --git a/modular_zubbers/code/modules/loadout/categories/gloves.dm b/modular_zubbers/code/modules/loadout/categories/gloves.dm index 5ec0f9b1579..008de7be62b 100644 --- a/modular_zubbers/code/modules/loadout/categories/gloves.dm +++ b/modular_zubbers/code/modules/loadout/categories/gloves.dm @@ -173,3 +173,6 @@ item_path = /obj/item/clothing/gloves/ring/hypno/bippys ckeywhitelist = list("bippys") +/datum/loadout_item/gloves/latex_gloves + name = "Latex Gloves" + item_path = /obj/item/clothing/gloves/latex_gloves diff --git a/modular_zubbers/code/modules/loadout/categories/shoes.dm b/modular_zubbers/code/modules/loadout/categories/shoes.dm index eb893542357..0bdfaaf879b 100644 --- a/modular_zubbers/code/modules/loadout/categories/shoes.dm +++ b/modular_zubbers/code/modules/loadout/categories/shoes.dm @@ -219,6 +219,10 @@ name = "Latex Heels" item_path = /obj/item/clothing/shoes/latex_heels +/datum/loadout_item/shoes/formal/latex_heels/ballet_heels + name = "Ballet Heels" + item_path = /obj/item/clothing/shoes/latex_heels/ballet_heels + //Casual /datum/loadout_item/shoes/casual @@ -287,6 +291,10 @@ name = "Frosty Boots" item_path = /obj/item/clothing/shoes/jackbros +/datum/loadout_item/shoes/fun/latex_socks + name = "Latex Socks" + item_path = /obj/item/clothing/shoes/latex_socks + /* * SEASONAL */ diff --git a/modular_zubbers/code/modules/loadout/categories/toys.dm b/modular_zubbers/code/modules/loadout/categories/toys.dm index 4e7212fcacd..5a06ed12bc3 100644 --- a/modular_zubbers/code/modules/loadout/categories/toys.dm +++ b/modular_zubbers/code/modules/loadout/categories/toys.dm @@ -142,5 +142,61 @@ /datum/loadout_item/toys/plush/myrthel_plush name = "Extra Hot Moth Plush" item_path = /obj/item/toy/plush/myrthel_plush +/* +* SEX TOYS AND OTHER STUFF THAT NEEDS PREFS TO USE (otherwise fails to render on the character preview) +*/ +/datum/loadout_item/toys/lewd + group = "Lewd Toys" + abstract_type = /datum/loadout_item/toys/lewd +/datum/loadout_item/toys/lewd/corset + name = "Corset" + item_path = /obj/item/clothing/suit/corset +/datum/loadout_item/toys/lewd/hypno + name = "Hypnotic Goggles" + item_path = /obj/item/clothing/glasses/hypno + +/datum/loadout_item/toys/lewd/deprivation_helmet + name = "Deprivation Helmet" + item_path = /obj/item/clothing/head/deprivation_helmet + +/datum/loadout_item/toys/lewd/bdsm_mask + name = "Latex Gas Mask" + item_path = /obj/item/clothing/mask/gas/bdsm_mask + +/datum/loadout_item/toys/lewd/hypno_visor + name = "MOD Hypnotic Visor Module" + item_path = /obj/item/mod/module/hypno_visor + +/datum/loadout_item/toys/lewd/erp_leash + name = "Leash" + item_path = /obj/item/clothing/erp_leash + +/datum/loadout_item/toys/lewd/shibari_rope + name = "Shibari Ropes" + item_path = /obj/item/stack/shibari_rope + +/datum/loadout_item/toys/lewd/dildo + name = "Dildo" + item_path = /obj/item/clothing/sextoy/dildo + +/datum/loadout_item/toys/lewd/fleshlight + name = "Fleshlight" + item_path = /obj/item/clothing/sextoy/fleshlight + +/datum/loadout_item/toys/lewd/buttplug + name = "Buttplug" + item_path = /obj/item/clothing/sextoy/buttplug + +/datum/loadout_item/toys/lewd/leatherwhip + name = "Leather Whip" + item_path = /obj/item/clothing/mask/leatherwhip + +/datum/loadout_item/toys/lewd/venom_milker + name = "Venom Siphon" + item_path = /obj/item/reagent_containers/venom_milker + +/datum/loadout_item/toys/lewd/strapon + name = "Strapon" + item_path = /obj/item/clothing/strapon diff --git a/modular_zubbers/code/modules/loadout/categories/under.dm b/modular_zubbers/code/modules/loadout/categories/under.dm index d1416c0c13a..a28798a5462 100644 --- a/modular_zubbers/code/modules/loadout/categories/under.dm +++ b/modular_zubbers/code/modules/loadout/categories/under.dm @@ -141,6 +141,10 @@ name = "Red and White Collared Suit" item_path = /obj/item/clothing/under/red_and_white_collared_outfit -/datum/loadout_item/uniform/miscellaneous/midnightdress - name = "Midnight Gown" - item_path = /obj/item/clothing/under/dress/bubber/midnight_gown +/datum/loadout_item/uniform/miscellaneous/lewdmaid + name = "Latex Maid Costume" + item_path = /obj/item/clothing/under/costume/lewdmaid + +/datum/loadout_item/uniform/miscellaneous/stripper_outfit + name = "Stripper Outfit" + item_path = /obj/item/clothing/under/stripper_outfit