From 37afcb50045fc8f2a22956be5426b18f1f8b6e88 Mon Sep 17 00:00:00 2001 From: Waterpig Date: Tue, 2 Jul 2024 18:17:39 +0200 Subject: [PATCH] Loadout update fixes 1 --- code/_globalvars/traits/_traits.dm | 8 ++ .../code/modules/loadout/categories/pocket.dm | 82 ------------------- .../objects/structures/flags/signs_flags.dm | 2 - .../modules/loadout/categories/accessories.dm | 1 + .../code/modules/loadout/categories/ears.dm | 1 + .../categories/glasses.dm} | 0 .../categories/gloves.dm} | 0 .../categories/heads.dm} | 0 .../categories/inhands.dm} | 0 .../categories/masks.dm} | 0 .../categories/neck.dm} | 0 .../categories/pocket.dm} | 36 +++++++- .../categories/shoes.dm} | 0 .../categories/suit.dm} | 0 .../categories/toys.dm} | 0 .../categories/under.dm} | 0 .../categories}/~donator/donator_personal.dm | 0 .../overrides/loadout_items/loadout_datum.dm | 0 tgstation.dme | 26 +++--- 19 files changed, 55 insertions(+), 101 deletions(-) create mode 100644 modular_zubbers/code/modules/loadout/categories/accessories.dm create mode 100644 modular_zubbers/code/modules/loadout/categories/ears.dm rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_glasses.dm => loadout/categories/glasses.dm} (100%) rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_gloves.dm => loadout/categories/gloves.dm} (100%) rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_heads.dm => loadout/categories/heads.dm} (100%) rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_inhands.dm => loadout/categories/inhands.dm} (100%) rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_masks.dm => loadout/categories/masks.dm} (100%) rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_neck.dm => loadout/categories/neck.dm} (100%) rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_pocket.dm => loadout/categories/pocket.dm} (83%) rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_shoes.dm => loadout/categories/shoes.dm} (100%) rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_suit.dm => loadout/categories/suit.dm} (100%) rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_toys.dm => loadout/categories/toys.dm} (100%) rename modular_zubbers/code/modules/{loadouts/loadout_items/loadout_datum_under.dm => loadout/categories/under.dm} (100%) rename modular_zubbers/code/modules/{loadouts/loadout_items => loadout/categories}/~donator/donator_personal.dm (100%) rename modular_zubbers/code/modules/{loadouts => loadout}/overrides/loadout_items/loadout_datum.dm (100%) diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 6f4bbf8aa8b4b..05e72b3ace1d3 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -139,6 +139,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_BALD" = TRAIT_BALD, "TRAIT_BALLOON_SUTRA" = TRAIT_BALLOON_SUTRA, "TRAIT_BATON_RESISTANCE" = TRAIT_BATON_RESISTANCE, + "TRAIT_BEAST_EMPATHY" = TRAIT_BEAST_EMPATHY, "TRAIT_BEING_BLADE_SHIELDED" = TRAIT_BEING_BLADE_SHIELDED, "TRAIT_BLOB_ALLY" = TRAIT_BLOB_ALLY, "TRAIT_BLOCK_SHUTTLE_MOVEMENT" = TRAIT_BLOCK_SHUTTLE_MOVEMENT, @@ -209,6 +210,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_EXAMINE_FISHING_SPOT" = TRAIT_EXAMINE_FISHING_SPOT, "TRAIT_EXAMINE_FITNESS" = TRAIT_EXAMINE_FITNESS, "TRAIT_EXPANDED_FOV" = TRAIT_EXPANDED_FOV, + "TRAIT_EXPERT_FISHER" = TRAIT_EXPERT_FISHER, "TRAIT_EXTROVERT" = TRAIT_EXTROVERT, "TRAIT_FAKEDEATH" = TRAIT_FAKEDEATH, "TRAIT_FASTMED" = TRAIT_FASTMED, @@ -418,6 +420,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_ROCK_METAMORPHIC" = TRAIT_ROCK_METAMORPHIC, "TRAIT_ROCK_STONER" = TRAIT_ROCK_STONER, "TRAIT_ROD_SUPLEX" = TRAIT_ROD_SUPLEX, + "TRAIT_ROUGHRIDER" = TRAIT_ROUGHRIDER, "TRAIT_SABRAGE_PRO" = TRAIT_SABRAGE_PRO, "TRAIT_SACRIFICED" = TRAIT_SACRIFICED, "TRAIT_SECURITY_HUD" = TRAIT_SECURITY_HUD, @@ -450,7 +453,9 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_STIMULATED" = TRAIT_STIMULATED, "TRAIT_STRONG_GRABBER" = TRAIT_STRONG_GRABBER, "TRAIT_STRONG_STOMACH" = TRAIT_STRONG_STOMACH, + "TRAIT_STUBBY_BODY" = TRAIT_STUBBY_BODY, "TRAIT_STUNIMMUNE" = TRAIT_STUNIMMUNE, + "TRAIT_STURDY_FRAME" = TRAIT_STURDY_FRAME, "TRAIT_SUCCUMB_OVERRIDE" = TRAIT_SUCCUMB_OVERRIDE, "TRAIT_SUICIDED" = TRAIT_SUICIDED, "TRAIT_SUPERMATTER_SOOTHER" = TRAIT_SUPERMATTER_SOOTHER, @@ -551,6 +556,9 @@ GLOBAL_LIST_INIT(traits_by_type, list( ), /obj/item/bodypart = list( "TRAIT_PARALYSIS" = TRAIT_PARALYSIS, + /obj/item/bodypart = list( + "TRAIT_EASY_ATTACH" = TRAIT_EASY_ATTACH, + ), ), /obj/item/card/id = list( "TRAIT_JOB_FIRST_ID_CARD" = TRAIT_JOB_FIRST_ID_CARD, diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/pocket.dm b/modular_skyrat/master_files/code/modules/loadout/categories/pocket.dm index 67087ff72cc25..8da5c716ce3a3 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/pocket.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/pocket.dm @@ -1,85 +1,3 @@ -/* -* LOADOUT ITEM DATUMS FOR BACKPACK/POCKET SLOTS -*/ - -/// Pocket items (Moved to backpack) -GLOBAL_LIST_INIT(loadout_pocket_items, generate_loadout_items(/datum/loadout_item/pocket_items)) - -/datum/loadout_item/pocket_items - category = LOADOUT_ITEM_MISC - -/datum/loadout_item/pocket_items/pre_equip_item(datum/outfit/outfit, datum/outfit/outfit_important_for_life, mob/living/carbon/human/equipper, visuals_only = FALSE) // these go in the backpack - return FALSE - -// The wallet loadout item is special, and puts the player's ID and other small items into it on initialize (fancy!) -/datum/loadout_item/pocket_items/wallet - name = "Wallet" - item_path = /obj/item/storage/wallet - additional_tooltip_contents = list("FILLS AUTOMATICALLY - This item will populate itself with your ID card and other small items you may have on spawn.") - -// We add our wallet manually, later, so no need to put it in any outfits. -/datum/loadout_item/pocket_items/wallet/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only) - return FALSE - -// We didn't spawn any item yet, so nothing to call here. -/datum/loadout_item/pocket_items/wallet/on_equip_item(datum/preferences/preference_source, mob/living/carbon/human/equipper, visuals_only) - return FALSE - -// We add our wallet at the very end of character initialization (after quirks, etc) to ensure the backpack / their ID is all set by now. -/datum/loadout_item/pocket_items/wallet/post_equip_item(datum/preferences/preference_source, mob/living/carbon/human/equipper) - var/obj/item/card/id/advanced/id_card = equipper.get_item_by_slot(ITEM_SLOT_ID) - if(istype(id_card, /obj/item/storage/wallet)) - return - - var/obj/item/storage/wallet/wallet = new(equipper) - if(istype(id_card)) - equipper.temporarilyRemoveItemFromInventory(id_card, force = TRUE) - equipper.equip_to_slot_if_possible(wallet, ITEM_SLOT_ID, initial = TRUE) - id_card.forceMove(wallet) - - if(equipper.back) - var/list/backpack_stuff = equipper.back.atom_storage?.return_inv(FALSE) - for(var/obj/item/thing in backpack_stuff) - if(wallet.contents.len >= 3) - break - if(thing.w_class <= WEIGHT_CLASS_SMALL) - wallet.atom_storage.attempt_insert(src, thing, equipper, TRUE, FALSE) - else - if(!equipper.equip_to_slot_if_possible(wallet, slot = ITEM_SLOT_BACKPACK, initial = TRUE)) - wallet.forceMove(equipper.drop_location()) - -/* -* LUNCHBOX -*/ - -/datum/loadout_item/pocket_items/lunchbox_nanotrasen - name = "Nanotrasen Lunchbox" - item_path = /obj/item/storage/lunchbox/nanotrasen - -/datum/loadout_item/pocket_items/lunchbox_medical - name = "Medical Lunchbox" - item_path = /obj/item/storage/lunchbox/medical - -/datum/loadout_item/pocket_items/lunchbox_bunny - name = "Bunny Lunchbox" - item_path = /obj/item/storage/lunchbox/bunny - -/datum/loadout_item/pocket_items/lunchbox_corgi - name = "Corgi Lunchbox" - item_path = /obj/item/storage/lunchbox/corgi - -/datum/loadout_item/pocket_items/lunchbox_heart - name = "Heart Lunchbox" - item_path = /obj/item/storage/lunchbox/heart - -/datum/loadout_item/pocket_items/lunchbox_safetymoth - name = "Safety Moth Lunchbox" - item_path = /obj/item/storage/lunchbox/safetymoth - -/datum/loadout_item/pocket_items/lunchbox_amongus - name = "Suspicious Red Lunchbox" - item_path = /obj/item/storage/lunchbox/amongus - /* * GUM */ diff --git a/modular_zubbers/code/game/objects/structures/flags/signs_flags.dm b/modular_zubbers/code/game/objects/structures/flags/signs_flags.dm index 4dd078c3d327d..b04e033424b87 100644 --- a/modular_zubbers/code/game/objects/structures/flags/signs_flags.dm +++ b/modular_zubbers/code/game/objects/structures/flags/signs_flags.dm @@ -14,7 +14,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/galfed, 32) desc = "The flag of the Tizirian Empire. The large red sun in the middle is a traditional Tizirian symbol representing their main deity, Aola." icon = 'modular_zubbers/icons/obj/flags.dmi' icon_state = "flag_tizira" - item_flag = /obj/item/sign/flag/tizira /obj/structure/sign/flag/terragov name = "flag of the Solarian State" @@ -32,7 +31,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/galfed, 32) desc = "The folded flag of the Tizirian Empire." icon = 'modular_zubbers/icons/obj/flags.dmi' icon_state = "folded_tizira" - sign_path = /obj/structure/sign/flag/tizira /obj/item/sign/flag/terragov name = "folded flag of the Solarian State" diff --git a/modular_zubbers/code/modules/loadout/categories/accessories.dm b/modular_zubbers/code/modules/loadout/categories/accessories.dm new file mode 100644 index 0000000000000..b9ea3b8693650 --- /dev/null +++ b/modular_zubbers/code/modules/loadout/categories/accessories.dm @@ -0,0 +1 @@ +// THIS IS WHERE LOADOUT DATUMS GO FOR ACCESSORIES (REMOVE THIS COMMENT AND TICK THIS FILE IF YOU ADD ANYTHING) diff --git a/modular_zubbers/code/modules/loadout/categories/ears.dm b/modular_zubbers/code/modules/loadout/categories/ears.dm new file mode 100644 index 0000000000000..fd19e335a2217 --- /dev/null +++ b/modular_zubbers/code/modules/loadout/categories/ears.dm @@ -0,0 +1 @@ +// THIS IS WHERE LOADOUT DATUMS GO FOR EARS (REMOVE THIS COMMENT AND TICK THIS FILE IF YOU ADD ANYTHING) diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_glasses.dm b/modular_zubbers/code/modules/loadout/categories/glasses.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_glasses.dm rename to modular_zubbers/code/modules/loadout/categories/glasses.dm diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_gloves.dm b/modular_zubbers/code/modules/loadout/categories/gloves.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_gloves.dm rename to modular_zubbers/code/modules/loadout/categories/gloves.dm diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_heads.dm b/modular_zubbers/code/modules/loadout/categories/heads.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_heads.dm rename to modular_zubbers/code/modules/loadout/categories/heads.dm diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_inhands.dm b/modular_zubbers/code/modules/loadout/categories/inhands.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_inhands.dm rename to modular_zubbers/code/modules/loadout/categories/inhands.dm diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_masks.dm b/modular_zubbers/code/modules/loadout/categories/masks.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_masks.dm rename to modular_zubbers/code/modules/loadout/categories/masks.dm diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_neck.dm b/modular_zubbers/code/modules/loadout/categories/neck.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_neck.dm rename to modular_zubbers/code/modules/loadout/categories/neck.dm diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_pocket.dm b/modular_zubbers/code/modules/loadout/categories/pocket.dm similarity index 83% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_pocket.dm rename to modular_zubbers/code/modules/loadout/categories/pocket.dm index fc708a0f72bfe..2df1527444ef5 100644 --- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_pocket.dm +++ b/modular_zubbers/code/modules/loadout/categories/pocket.dm @@ -102,10 +102,6 @@ name = "Folded Galactic Federation Flag" item_path = /obj/item/sign/flag/galfed -/datum/loadout_item/pocket_items/flag_moghes //sprites by Crumpaloo - name = "Folded Tizirian Empire Flag" - item_path = /obj/item/sign/flag/tizira - /* * NIF LENSES */ @@ -143,3 +139,35 @@ name = "Meson Scrying Lens Disk" item_path = /obj/item/disk/nifsoft_uploader/meson_hud restricted_roles = list(JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_CUSTOMS_AGENT, JOB_CHIEF_ENGINEER, JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEERING_GUARD) + +/* +* LUNCHBOX +*/ + +/datum/loadout_item/pocket_items/lunchbox_nanotrasen + name = "Nanotrasen Lunchbox" + item_path = /obj/item/storage/lunchbox/nanotrasen + +/datum/loadout_item/pocket_items/lunchbox_medical + name = "Medical Lunchbox" + item_path = /obj/item/storage/lunchbox/medical + +/datum/loadout_item/pocket_items/lunchbox_bunny + name = "Bunny Lunchbox" + item_path = /obj/item/storage/lunchbox/bunny + +/datum/loadout_item/pocket_items/lunchbox_corgi + name = "Corgi Lunchbox" + item_path = /obj/item/storage/lunchbox/corgi + +/datum/loadout_item/pocket_items/lunchbox_heart + name = "Heart Lunchbox" + item_path = /obj/item/storage/lunchbox/heart + +/datum/loadout_item/pocket_items/lunchbox_safetymoth + name = "Safety Moth Lunchbox" + item_path = /obj/item/storage/lunchbox/safetymoth + +/datum/loadout_item/pocket_items/lunchbox_amongus + name = "Suspicious Red Lunchbox" + item_path = /obj/item/storage/lunchbox/amongus diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm b/modular_zubbers/code/modules/loadout/categories/shoes.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm rename to modular_zubbers/code/modules/loadout/categories/shoes.dm diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_zubbers/code/modules/loadout/categories/suit.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_suit.dm rename to modular_zubbers/code/modules/loadout/categories/suit.dm diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm b/modular_zubbers/code/modules/loadout/categories/toys.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm rename to modular_zubbers/code/modules/loadout/categories/toys.dm diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm b/modular_zubbers/code/modules/loadout/categories/under.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm rename to modular_zubbers/code/modules/loadout/categories/under.dm diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/~donator/donator_personal.dm b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/loadout_items/~donator/donator_personal.dm rename to modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm diff --git a/modular_zubbers/code/modules/loadouts/overrides/loadout_items/loadout_datum.dm b/modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm similarity index 100% rename from modular_zubbers/code/modules/loadouts/overrides/loadout_items/loadout_datum.dm rename to modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm diff --git a/tgstation.dme b/tgstation.dme index 29723ab8fa4f2..61ec8517b0597 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8762,19 +8762,19 @@ #include "modular_zubbers\code\modules\languages\vampiric.dm" #include "modular_zubbers\code\modules\lewd_machinery\lustwish.dm" #include "modular_zubbers\code\modules\liquids\height_floors.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_glasses.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_gloves.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_heads.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_inhands.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_masks.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_neck.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_pocket.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_shoes.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_suit.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_toys.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_under.dm" -#include "modular_zubbers\code\modules\loadouts\loadout_items\~donator\donator_personal.dm" -#include "modular_zubbers\code\modules\loadouts\overrides\loadout_items\loadout_datum.dm" +#include "modular_zubbers\code\modules\loadout\categories\glasses.dm" +#include "modular_zubbers\code\modules\loadout\categories\gloves.dm" +#include "modular_zubbers\code\modules\loadout\categories\heads.dm" +#include "modular_zubbers\code\modules\loadout\categories\inhands.dm" +#include "modular_zubbers\code\modules\loadout\categories\masks.dm" +#include "modular_zubbers\code\modules\loadout\categories\neck.dm" +#include "modular_zubbers\code\modules\loadout\categories\pocket.dm" +#include "modular_zubbers\code\modules\loadout\categories\shoes.dm" +#include "modular_zubbers\code\modules\loadout\categories\suit.dm" +#include "modular_zubbers\code\modules\loadout\categories\toys.dm" +#include "modular_zubbers\code\modules\loadout\categories\under.dm" +#include "modular_zubbers\code\modules\loadout\categories\~donator\donator_personal.dm" +#include "modular_zubbers\code\modules\loadout\overrides\loadout_items\loadout_datum.dm" #include "modular_zubbers\code\modules\lunchbox\code\lunchbox.dm" #include "modular_zubbers\code\modules\mapping\access_helpers.dm" #include "modular_zubbers\code\modules\mapping\limastation\areas.dm"