diff --git a/modular_citadel/code/modules/oracle_ui/README.md b/code/modules/oracle_ui/README.md similarity index 98% rename from modular_citadel/code/modules/oracle_ui/README.md rename to code/modules/oracle_ui/README.md index f3b1fa671e..bc96eb1f51 100644 --- a/modular_citadel/code/modules/oracle_ui/README.md +++ b/code/modules/oracle_ui/README.md @@ -23,11 +23,11 @@ You need to pass in `src`, the width of the window, the height of the window, an #### Step 2 -You will now need to make a template in `modular_citadel/html/oracle_ui/content/{template_name}`. +You will now need to make a template in `html/oracle_ui/content/{template_name}`. Values defined as `@{value}` will get replaced at runtime by oracle_ui. -`modular_citadel/html/oracle_ui/content/disposal_bin/index.html` +`html/oracle_ui/content/disposal_bin/index.html` ```html
diff --git a/code/modules/oracle_ui/assets.dm b/code/modules/oracle_ui/assets.dm new file mode 100644 index 0000000000..5d26d80a81 --- /dev/null +++ b/code/modules/oracle_ui/assets.dm @@ -0,0 +1,8 @@ +/datum/asset/simple/oui_theme_nano + assets = list( + // JavaScript + "sui-nano-common.js" = 'html/oracle_ui/themes/nano/sui-nano-common.js', + "sui-nano-jquery.min.js" = 'html/oracle_ui/themes/nano/sui-nano-jquery.min.js', + // Stylesheets + "sui-nano-common.css" = 'html/oracle_ui/themes/nano/sui-nano-common.css', + ) diff --git a/modular_citadel/code/modules/oracle_ui/hookup_procs.dm b/code/modules/oracle_ui/hookup_procs.dm similarity index 100% rename from modular_citadel/code/modules/oracle_ui/hookup_procs.dm rename to code/modules/oracle_ui/hookup_procs.dm diff --git a/modular_citadel/code/modules/oracle_ui/oracle_ui.dm b/code/modules/oracle_ui/oracle_ui.dm similarity index 100% rename from modular_citadel/code/modules/oracle_ui/oracle_ui.dm rename to code/modules/oracle_ui/oracle_ui.dm diff --git a/modular_citadel/code/modules/oracle_ui/themed.dm b/code/modules/oracle_ui/themed.dm similarity index 100% rename from modular_citadel/code/modules/oracle_ui/themed.dm rename to code/modules/oracle_ui/themed.dm diff --git a/modular_citadel/html/oracle_ui/content/disposal_bin/index.html b/html/oracle_ui/content/disposal_bin/index.html similarity index 100% rename from modular_citadel/html/oracle_ui/content/disposal_bin/index.html rename to html/oracle_ui/content/disposal_bin/index.html diff --git a/modular_citadel/html/oracle_ui/editor_tool.html b/html/oracle_ui/editor_tool.html similarity index 100% rename from modular_citadel/html/oracle_ui/editor_tool.html rename to html/oracle_ui/editor_tool.html diff --git a/modular_citadel/html/oracle_ui/themes/nano/index.html b/html/oracle_ui/themes/nano/index.html similarity index 100% rename from modular_citadel/html/oracle_ui/themes/nano/index.html rename to html/oracle_ui/themes/nano/index.html diff --git a/modular_citadel/html/oracle_ui/themes/nano/sui-nano-common.css b/html/oracle_ui/themes/nano/sui-nano-common.css similarity index 100% rename from modular_citadel/html/oracle_ui/themes/nano/sui-nano-common.css rename to html/oracle_ui/themes/nano/sui-nano-common.css diff --git a/modular_citadel/html/oracle_ui/themes/nano/sui-nano-common.js b/html/oracle_ui/themes/nano/sui-nano-common.js similarity index 100% rename from modular_citadel/html/oracle_ui/themes/nano/sui-nano-common.js rename to html/oracle_ui/themes/nano/sui-nano-common.js diff --git a/modular_citadel/html/oracle_ui/themes/nano/sui-nano-jquery.min.js b/html/oracle_ui/themes/nano/sui-nano-jquery.min.js similarity index 100% rename from modular_citadel/html/oracle_ui/themes/nano/sui-nano-jquery.min.js rename to html/oracle_ui/themes/nano/sui-nano-jquery.min.js diff --git a/modular_citadel/code/modules/oracle_ui/assets.dm b/modular_citadel/code/modules/oracle_ui/assets.dm deleted file mode 100644 index 7286dcc905..0000000000 --- a/modular_citadel/code/modules/oracle_ui/assets.dm +++ /dev/null @@ -1,8 +0,0 @@ -/datum/asset/simple/oui_theme_nano - assets = list( - // JavaScript - "sui-nano-common.js" = 'modular_citadel/html/oracle_ui/themes/nano/sui-nano-common.js', - "sui-nano-jquery.min.js" = 'modular_citadel/html/oracle_ui/themes/nano/sui-nano-jquery.min.js', - // Stylesheets - "sui-nano-common.css" = 'modular_citadel/html/oracle_ui/themes/nano/sui-nano-common.css', - ) diff --git a/tgstation.dme b/tgstation.dme index 70ac28c102..7218b87e0b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -3021,10 +3021,6 @@ #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\oracle_ui\assets.dm" -#include "modular_citadel\code\modules\oracle_ui\hookup_procs.dm" -#include "modular_citadel\code\modules\oracle_ui\oracle_ui.dm" -#include "modular_citadel\code\modules\oracle_ui\themed.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"