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

Removes more ERP related items and verbs if ERP is disabled in config (#13011)

Browse Source 
* feat: ERP IC verbs removal depends on config

* feat: ERP strippable removal depending on config

* Revert "feat: ERP IC verbs removal depends on config"

This reverts commit 737e347e845f12be53bc67014e90b9c08750be16.

* feat: ERP IC verbs removal depends on config

* feat: Disables ERP organs depending on config

* feat: Removes ERP items depending on config
This commit is contained in:
larentoun
2022-04-23 14:59:11 +01:00
committed by GitHub
parent d46c6662c1
commit 4b069d7d7c
5 changed files with 260 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm
+18
View File
@@ -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
modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm
+6
View File
@@ -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///
////////////
modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm
+229
View File
@@ -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
modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm
+6
View File
@@ -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 //
////////////////////////////////////////////////////////////////////
tgstation.dme
+1
View File
@@ -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"