diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm index 8187cd19842..c70bf6b2898 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm @@ -38,16 +38,6 @@ item_path = /obj/item/clothing/neck/cloak/grunnyyy //ckeywhitelist = list("grunnyyy") -/datum/loadout_item/gloves/hypnoring_coffee - name = "Hypnodemon's Ring" - item_path = /obj/item/clothing/gloves/ring/hypno/coffeepot - //ckeywhitelist = list("coffeepot") - -/datum/loadout_item/gloves/hypnoring_bippy - name = "Hypnodemon's Ring" - item_path = /obj/item/clothing/gloves/ring/hypno/bippys - ckeywhitelist = list("bippys") - /datum/loadout_item/suit/rax_peacekeeper_jacket name = "Peacekeeper jacket" item_path = /obj/item/clothing/suit/armor/vest/warden/rax @@ -176,11 +166,6 @@ item_path = /obj/item/clothing/head/drake_skull //ckeywhitelist = list("random516") -/datum/loadout_item/gloves/blutigen_wraps - name = "Blutigen Wraps" - item_path = /obj/item/clothing/gloves/fingerless/blutigen_wraps - //ckeywhitelist = list("random516") - /datum/loadout_item/suit/blutigen_kimono name = "Blutigen Kimono" item_path = /obj/item/clothing/suit/blutigen_kimono @@ -203,11 +188,6 @@ //ckeywhitelist = list("netrakyram") restricted_roles = list(JOB_CAPTAIN, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY) -/datum/loadout_item/gloves/netra_gloves - name = "Black and Silver Gloves" - item_path = /obj/item/clothing/gloves/netra - //ckeywhitelist = list("netrakyram") - /datum/loadout_item/neck/kiaracloak name = "Kiara's cloak" item_path = /obj/item/clothing/neck/cloak/inferno @@ -233,11 +213,6 @@ item_path = /obj/item/toy/darksabre //ckeywhitelist = list("inferno707") -/datum/loadout_item/pocket_items/darksabresheath - name = "Dark Sabre Sheath" - item_path = /obj/item/storage/belt/sheath/sabre/darksabre - //ckeywhitelist = list("inferno707") - /datum/loadout_item/pocket_items/darkarmor name = "Dark Armor" item_path = /obj/item/clothing/suit/armor/vest/darkcarapace @@ -274,25 +249,20 @@ //ckeywhitelist = list("cypressb") /datum/loadout_item/uniform/mikubikini - name = "starlight singer bikini" + name = "Starlight Singer Bikini" item_path = /obj/item/clothing/under/mikubikini //ckeywhitelist = list("grandvegeta") /datum/loadout_item/suit/mikujacket - name = "starlight singer jacket" + name = "Starlight Singer Jacket" item_path = /obj/item/clothing/suit/mikujacket //ckeywhitelist = list("grandvegeta") /datum/loadout_item/head/mikuhair - name = "starlight singer hair" + name = "Starlight Singer Hair" item_path = /obj/item/clothing/head/mikuhair //ckeywhitelist = list("grandvegeta") -/datum/loadout_item/gloves/mikugloves - name = "starlight singer gloves" - item_path = /obj/item/clothing/gloves/mikugloves - //ckeywhitelist = list("grandvegeta") - /datum/loadout_item/suit/delta_coat name = "Grey Winter Hoodie" item_path = /obj/item/clothing/suit/jacket/delta @@ -336,11 +306,6 @@ item_path = /obj/item/clothing/under/occult //ckeywhitelist = list("gamerguy14948") -/datum/loadout_item/belts/trinket_belt - name = "Trinket Belt" - item_path = /obj/item/storage/belt/fannypack/occult - //ckeywhitelist = list("gamerguy14948") - /datum/loadout_item/toys/voodooplush name = "Voodoo Doll" item_path = /obj/item/toy/plush/skyrat/voodoo @@ -575,12 +540,6 @@ restricted_roles = list(JOB_HEAD_OF_SECURITY) loadout_flags = parent_type::loadout_flags | LOADOUT_FLAG_ALLOW_RESKIN -/datum/loadout_item/gloves/elofy - name = "Solar Admiral Gloves" - item_path = /obj/item/clothing/gloves/elofy - loadout_flags = parent_type::loadout_flags | LOADOUT_FLAG_ALLOW_RESKIN -// ckeywhitelist = list("october23") - /datum/loadout_item/pocket_items/transponder name = "Broken Helian Transponder" item_path = /obj/item/donator/transponder @@ -621,16 +580,6 @@ item_path = /obj/item/toy/plush/skyrat/plushie_syntax1112 //ckeywhitelist = list("syntax1112") -/datum/loadout_item/gloves/hypnoring_sharkenning - name = "Suspiciously Glossy Ring" - item_path = /obj/item/clothing/gloves/ring/hypno/sharkenning - ckeywhitelist = list("thesharkenning", "tecktonic") - -/datum/loadout_item/ears/kinkphone_sharkenning - name = "Suspiciously Glossy Headphones" - item_path = /obj/item/clothing/ears/kinky_headphones/sharkenning - ckeywhitelist = list("thesharkenning") - /datum/loadout_item/head/somerandomowl name = "Starry Witch Hat" item_path = /obj/item/clothing/head/costume/strigihat @@ -669,10 +618,6 @@ name = "Silver Jeans" item_path = /obj/item/clothing/under/pants/skyy -/datum/loadout_item/gloves/lt3_gloves - name = "Charcoal Fingerless Gloves" - item_path = /obj/item/clothing/gloves/skyy - /datum/loadout_item/toys/switchcomb name = "Switchblade Comb" item_path = /obj/item/hairbrush/switchblade diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/ears.dm b/modular_skyrat/master_files/code/modules/loadout/categories/ears.dm deleted file mode 100644 index b2d7118ad20..00000000000 --- a/modular_skyrat/master_files/code/modules/loadout/categories/ears.dm +++ /dev/null @@ -1,21 +0,0 @@ -/datum/loadout_category/ears - category_name = "Ears" - category_ui_icon = FA_ICON_EAR_LISTEN - type_to_generate = /datum/loadout_item/ears - tab_order = /datum/loadout_category/head::tab_order + 7 - -/datum/loadout_item/ears - abstract_type = /datum/loadout_item/ears - -/datum/loadout_item/ears/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only, loadout_placement_preference) - if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.ears) - LAZYADD(outfit.backpack_contents, outfit.ears) - outfit.ears = item_path - -/datum/loadout_item/ears/headphones - name = "Headphones" - item_path = /obj/item/instrument/piano_synth/headphones - -/datum/loadout_item/ears/earmuffs - name = "Earmuffs" - item_path = /obj/item/clothing/ears/earmuffs diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/gloves.dm b/modular_skyrat/master_files/code/modules/loadout/categories/gloves.dm deleted file mode 100644 index cc14c959499..00000000000 --- a/modular_skyrat/master_files/code/modules/loadout/categories/gloves.dm +++ /dev/null @@ -1,102 +0,0 @@ -/datum/loadout_category/gloves - category_name = "Gloves" - category_ui_icon = FA_ICON_HAND - type_to_generate = /datum/loadout_item/gloves - tab_order = /datum/loadout_category/head::tab_order + 8 - -/datum/loadout_item/gloves - abstract_type = /datum/loadout_item/gloves - -/datum/loadout_item/gloves/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only, loadout_placement_preference) - if(equipper.dna?.species?.outfit_important_for_life) - if(!visuals_only) - to_chat(equipper, "Your loadout gloves were not equipped directly due to your species outfit.") - LAZYADD(outfit.backpack_contents, item_path) - else - if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.gloves) - LAZYADD(outfit.backpack_contents, outfit.gloves) - outfit.gloves = item_path - -/datum/loadout_item/gloves/fingerless - name = "Fingerless Gloves" - item_path = /obj/item/clothing/gloves/fingerless - -/datum/loadout_item/gloves/black - name = "Black Gloves" - item_path = /obj/item/clothing/gloves/color/black - -/datum/loadout_item/gloves/blue - name = "Blue Gloves" - item_path = /obj/item/clothing/gloves/color/blue - -/datum/loadout_item/gloves/brown - name = "Brown Gloves" - item_path = /obj/item/clothing/gloves/color/brown - -/datum/loadout_item/gloves/green - name = "Green Gloves" - item_path = /obj/item/clothing/gloves/color/green - -/datum/loadout_item/gloves/grey - name = "Grey Gloves" - item_path = /obj/item/clothing/gloves/color/grey - -/datum/loadout_item/gloves/light_brown - name = "Light Brown Gloves" - item_path = /obj/item/clothing/gloves/color/light_brown - -/datum/loadout_item/gloves/orange - name = "Orange Gloves" - item_path = /obj/item/clothing/gloves/color/orange - -/datum/loadout_item/gloves/purple - name = "Purple Gloves" - item_path = /obj/item/clothing/gloves/color/purple - -/datum/loadout_item/gloves/red - name = "Red Gloves" - item_path = /obj/item/clothing/gloves/color/red - -/datum/loadout_item/gloves/yellow - name = "Yellow Gloves" - item_path = /obj/item/clothing/gloves/color/ffyellow - -/datum/loadout_item/gloves/white - name = "White Gloves" - item_path = /obj/item/clothing/gloves/color/white - -/datum/loadout_item/gloves/rainbow - name = "Rainbow Gloves" - item_path = /obj/item/clothing/gloves/color/rainbow - -/datum/loadout_item/gloves/evening - name = "Evening Gloves" - item_path = /obj/item/clothing/gloves/evening - -/datum/loadout_item/gloves/kim - name = "Aerostatic Gloves" - item_path = /obj/item/clothing/gloves/kim - -/datum/loadout_item/gloves/maid_arm_covers - name = "Colourable Maid Arm Covers" - item_path = /obj/item/clothing/gloves/maid_arm_covers - -/datum/loadout_item/gloves/armwraps - name = "Colourable Arm Wraps" - item_path = /obj/item/clothing/gloves/bracer/wraps - -/* -* RINGS -*/ - -/datum/loadout_item/gloves/silverring - name = "Silver Ring" - item_path = /obj/item/clothing/gloves/ring/silver - -/datum/loadout_item/gloves/goldring - name = "Gold Ring" - item_path = /obj/item/clothing/gloves/ring - -/datum/loadout_item/gloves/diamondring - name = "Diamond Ring" - item_path = /obj/item/clothing/gloves/ring/diamond diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/belts.dm b/modular_zubbers/code/modules/loadout/categories/belts.dm similarity index 85% rename from modular_skyrat/master_files/code/modules/loadout/categories/belts.dm rename to modular_zubbers/code/modules/loadout/categories/belts.dm index 8b460218881..c9b8b08e9e4 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/belts.dm +++ b/modular_zubbers/code/modules/loadout/categories/belts.dm @@ -59,3 +59,15 @@ /datum/loadout_item/belts/lantern name = "Lantern" item_path = /obj/item/flashlight/lantern + +/datum/loadout_item/belts/darksabresheath + name = "Dark Sabre Sheath" + item_path = /obj/item/storage/belt/sheath/sabre/darksabre + //ckeywhitelist = list("inferno707") + +/datum/loadout_item/belts/trinket_belt + name = "Trinket Belt" + item_path = /obj/item/storage/belt/fannypack/occult + //ckeywhitelist = list("gamerguy14948") + + diff --git a/modular_zubbers/code/modules/loadout/categories/ears.dm b/modular_zubbers/code/modules/loadout/categories/ears.dm index 0b9b19b08c8..190cc4251f3 100644 --- a/modular_zubbers/code/modules/loadout/categories/ears.dm +++ b/modular_zubbers/code/modules/loadout/categories/ears.dm @@ -1,3 +1,28 @@ -// THIS IS WHERE LOADOUT DATUMS GO FOR EARS (REMOVE THIS COMMENT AND TICK THIS FILE IF YOU ADD ANYTHING) //Title Capitalization for names please!!! +/datum/loadout_category/ears + category_name = "Ears" + category_ui_icon = FA_ICON_EAR_LISTEN + type_to_generate = /datum/loadout_item/ears + tab_order = /datum/loadout_category/head::tab_order + 7 + +/datum/loadout_item/ears + abstract_type = /datum/loadout_item/ears + +/datum/loadout_item/ears/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only, loadout_placement_preference) + if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.ears) + LAZYADD(outfit.backpack_contents, outfit.ears) + outfit.ears = item_path + +/datum/loadout_item/ears/headphones + name = "Headphones" + item_path = /obj/item/instrument/piano_synth/headphones + +/datum/loadout_item/ears/earmuffs + name = "Earmuffs" + item_path = /obj/item/clothing/ears/earmuffs + +/datum/loadout_item/ears/kinkphone_sharkenning + name = "Suspiciously Glossy Headphones" + item_path = /obj/item/clothing/ears/kinky_headphones/sharkenning + ckeywhitelist = list("thesharkenning") diff --git a/modular_zubbers/code/modules/loadout/categories/gloves.dm b/modular_zubbers/code/modules/loadout/categories/gloves.dm index 198229f9441..3d9bd5b028f 100644 --- a/modular_zubbers/code/modules/loadout/categories/gloves.dm +++ b/modular_zubbers/code/modules/loadout/categories/gloves.dm @@ -1,5 +1,92 @@ //Title Capitalization for names please!!! +/datum/loadout_category/gloves + category_name = "Gloves" + category_ui_icon = FA_ICON_HAND + type_to_generate = /datum/loadout_item/gloves + tab_order = /datum/loadout_category/head::tab_order + 8 + +/datum/loadout_item/gloves + abstract_type = /datum/loadout_item/gloves + +/datum/loadout_item/gloves/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only, loadout_placement_preference) + if(equipper.dna?.species?.outfit_important_for_life) + if(!visuals_only) + to_chat(equipper, "Your loadout gloves were not equipped directly due to your species outfit.") + LAZYADD(outfit.backpack_contents, item_path) + else + if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.gloves) + LAZYADD(outfit.backpack_contents, outfit.gloves) + outfit.gloves = item_path + +/datum/loadout_item/gloves/fingerless + name = "Fingerless Gloves" + item_path = /obj/item/clothing/gloves/fingerless + +/datum/loadout_item/gloves/black + name = "Black Gloves" + item_path = /obj/item/clothing/gloves/color/black + +/datum/loadout_item/gloves/blue + name = "Blue Gloves" + item_path = /obj/item/clothing/gloves/color/blue + +/datum/loadout_item/gloves/brown + name = "Brown Gloves" + item_path = /obj/item/clothing/gloves/color/brown + +/datum/loadout_item/gloves/green + name = "Green Gloves" + item_path = /obj/item/clothing/gloves/color/green + +/datum/loadout_item/gloves/grey + name = "Grey Gloves" + item_path = /obj/item/clothing/gloves/color/grey + +/datum/loadout_item/gloves/light_brown + name = "Light Brown Gloves" + item_path = /obj/item/clothing/gloves/color/light_brown + +/datum/loadout_item/gloves/orange + name = "Orange Gloves" + item_path = /obj/item/clothing/gloves/color/orange + +/datum/loadout_item/gloves/purple + name = "Purple Gloves" + item_path = /obj/item/clothing/gloves/color/purple + +/datum/loadout_item/gloves/red + name = "Red Gloves" + item_path = /obj/item/clothing/gloves/color/red + +/datum/loadout_item/gloves/yellow + name = "Yellow Gloves" + item_path = /obj/item/clothing/gloves/color/ffyellow + +/datum/loadout_item/gloves/white + name = "White Gloves" + item_path = /obj/item/clothing/gloves/color/white + +/datum/loadout_item/gloves/rainbow + name = "Rainbow Gloves" + item_path = /obj/item/clothing/gloves/color/rainbow + +/datum/loadout_item/gloves/evening + name = "Evening Gloves" + item_path = /obj/item/clothing/gloves/evening + +/datum/loadout_item/gloves/kim + name = "Aerostatic Gloves" + item_path = /obj/item/clothing/gloves/kim + +/datum/loadout_item/gloves/maid_arm_covers + name = "Colourable Maid Arm Covers" + item_path = /obj/item/clothing/gloves/maid_arm_covers + +/datum/loadout_item/gloves/armwraps + name = "Colourable Arm Wraps" + item_path = /obj/item/clothing/gloves/bracer/wraps + /datum/loadout_item/gloves/bubber/clown //I would job lock these but, they're just gloves. name = "Pink Clown Gloves" item_path = /obj/item/clothing/gloves/bubber/clussy @@ -41,3 +128,60 @@ /datum/loadout_item/gloves/cat name = "Cat Gloves" item_path = /obj/item/clothing/gloves/cat + +/datum/loadout_item/gloves/blutigen_wraps + name = "Blutigen Wraps" + item_path = /obj/item/clothing/gloves/fingerless/blutigen_wraps + //ckeywhitelist = list("random516") + +/datum/loadout_item/gloves/netra_gloves + name = "Black and Silver Gloves" + item_path = /obj/item/clothing/gloves/netra + //ckeywhitelist = list("netrakyram") + +/datum/loadout_item/gloves/mikugloves + name = "Starlight Singer Gloves" + item_path = /obj/item/clothing/gloves/mikugloves + //ckeywhitelist = list("grandvegeta") + +/datum/loadout_item/gloves/elofy + name = "Solar Admiral Gloves" + item_path = /obj/item/clothing/gloves/elofy + loadout_flags = parent_type::loadout_flags | LOADOUT_FLAG_ALLOW_RESKIN +// ckeywhitelist = list("october23") + +/datum/loadout_item/gloves/hypnoring_sharkenning + name = "Suspiciously Glossy Ring" + item_path = /obj/item/clothing/gloves/ring/hypno/sharkenning + ckeywhitelist = list("thesharkenning", "tecktonic") + +/datum/loadout_item/gloves/lt3_gloves + name = "Charcoal Fingerless Gloves" + item_path = /obj/item/clothing/gloves/skyy + +/* +* RINGS +*/ + +/datum/loadout_item/gloves/silverring + name = "Silver Ring" + item_path = /obj/item/clothing/gloves/ring/silver + +/datum/loadout_item/gloves/goldring + name = "Gold Ring" + item_path = /obj/item/clothing/gloves/ring + +/datum/loadout_item/gloves/diamondring + name = "Diamond Ring" + item_path = /obj/item/clothing/gloves/ring/diamond + +/datum/loadout_item/gloves/hypnoring_coffee + name = "Hypnodemon's Ring" + item_path = /obj/item/clothing/gloves/ring/hypno/coffeepot + //ckeywhitelist = list("coffeepot") + +/datum/loadout_item/gloves/hypnoring_bippy + name = "Hypnodemon's Ring" + item_path = /obj/item/clothing/gloves/ring/hypno/bippys + ckeywhitelist = list("bippys") + diff --git a/tgstation.dme b/tgstation.dme index 4da0eb95b38..466d5ba8651 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7122,11 +7122,8 @@ #include "modular_skyrat\master_files\code\modules\language\language_holder.dm" #include "modular_skyrat\master_files\code\modules\loadout\category_rebalance.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\accessories.dm" -#include "modular_skyrat\master_files\code\modules\loadout\categories\belts.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\donator_personal.dm" -#include "modular_skyrat\master_files\code\modules\loadout\categories\ears.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\glasses.dm" -#include "modular_skyrat\master_files\code\modules\loadout\categories\gloves.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\heads.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\inhands.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\mask.dm" @@ -9420,6 +9417,8 @@ #include "modular_zubbers\code\modules\limbgrowncorpses\limbgrowerblanks.dm" #include "modular_zubbers\code\modules\liquids\height_floors.dm" #include "modular_zubbers\code\modules\loadout\categories\accessories.dm" +#include "modular_zubbers\code\modules\loadout\categories\belts.dm" +#include "modular_zubbers\code\modules\loadout\categories\ears.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"