From d37dfc3f837a1f468f757011faa8f818e81460a2 Mon Sep 17 00:00:00 2001 From: synthtwo <127706731+SynthTwo@users.noreply.github.com> Date: Sun, 11 Aug 2024 21:29:03 +0100 Subject: [PATCH] fix --- code/modules/client/preferences.dm | 1 - .../loadout_items/loadout_datum_belts.dm | 5 - .../loadout_items/loadout_datum_erp.dm | 276 ------------------ .../loadout_items/loadout_datum_gloves.dm | 5 - .../loadout_ui/loadout_outfit_helpers.dm | 42 +-- tgstation.dme | 1 - 6 files changed, 12 insertions(+), 318 deletions(-) delete mode 100644 modular_nova/modules/loadouts/loadout_items/loadout_datum_erp.dm diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 500d5fefcca0..8a882f29ea57 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -176,7 +176,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) tainted_character_profiles = FALSE //NOVA EDIT ADDITION BEGIN data["preview_selection"] = preview_pref - data["erp_pref"] = read_preference(/datum/preference/toggle/master_erp_preferences) data["quirk_points_enabled"] = !CONFIG_GET(flag/disable_quirk_points) data["quirks_balance"] = GetQuirkBalance() data["positive_quirk_count"] = GetPositiveQuirkCount() diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_belts.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_belts.dm index f1f421482bbf..1b199a89eeb1 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_belts.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_belts.dm @@ -66,11 +66,6 @@ name = "White Fannypack" item_path = /obj/item/storage/belt/fannypack/white -/datum/loadout_item/belts/erpbelt - name = "Black Leather Belt" - item_path = /obj/item/storage/belt/erpbelt - erp_item = TRUE - /datum/loadout_item/belts/lantern name = "Lantern" item_path = /obj/item/flashlight/lantern diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_erp.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_erp.dm deleted file mode 100644 index 2c1f3cb7ea5a..000000000000 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_erp.dm +++ /dev/null @@ -1,276 +0,0 @@ -/datum/loadout_category/erp - category_name = "Erotic" - category_ui_icon = FA_ICON_HEART - erp_category = TRUE - type_to_generate = /datum/loadout_item/erp - tab_order = /datum/loadout_category/pocket::tab_order + 1 - -/datum/loadout_category/erp/New() - . = ..() - category_info = "([MAX_ALLOWED_ERP_ITEMS] allowed)" - -/datum/loadout_category/erp/handle_duplicate_entires( - datum/preference_middleware/loadout/manager, - datum/loadout_item/conflicting_item, - datum/loadout_item/added_item, - list/datum/loadout_item/all_loadout_items, -) - var/list/datum/loadout_item/erp/other_items = list() - for(var/datum/loadout_item/erp/other_item in all_loadout_items) - other_items += other_item - - if(length(other_items) >= MAX_ALLOWED_ERP_ITEMS) - manager.deselect_item(other_items[1]) - return TRUE - -/datum/loadout_item/erp/pre_equip_item(datum/outfit/outfit, datum/outfit/outfit_important_for_life, mob/living/carbon/human/equipper, visuals_only = FALSE) - return FALSE - -/datum/loadout_item/erp - abstract_type = /datum/loadout_item/erp - erp_item = TRUE - erp_box = TRUE - -/* -* SEX TOYS -*/ - -/datum/loadout_item/erp/buttplug - name = "Buttplug" - item_path = /obj/item/clothing/sextoy/buttplug - -/datum/loadout_item/erp/clamps - name = "Nipple Clamps" - item_path = /obj/item/clothing/sextoy/nipple_clamps - -/datum/loadout_item/erp/egg - name = "Vibrating Egg" - item_path = /obj/item/clothing/sextoy/eggvib - -/datum/loadout_item/erp/egg/signal - name = "Signal Vibrating Egg" - item_path = /obj/item/clothing/sextoy/eggvib/signalvib - -/datum/loadout_item/erp/signaler - name = "Signaler" - item_path = /obj/item/assembly/signaler - -/datum/loadout_item/erp/vibroring - name = "Vibrating Ring" - item_path = /obj/item/clothing/sextoy/vibroring - -/* -* DILDOS -*/ - -/datum/loadout_item/erp/dildo - name = "Dildo" - item_path = /obj/item/clothing/sextoy/dildo - -/datum/loadout_item/erp/dildo/custom - name = "Custom Dildo" - item_path = /obj/item/clothing/sextoy/dildo/custom_dildo - -/datum/loadout_item/erp/dildo/double - name = "Double Dildo" - item_path = /obj/item/clothing/sextoy/dildo/double_dildo - -/datum/loadout_item/erp/fleshlight - name = "Fleshlight" - item_path = /obj/item/clothing/sextoy/fleshlight - -/datum/loadout_item/erp/magic_wand - name = "Magic Wand" - item_path = /obj/item/clothing/sextoy/magic_wand - -/datum/loadout_item/erp/vibrator - name = "Vibrator" - item_path = /obj/item/clothing/sextoy/vibrator - -/* -* BELT -*/ - -/datum/loadout_item/erp/strapon - name = "Strap-On" - item_path = /obj/item/clothing/strapon - -/* -* MULTI USE -*/ - -/datum/loadout_item/erp/kinky_shocker - name = "Kinky Shocker" - item_path = /obj/item/kinky_shocker - -/datum/loadout_item/erp/whip - name = "Whip" - item_path = /obj/item/clothing/mask/leatherwhip - -/datum/loadout_item/erp/candle - name = "Soy Candle" - item_path = /obj/item/bdsm_candle - -/datum/loadout_item/erp/spanking_pad - name = "Spanking Pad" - item_path = /obj/item/spanking_pad - -/datum/loadout_item/erp/feather - name = "Tickling Feather" - item_path = /obj/item/tickle_feather - -/datum/loadout_item/erp/borg_dom - name = "Borg Dominatrix Module" - item_path = /obj/item/borg/upgrade/dominatrixmodule - -/* -* RESTRAINTS -*/ - -/datum/loadout_item/erp/handcuffs_lewd - name = "Kinky Handcuffs" - item_path = /obj/item/restraints/handcuffs/lewd - -/datum/loadout_item/erp/shibari - name = "Shibari Ropes" - item_path = /obj/item/stack/shibari_rope/full - -/datum/loadout_item/erp/shibari/glow - name = "Glowy Shibari Ropes" - item_path = /obj/item/stack/shibari_rope/glow/full - -/datum/loadout_item/erp/ballgag - name = "Ball Gag" - item_path = /obj/item/clothing/mask/ballgag - -/datum/loadout_item/erp/ballgag/choking - name = "Phallic Ball Gag" - item_path = /obj/item/clothing/mask/ballgag/choking - -/datum/loadout_item/erp/muzzle_ring - name = "Ring Gag" - item_path = /obj/item/clothing/mask/muzzle/ring - -/datum/loadout_item/erp/deprivation_helmet - name = "Deprivation Helmet" - item_path = /obj/item/clothing/head/deprivation_helmet - -/datum/loadout_item/erp/blindfold - name = "Kinky Blindfold" - item_path = /obj/item/clothing/glasses/blindfold/kinky - -/datum/loadout_item/erp/kinky_headphones - name = "Kinky Headphones" - item_path = /obj/item/clothing/ears/kinky_headphones - -/datum/loadout_item/erp/lewd_filter - name = "Crocin Filter" - item_path = /obj/item/reagent_containers/cup/lewd_filter - -/datum/loadout_item/erp/hypno_glasses - name = "Suspicious Glasses" - item_path = /obj/item/clothing/glasses/hypno - -/datum/loadout_item/erp/leash - name = "Leash" - item_path = /obj/item/clothing/erp_leash - -/datum/loadout_item/erp/ball_mittens - name = "Ball Mittens" - item_path = /obj/item/clothing/gloves/ball_mittens - -/datum/loadout_item/erp/collar - name = "Locked Collar" - item_path = /obj/item/clothing/neck/kink_collar/locked - -/datum/loadout_item/erp/collar/shock - name = "Shock Collar" - item_path = /obj/item/electropack/shockcollar - -/datum/loadout_item/erp/collar/mind - name = "Mind Collar" - item_path = /obj/item/clothing/neck/mind_collar - -/datum/loadout_item/erp/collar/pet - name = "Locked Collar (Colorable)" - item_path = /obj/item/clothing/neck/human_petcollar/locked - -/datum/loadout_item/erp/collar/size - name = "Size Collar (Interlink Only)" - item_path = /obj/item/clothing/neck/size_collar - -/datum/loadout_item/erp/collar/key - name = "Collar Key" - item_path = /obj/item/key/collar - -/datum/loadout_item/erp/latex_straight_jacket - name = "Latex Straight Jacket" - item_path = /obj/item/clothing/suit/straight_jacket/latex_straight_jacket - -/datum/loadout_item/erp/shackles - name = "Shackles" - item_path = /obj/item/clothing/suit/straight_jacket/shackles - -/datum/loadout_item/erp/kinky_sleepbag - name = "Latex Sleeping Bag" - item_path = /obj/item/clothing/suit/straight_jacket/kinky_sleepbag - -/datum/loadout_item/erp/libidine - name = "Libidine Contract" - item_path = /obj/item/disk/nifsoft_uploader/dorms/contract - -/* -* CONSUMABLES -*/ - -/datum/loadout_item/erp/condom - name = "Condom Pack" - item_path = /obj/item/condom_pack - -/datum/loadout_item/erp/serviette_pack - name = "Serviette Pack" - item_path = /obj/item/serviette_pack - -/datum/loadout_item/erp/pillow - name = "Fancy Pillow" - item_path = /obj/item/fancy_pillow - -/datum/loadout_item/erp/crocin - name = "Crocin Bottle" - item_path = /obj/item/reagent_containers/cup/bottle/crocin - -/datum/loadout_item/erp/camphor - name = "Camphor Bottle" - item_path = /obj/item/reagent_containers/cup/bottle/camphor - -/datum/loadout_item/erp/hexacrocin - name = "Hexacrocin Bottle" - item_path = /obj/item/reagent_containers/cup/bottle/hexacrocin - -/datum/loadout_item/erp/pentacamphor - name = "Pentacamphor Bottle" - item_path = /obj/item/reagent_containers/cup/bottle/pentacamphor - -/datum/loadout_item/erp/crocin/pill - name = "Crocin Pill" - item_path = /obj/item/reagent_containers/pill/crocin - -/datum/loadout_item/erp/camphor/pill - name = "Camphor Pill" - item_path = /obj/item/reagent_containers/pill/camphor - -/datum/loadout_item/erp/hexacrocin/pill - name = "Hexacrocin Pill" - item_path = /obj/item/reagent_containers/pill/hexacrocin - -/datum/loadout_item/erp/pentacamphor/pill - name = "Pentacamphor Pill" - item_path = /obj/item/reagent_containers/pill/pentacamphor - -/datum/loadout_item/erp/succubus_milk - name = "Succubus Milk Bottle" - item_path = /obj/item/reagent_containers/cup/bottle/succubus_milk - -/datum/loadout_item/erp/incubus_draft - name = "Incubus Draft Bottle" - item_path = /obj/item/reagent_containers/cup/bottle/incubus_draft diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm index 39c13ddfb991..4da4a02a7d3c 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm @@ -97,11 +97,6 @@ name = "Colourable Arm Wraps" item_path = /obj/item/clothing/gloves/bracer/wraps -/datum/loadout_item/gloves/latex - name = "Latex Gloves" - item_path = /obj/item/clothing/gloves/latex_gloves - erp_item = TRUE - /* * RINGS */ diff --git a/modular_nova/modules/loadouts/loadout_ui/loadout_outfit_helpers.dm b/modular_nova/modules/loadouts/loadout_ui/loadout_outfit_helpers.dm index 40b5749870c8..028728e35210 100644 --- a/modular_nova/modules/loadouts/loadout_ui/loadout_outfit_helpers.dm +++ b/modular_nova/modules/loadouts/loadout_ui/loadout_outfit_helpers.dm @@ -46,37 +46,27 @@ var/list/loadout_list = preference_source?.read_preference(/datum/preference/loadout) var/list/loadout_datums = loadout_list_to_datums(loadout_list) var/obj/item/storage/briefcase/empty/briefcase - var/obj/item/storage/box/erp/erpbox - var/erp_enabled = !CONFIG_GET(flag/disable_erp_preferences) if(override_preference == LOADOUT_OVERRIDE_CASE && !visuals_only) briefcase = new(loc) + for(var/datum/loadout_item/item as anything in loadout_datums) - if (erp_enabled && item.erp_box == TRUE) - if (isnull(erpbox)) - erpbox = new(loc) - new item.item_path(erpbox) - else - if (!item.can_be_applied_to(src, preference_source, equipping_job)) - continue - new item.item_path(briefcase) + if (!item.can_be_applied_to(src, preference_source, equipping_job)) + continue + new item.item_path(briefcase) briefcase.name = "[preference_source.read_preference(/datum/preference/name/real_name)]'s travel suitcase" equipOutfit(equipped_outfit, visuals_only) put_in_hands(briefcase) else for(var/datum/loadout_item/item as anything in loadout_datums) - if (erp_enabled && item.erp_box == TRUE) - if (isnull(erpbox)) - erpbox = new(loc) - new item.item_path(erpbox) - else - if (!item.can_be_applied_to(src, preference_source, equipping_job)) - continue - - // Make sure the item is not overriding an important for life outfit item - var/datum/outfit/outfit_important_for_life = dna.species.outfit_important_for_life - if(!outfit_important_for_life || !item.pre_equip_item(equipped_outfit, outfit_important_for_life, src, visuals_only)) - item.insert_path_into_outfit(equipped_outfit, src, visuals_only, override_preference) + if (!item.can_be_applied_to(src, preference_source, equipping_job)) + continue + + // Make sure the item is not overriding an important for life outfit item + var/datum/outfit/outfit_important_for_life = dna.species.outfit_important_for_life + if(!outfit_important_for_life || !item.pre_equip_item(equipped_outfit, outfit_important_for_life, src, visuals_only)) + item.insert_path_into_outfit(equipped_outfit, src, visuals_only, override_preference) + equipOutfit(equipped_outfit, visuals_only) var/list/new_contents = isnull(briefcase) ? get_all_gear() : briefcase.contents @@ -86,8 +76,6 @@ continue var/obj/item/equipped = locate(item.item_path) in new_contents - if (!isnull(erpbox) && item.erp_box) - equipped = locate(item.item_path) in erpbox for(var/atom/equipped_item in new_contents) if(equipped_item.type == item.item_path) equipped = equipped_item @@ -108,12 +96,6 @@ var/obj/item/clothing/under/uniform = w_uniform uniform?.attach_accessory(new /obj/item/clothing/accessory/green_pin(), src, FALSE) - if (!isnull(erpbox)) - if (!isnull(briefcase)) - briefcase.contents += erpbox - else - erpbox.equip_to_best_slot(src) - regenerate_icons() return TRUE diff --git a/tgstation.dme b/tgstation.dme index 348c1beea006..b77f5816a689 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7753,7 +7753,6 @@ #include "modular_nova\modules\loadouts\loadout_items\loadout_datum_accessory.dm" #include "modular_nova\modules\loadouts\loadout_items\loadout_datum_belts.dm" #include "modular_nova\modules\loadouts\loadout_items\loadout_datum_ears.dm" -#include "modular_nova\modules\loadouts\loadout_items\loadout_datum_erp.dm" #include "modular_nova\modules\loadouts\loadout_items\loadout_datum_glasses.dm" #include "modular_nova\modules\loadouts\loadout_items\loadout_datum_gloves.dm" #include "modular_nova\modules\loadouts\loadout_items\loadout_datum_heads.dm"