diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm index 698e6784723..6e3a4189c55 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm @@ -40,6 +40,12 @@ . = ..() update_sprite_suffix() +//Removes ERP organs depending on config +/obj/item/organ/genital/Insert(mob/living/carbon/M, special, drop_if_replaced) + if(CONFIG_GET(flag/disable_erp_preferences)) + return + . = ..() + /obj/item/organ/genital/Remove(mob/living/carbon/M, special = FALSE) . = ..() update_genital_icon_state() @@ -381,6 +387,12 @@ update_body() return +//Removing ERP IC verb depending on config +/mob/living/carbon/human/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + verbs -= /mob/living/carbon/human/verb/toggle_genitals + /mob/living/carbon/human/verb/toggle_arousal() set category = "IC" set name = "Toggle Arousal" @@ -410,3 +422,9 @@ picked_organ.update_sprite_suffix() update_body() return + +//Removing ERP IC verb depending on config +/mob/living/carbon/human/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + verbs -= /mob/living/carbon/human/verb/toggle_arousal diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm b/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm index 4ab6ff13929..7ab333212ca 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm @@ -166,6 +166,12 @@ else to_chat(src, span_warning("You can't cum right now!")) +//Removing ERP IC verb depending on config +/mob/living/carbon/human/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + verbs -= /mob/living/carbon/human/verb/arousal_panel + //////////// ///FLUIDS/// //////////// diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm new file mode 100644 index 00000000000..c5ff57d5c31 --- /dev/null +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm @@ -0,0 +1,229 @@ +/obj/item/storage/box/milking_kit/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/storage/box/xstand_kit/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/storage/box/bdsmbed_kit/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/storage/box/strippole_kit/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/storage/box/shibari_stand/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/paper/shibari_kit_instructions/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/sextoy/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/mask/ballgag/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/reagent_containers/glass/lewd_filter/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/mask/gas/bdsm_mask/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/suit/corset/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/head/domina_cap/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/storage/belt/erpbelt/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/glasses/hypno/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/shoes/dominaheels/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/gloves/ball_mittens/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/gloves/ball_mittens_reinforced/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/suit/straight_jacket/kinky_sleepbag/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/ears/kinky_headphones/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/glasses/blindfold/kinky/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/neck/kink_collar/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/lustwish_discount/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/tickle_feather/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/mask/leatherwhip/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/kinky_shocker/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/condom_pack/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/under/stripper_outfit/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/structure/pole/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/polepack/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/bdsm_bed_kit/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/structure/chair/x_stand/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/x_stand_kit/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/structure/chair/milking_machine/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/milking_machine/constructionkit/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/bdsm_candle/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/spanking_pad/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/restraints/handcuffs/lewd/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/strapon_dildo/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/key/kink_collar/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/mind_controller/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/neck/mind_collar/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/restraints/handcuffs/milker/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/vending_refill/lustwish/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/machinery/vending/dorms/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/structure/bed/bdsm_bed/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL + +/obj/item/clothing/strapon/Initialize() + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + return INITIALIZE_HINT_QDEL diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm b/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm index 33d99110a70..abc447524fa 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm @@ -1021,6 +1021,12 @@ GLOBAL_LIST_INIT(strippable_human_erp_items, create_erp_strippable_list(list( GLOB.strippable_human_items += strippable_items return strippable_items +//Disables ERP strippable inventory depending on config +/datum/element/strippable/Attach(datum/target, list/items, should_strip_proc_path) + . = ..() + if(CONFIG_GET(flag/disable_erp_preferences)) + src.items -= GLOB.strippable_human_erp_items + //////////////////////////////////////////////////////////////////// // EXTENTIONS FOR SPRITE_ACCESSORY IS_HIDDEN CHECKS FOR ERP STUFF // //////////////////////////////////////////////////////////////////// diff --git a/tgstation.dme b/tgstation.dme index 38e21c14888..cddb16c1656 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5375,6 +5375,7 @@ #include "modular_skyrat\modules\modular_items\code\thieving_gloves.dm" #include "modular_skyrat\modules\modular_items\lewd_items\code\arousal_system.dm" #include "modular_skyrat\modules\modular_items\lewd_items\code\lewd_quirks.dm" +#include "modular_skyrat\modules\modular_items\lewd_items\code\lewd_remove_erp_items.dm" #include "modular_skyrat\modules\modular_items\lewd_items\code\technical_stuff_for_lewd.dm" #include "modular_skyrat\modules\modular_items\lewd_items\code\lewd_chemistry\chemistry_for_ERP.dm" #include "modular_skyrat\modules\modular_items\lewd_items\code\lewd_clothing\ballgag.dm"