From 91a93300d7d4649270e7613477586736d22ebd87 Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Fri, 20 Sep 2024 14:26:30 +0200 Subject: [PATCH] kills this evil folder --- code/__HELPERS/~doppler_helpers/is_helpers.dm | 29 ------------------ .../accessories}/code/hair.dm | 4 +-- .../accessories}/icons/facialhair.dmi | Bin .../accessories}/icons/hair.dmi | Bin .../organs/internal}/eyes.dm | 0 tgstation.dme | 4 +-- 6 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 code/__HELPERS/~doppler_helpers/is_helpers.dm rename modular_doppler/{sprite_accessories => modular_customization/accessories}/code/hair.dm (99%) rename modular_doppler/{sprite_accessories => modular_customization/accessories}/icons/facialhair.dmi (100%) rename modular_doppler/{sprite_accessories => modular_customization/accessories}/icons/hair.dmi (100%) rename modular_doppler/{sprite_accessories/code => modular_customization/organs/internal}/eyes.dm (100%) diff --git a/code/__HELPERS/~doppler_helpers/is_helpers.dm b/code/__HELPERS/~doppler_helpers/is_helpers.dm deleted file mode 100644 index 5691430eecd6d..0000000000000 --- a/code/__HELPERS/~doppler_helpers/is_helpers.dm +++ /dev/null @@ -1,29 +0,0 @@ -/proc/init_doppler_stack_recipes() - var/list/additional_stack_recipes = list( - /obj/item/stack/sheet/leather = list(GLOB.doppler_leather_recipes, GLOB.doppler_leather_belt_recipes), - /obj/item/stack/sheet/iron = list(GLOB.doppler_metal_recipes), - /obj/item/stack/sheet/plasteel = list(GLOB.doppler_plasteel_recipes), - /obj/item/stack/sheet/mineral/wood = list(GLOB.doppler_wood_recipes), - /obj/item/stack/sheet/cloth = list(GLOB.doppler_cloth_recipes), - /obj/item/stack/ore/glass = list(GLOB.doppler_sand_recipes), - /obj/item/stack/rods = list(GLOB.doppler_rod_recipes), - /obj/item/stack/sheet/mineral/stone = list(GLOB.stone_recipes), - /obj/item/stack/sheet/mineral/clay = list(GLOB.clay_recipes), - ) - for(var/stack in additional_stack_recipes) - for(var/material_list in additional_stack_recipes[stack]) - for(var/stack_recipe in material_list) - if(istype(stack_recipe, /datum/stack_recipe_list)) - var/datum/stack_recipe_list/stack_recipe_list = stack_recipe - for(var/nested_recipe in stack_recipe_list.recipes) - if(!nested_recipe) - continue - var/datum/crafting_recipe/stack/recipe = new/datum/crafting_recipe/stack(stack, nested_recipe) - if(recipe.name != "" && recipe.result) - GLOB.crafting_recipes += recipe - else - if(!stack_recipe) - continue - var/datum/crafting_recipe/stack/recipe = new/datum/crafting_recipe/stack(stack, stack_recipe) - if(recipe.name != "" && recipe.result) - GLOB.crafting_recipes += recipe diff --git a/modular_doppler/sprite_accessories/code/hair.dm b/modular_doppler/modular_customization/accessories/code/hair.dm similarity index 99% rename from modular_doppler/sprite_accessories/code/hair.dm rename to modular_doppler/modular_customization/accessories/code/hair.dm index c57828ce11ade..8d2609d3b48a9 100644 --- a/modular_doppler/sprite_accessories/code/hair.dm +++ b/modular_doppler/modular_customization/accessories/code/hair.dm @@ -1,7 +1,7 @@ // Hairstyles /datum/sprite_accessory/hair/modular - icon = 'modular_doppler/sprite_accessories/icons/hair.dmi' + icon = 'modular_doppler/modular_customization/accessories/icons/hair.dmi' /datum/sprite_accessory/hair/modular/pigtails4 name = "Pigtails 4" @@ -654,7 +654,7 @@ // Facial hair /datum/sprite_accessory/facial_hair/modular - icon = 'modular_doppler/sprite_accessories/icons/facialhair.dmi' + icon = 'modular_doppler/modular_customization/accessories/icons/facialhair.dmi' /datum/sprite_accessory/facial_hair/modular/sideburns name = "Sideburns" diff --git a/modular_doppler/sprite_accessories/icons/facialhair.dmi b/modular_doppler/modular_customization/accessories/icons/facialhair.dmi similarity index 100% rename from modular_doppler/sprite_accessories/icons/facialhair.dmi rename to modular_doppler/modular_customization/accessories/icons/facialhair.dmi diff --git a/modular_doppler/sprite_accessories/icons/hair.dmi b/modular_doppler/modular_customization/accessories/icons/hair.dmi similarity index 100% rename from modular_doppler/sprite_accessories/icons/hair.dmi rename to modular_doppler/modular_customization/accessories/icons/hair.dmi diff --git a/modular_doppler/sprite_accessories/code/eyes.dm b/modular_doppler/modular_customization/organs/internal/eyes.dm similarity index 100% rename from modular_doppler/sprite_accessories/code/eyes.dm rename to modular_doppler/modular_customization/organs/internal/eyes.dm diff --git a/tgstation.dme b/tgstation.dme index 6d92754a0d591..e16c312f32ab3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6617,6 +6617,7 @@ #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_under.dm" #include "modular_doppler\modular_crafting\code\crafting_extended.dm" #include "modular_doppler\modular_crafting\code\sheet_types.dm" +#include "modular_doppler\modular_customization\accessories\code\hair.dm" #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_body_markings.dm" #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_ears.dm" #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_snout.dm" @@ -6673,6 +6674,7 @@ #include "modular_doppler\modular_customization\organs\external\tail.dm" #include "modular_doppler\modular_customization\organs\external\wings.dm" #include "modular_doppler\modular_customization\organs\internal\ears.dm" +#include "modular_doppler\modular_customization\organs\internal\eyes.dm" #include "modular_doppler\modular_customization\preferences\antennae.dm" #include "modular_doppler\modular_customization\preferences\body_marking_lizard.dm" #include "modular_doppler\modular_customization\preferences\body_marking_moth.dm" @@ -6768,8 +6770,6 @@ #include "modular_doppler\religion\code\chaplain.dm" #include "modular_doppler\religion\code\mind.dm" #include "modular_doppler\religion\code\religious_sects.dm" -#include "modular_doppler\sprite_accessories\code\eyes.dm" -#include "modular_doppler\sprite_accessories\code\hair.dm" #include "modular_doppler\stone\code\ore_veins.dm" #include "modular_doppler\stone\code\stone.dm" #include "modular_doppler\tableflip\tableflip.dm"