diff --git a/modular_citadel/cit_screenshake.dm b/modular_citadel/code/game/objects/cit_screenshake.dm similarity index 100% rename from modular_citadel/cit_screenshake.dm rename to modular_citadel/code/game/objects/cit_screenshake.dm diff --git a/modular_citadel/game/objects/items/melee/misc.dm b/modular_citadel/code/game/objects/items/melee/misc.dm similarity index 100% rename from modular_citadel/game/objects/items/melee/misc.dm rename to modular_citadel/code/game/objects/items/melee/misc.dm diff --git a/modular_citadel/cit_turfs.dm b/modular_citadel/code/game/turfs/cit_turfs.dm similarity index 100% rename from modular_citadel/cit_turfs.dm rename to modular_citadel/code/game/turfs/cit_turfs.dm diff --git a/modular_citadel/code/init.dm b/modular_citadel/code/init.dm index 148bae6215..6df5be02eb 100644 --- a/modular_citadel/code/init.dm +++ b/modular_citadel/code/init.dm @@ -10,10 +10,6 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/mam_ears, GLOB.mam_ears_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/mam_tails_animated, GLOB.mam_tails_animated_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/taur, GLOB.taur_list) -// init_sprite_accessory_subtypes(/datum/sprite_accessory/beaks/avian, GLOB.avian_beaks_list) -// init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/avian, GLOB.avian_tails_list) -// init_sprite_accessory_subtypes(/datum/sprite_accessory/avian_wings, GLOB.avian_wings_list) -// init_sprite_accessory_subtypes(/datum/sprite_accessory/avian_open_wings, GLOB.avian_open_wings_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_head, GLOB.xeno_head_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_tail, GLOB.xeno_tail_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_dorsal, GLOB.xeno_dorsal_list) diff --git a/modular_citadel/citadel_ghostrole_spawners.dm b/modular_citadel/code/modules/awaymissions/citadel_ghostrole_spawners.dm similarity index 100% rename from modular_citadel/citadel_ghostrole_spawners.dm rename to modular_citadel/code/modules/awaymissions/citadel_ghostrole_spawners.dm diff --git a/modular_citadel/cydonian_armor.dm b/modular_citadel/code/modules/clothing/spacesuits/cydonian_armor.dm similarity index 100% rename from modular_citadel/cydonian_armor.dm rename to modular_citadel/code/modules/clothing/spacesuits/cydonian_armor.dm diff --git a/modular_citadel/dresscode_values.dm b/modular_citadel/code/modules/jobs/dresscode_values.dm similarity index 100% rename from modular_citadel/dresscode_values.dm rename to modular_citadel/code/modules/jobs/dresscode_values.dm diff --git a/modular_citadel/simplemob_vore_values.dm b/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm similarity index 100% rename from modular_citadel/simplemob_vore_values.dm rename to modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm diff --git a/modular_citadel/modules/mob/living/status_procs.dm b/modular_citadel/code/modules/mob/living/status_procs.dm similarity index 100% rename from modular_citadel/modules/mob/living/status_procs.dm rename to modular_citadel/code/modules/mob/living/status_procs.dm diff --git a/modular_citadel/modules/vehicles/secway.dm b/modular_citadel/code/modules/vehicles/secway.dm similarity index 100% rename from modular_citadel/modules/vehicles/secway.dm rename to modular_citadel/code/modules/vehicles/secway.dm diff --git a/modular_citadel/hopefully_temporary_patches.dm b/modular_citadel/hopefully_temporary_patches.dm deleted file mode 100644 index 086c70f97e..0000000000 --- a/modular_citadel/hopefully_temporary_patches.dm +++ /dev/null @@ -1 +0,0 @@ -//This file is to be used for placeholder hacks and other temporary modular patches. Don't rely on it too much diff --git a/tgstation.dme b/tgstation.dme index af5c44c7a0..0598f90fd4 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2704,13 +2704,6 @@ #include "interface\interface.dm" #include "interface\menu.dm" #include "interface\stylesheet.dm" -#include "modular_citadel\cit_screenshake.dm" -#include "modular_citadel\cit_turfs.dm" -#include "modular_citadel\citadel_ghostrole_spawners.dm" -#include "modular_citadel\cydonian_armor.dm" -#include "modular_citadel\dresscode_values.dm" -#include "modular_citadel\hopefully_temporary_patches.dm" -#include "modular_citadel\simplemob_vore_values.dm" #include "modular_citadel\code\init.dm" #include "modular_citadel\code\__HELPERS\list2list.dm" #include "modular_citadel\code\__HELPERS\lists.dm" @@ -2748,6 +2741,7 @@ #include "modular_citadel\code\game\machinery\computer\card.dm" #include "modular_citadel\code\game\machinery\doors\airlock.dm" #include "modular_citadel\code\game\machinery\doors\airlock_types.dm" +#include "modular_citadel\code\game\objects\cit_screenshake.dm" #include "modular_citadel\code\game\objects\ids.dm" #include "modular_citadel\code\game\objects\items.dm" #include "modular_citadel\code\game\objects\tools.dm" @@ -2772,6 +2766,7 @@ #include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm" #include "modular_citadel\code\game\objects\items\melee\energy.dm" #include "modular_citadel\code\game\objects\items\melee\eutactic_blades.dm" +#include "modular_citadel\code\game\objects\items\melee\misc.dm" #include "modular_citadel\code\game\objects\items\melee\transforming.dm" #include "modular_citadel\code\game\objects\items\storage\firstaid.dm" #include "modular_citadel\code\game\objects\structures\tables_racks.dm" @@ -2780,6 +2775,7 @@ #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\fitness.dm" #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\wardrobe.dm" #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\secure\citadel_lockers.dm" +#include "modular_citadel\code\game\turfs\cit_turfs.dm" #include "modular_citadel\code\modules\admin\admin.dm" #include "modular_citadel\code\modules\admin\chat_commands.dm" #include "modular_citadel\code\modules\admin\holder2.dm" @@ -2797,6 +2793,7 @@ #include "modular_citadel\code\modules\arousal\organs\vagina.dm" #include "modular_citadel\code\modules\arousal\organs\womb.dm" #include "modular_citadel\code\modules\arousal\toys\dildos.dm" +#include "modular_citadel\code\modules\awaymissions\citadel_ghostrole_spawners.dm" #include "modular_citadel\code\modules\cargo\console.dm" #include "modular_citadel\code\modules\cargo\packs.dm" #include "modular_citadel\code\modules\client\client_defines.dm" @@ -2823,6 +2820,7 @@ #include "modular_citadel\code\modules\clothing\clothing.dm" #include "modular_citadel\code\modules\clothing\glasses\phantomthief.dm" #include "modular_citadel\code\modules\clothing\head\head.dm" +#include "modular_citadel\code\modules\clothing\spacesuits\cydonian_armor.dm" #include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm" #include "modular_citadel\code\modules\clothing\suits\polychromic_cloaks.dm" #include "modular_citadel\code\modules\clothing\suits\suits.dm" @@ -2838,6 +2836,7 @@ #include "modular_citadel\code\modules\events\wizard\magicarp.dm" #include "modular_citadel\code\modules\food_and_drinks\snacks\meat.dm" #include "modular_citadel\code\modules\integrated_electronics\subtypes\manipulation.dm" +#include "modular_citadel\code\modules\jobs\dresscode_values.dm" #include "modular_citadel\code\modules\jobs\jobs.dm" #include "modular_citadel\code\modules\jobs\job_types\captain.dm" #include "modular_citadel\code\modules\jobs\job_types\cargo_service.dm" @@ -2861,6 +2860,7 @@ #include "modular_citadel\code\modules\mob\dead\new_player\sprite_accessories.dm" #include "modular_citadel\code\modules\mob\living\damage_procs.dm" #include "modular_citadel\code\modules\mob\living\living.dm" +#include "modular_citadel\code\modules\mob\living\status_procs.dm" #include "modular_citadel\code\modules\mob\living\carbon\carbon.dm" #include "modular_citadel\code\modules\mob\living\carbon\damage_procs.dm" #include "modular_citadel\code\modules\mob\living\carbon\reindex_screams.dm" @@ -2877,6 +2877,7 @@ #include "modular_citadel\code\modules\mob\living\silicon\robot\robot_movement.dm" #include "modular_citadel\code\modules\mob\living\simple_animal\banana_spider.dm" #include "modular_citadel\code\modules\mob\living\simple_animal\kiwi.dm" +#include "modular_citadel\code\modules\mob\living\simple_animal\simplemob_vore_values.dm" #include "modular_citadel\code\modules\power\lighting.dm" #include "modular_citadel\code\modules\projectiles\gun.dm" #include "modular_citadel\code\modules\projectiles\ammunition\caseless.dm" @@ -2913,6 +2914,7 @@ #include "modular_citadel\code\modules\research\techweb\all_nodes.dm" #include "modular_citadel\code\modules\research\xenobiology\xenobio_camera.dm" #include "modular_citadel\code\modules\uplink\uplink_items.dm" +#include "modular_citadel\code\modules\vehicles\secway.dm" #include "modular_citadel\code\modules\vore\hook-defs_vr.dm" #include "modular_citadel\code\modules\vore\persistence.dm" #include "modular_citadel\code\modules\vore\trycatch_vr.dm" @@ -2925,8 +2927,5 @@ #include "modular_citadel\code\modules\vore\eating\vore_vr.dm" #include "modular_citadel\code\modules\vore\eating\voreitems.dm" #include "modular_citadel\code\modules\vore\eating\vorepanel_vr.dm" -#include "modular_citadel\game\objects\items\melee\misc.dm" #include "modular_citadel\interface\skin.dmf" -#include "modular_citadel\modules\mob\living\status_procs.dm" -#include "modular_citadel\modules\vehicles\secway.dm" // END_INCLUDE