diff --git a/citadel.dme b/citadel.dme index 402068b341b..484d097fd02 100644 --- a/citadel.dme +++ b/citadel.dme @@ -19,7 +19,6 @@ #include "code\__global_init.dm" #include "code\_macros.dm" #include "code\global.dm" -#include "code\world.dm" #include "code\__DEFINES\_bitfields.dm" #include "code\__DEFINES\_cooldowns.dm" #include "code\__DEFINES\_core.dm" @@ -73,6 +72,7 @@ #include "code\__DEFINES\robots.dm" #include "code\__DEFINES\roguemining_vr.dm" #include "code\__DEFINES\rust_g.dm" +#include "code\__DEFINES\screen.dm" #include "code\__DEFINES\shields.dm" #include "code\__DEFINES\shuttle.dm" #include "code\__DEFINES\shuttles.dm" @@ -415,20 +415,6 @@ #include "code\_globals\lists\objects.dm" #include "code\_globals\lists\sounds.dm" #include "code\_globals\lists\typecache.dm" -#include "code\click\adjacency.dm" -#include "code\click\adjacency_legacy.dm" -#include "code\click\ai.dm" -#include "code\click\click.dm" -#include "code\click\cyborg.dm" -#include "code\click\drag_drop.dm" -#include "code\click\item_attack.dm" -#include "code\click\items.dm" -#include "code\click\mobs.dm" -#include "code\click\observer.dm" -#include "code\click\other_mobs.dm" -#include "code\click\reachability.dm" -#include "code\click\rig.dm" -#include "code\click\telekinesis.dm" #include "code\controllers\communications.dm" #include "code\controllers\controller.dm" #include "code\controllers\failsafe.dm" @@ -921,6 +907,20 @@ #include "code\game\atoms\movable\pulling.dm" #include "code\game\atoms\movable\throwing.dm" #include "code\game\atoms\movable\vv.dm" +#include "code\game\click\adjacency.dm" +#include "code\game\click\adjacency_legacy.dm" +#include "code\game\click\ai.dm" +#include "code\game\click\click.dm" +#include "code\game\click\cyborg.dm" +#include "code\game\click\drag_drop.dm" +#include "code\game\click\item_attack.dm" +#include "code\game\click\items.dm" +#include "code\game\click\mobs.dm" +#include "code\game\click\observer.dm" +#include "code\game\click\other_mobs.dm" +#include "code\game\click\reachability.dm" +#include "code\game\click\rig.dm" +#include "code\game\click\telekinesis.dm" #include "code\game\dna\dna2.dm" #include "code\game\dna\dna2_domutcheck.dm" #include "code\game\dna\dna2_helpers.dm" @@ -1840,6 +1840,45 @@ #include "code\game\objects\structures\stool_bed_chair_nest\chairs_vr.dm" #include "code\game\objects\structures\stool_bed_chair_nest\stools.dm" #include "code\game\objects\structures\stool_bed_chair_nest\wheelchair.dm" +#include "code\game\rendering\client.dm" +#include "code\game\rendering\mob.dm" +#include "code\game\rendering\screen.dm" +#include "code\game\rendering\atom_huds\alternate_appearance.dm" +#include "code\game\rendering\atom_huds\atom_hud.dm" +#include "code\game\rendering\atom_huds\data_huds.dm" +#include "code\game\rendering\atom_huds\other_huds.dm" +#include "code\game\rendering\clickcatcher\clickcatcher.dm" +#include "code\game\rendering\fullscreen\fullscreen.dm" +#include "code\game\rendering\legacy\ability_screen_objects.dm" +#include "code\game\rendering\legacy\ai.dm" +#include "code\game\rendering\legacy\alert.dm" +#include "code\game\rendering\legacy\alien_larva.dm" +#include "code\game\rendering\legacy\ghost.dm" +#include "code\game\rendering\legacy\gun_mode.dm" +#include "code\game\rendering\legacy\hud.dm" +#include "code\game\rendering\legacy\hud_object.dm" +#include "code\game\rendering\legacy\human.dm" +#include "code\game\rendering\legacy\map_popups.dm" +#include "code\game\rendering\legacy\movable_screen_objects.dm" +#include "code\game\rendering\legacy\other_mobs.dm" +#include "code\game\rendering\legacy\radial.dm" +#include "code\game\rendering\legacy\radial_persistent.dm" +#include "code\game\rendering\legacy\rigmech.dm" +#include "code\game\rendering\legacy\robot.dm" +#include "code\game\rendering\legacy\spell_screen_objects.dm" +#include "code\game\rendering\legacy\intents\throwing.dm" +#include "code\game\rendering\legacy\inventory\inventory.dm" +#include "code\game\rendering\legacy\objects\waypoint_tracker.dm" +#include "code\game\rendering\parallax\parallax.dm" +#include "code\game\rendering\parallax\parallax_holder.dm" +#include "code\game\rendering\parallax\parallax_object.dm" +#include "code\game\rendering\parallax\types\space.dm" +#include "code\game\rendering\perspectives\darksight.dm" +#include "code\game\rendering\perspectives\perspective.dm" +#include "code\game\rendering\perspectives\vision.dm" +#include "code\game\rendering\plane_masters\plane_holder.dm" +#include "code\game\rendering\plane_masters\plane_master.dm" +#include "code\game\rendering\plane_masters\plane_render.dm" #include "code\game\turfs\baseturfs.dm" #include "code\game\turfs\change_turf.dm" #include "code\game\turfs\simulated.dm" @@ -4735,46 +4774,6 @@ #include "code\modules\xenobio\items\slimepotions.dm" #include "code\modules\xenobio\items\weapons.dm" #include "code\modules\xenobio\machinery\processor.dm" -#include "code\rendering\client.dm" -#include "code\rendering\mob.dm" -#include "code\rendering\screen.dm" -#include "code\rendering\atom_huds\alternate_appearance.dm" -#include "code\rendering\atom_huds\atom_hud.dm" -#include "code\rendering\atom_huds\data_huds.dm" -#include "code\rendering\atom_huds\other_huds.dm" -#include "code\rendering\clickcatcher\clickcatcher.dm" -#include "code\rendering\fullscreen\fullscreen.dm" -#include "code\rendering\legacy\_defines.dm" -#include "code\rendering\legacy\ability_screen_objects.dm" -#include "code\rendering\legacy\ai.dm" -#include "code\rendering\legacy\alert.dm" -#include "code\rendering\legacy\alien_larva.dm" -#include "code\rendering\legacy\ghost.dm" -#include "code\rendering\legacy\gun_mode.dm" -#include "code\rendering\legacy\hud.dm" -#include "code\rendering\legacy\hud_object.dm" -#include "code\rendering\legacy\human.dm" -#include "code\rendering\legacy\map_popups.dm" -#include "code\rendering\legacy\movable_screen_objects.dm" -#include "code\rendering\legacy\other_mobs.dm" -#include "code\rendering\legacy\radial.dm" -#include "code\rendering\legacy\radial_persistent.dm" -#include "code\rendering\legacy\rigmech.dm" -#include "code\rendering\legacy\robot.dm" -#include "code\rendering\legacy\spell_screen_objects.dm" -#include "code\rendering\legacy\intents\throwing.dm" -#include "code\rendering\legacy\inventory\inventory.dm" -#include "code\rendering\legacy\objects\waypoint_tracker.dm" -#include "code\rendering\parallax\parallax.dm" -#include "code\rendering\parallax\parallax_holder.dm" -#include "code\rendering\parallax\parallax_object.dm" -#include "code\rendering\parallax\types\space.dm" -#include "code\rendering\perspectives\darksight.dm" -#include "code\rendering\perspectives\perspective.dm" -#include "code\rendering\perspectives\vision.dm" -#include "code\rendering\plane_masters\plane_holder.dm" -#include "code\rendering\plane_masters\plane_master.dm" -#include "code\rendering\plane_masters\plane_render.dm" #include "donator\unclebourbon\pmc_mask.dm" #include "interface\interface.dm" #include "interface\stylesheet.dm" diff --git a/code/rendering/legacy/_defines.dm b/code/__DEFINES/screen.dm similarity index 100% rename from code/rendering/legacy/_defines.dm rename to code/__DEFINES/screen.dm diff --git a/code/click/adjacency.dm b/code/game/click/adjacency.dm similarity index 100% rename from code/click/adjacency.dm rename to code/game/click/adjacency.dm diff --git a/code/click/adjacency_legacy.dm b/code/game/click/adjacency_legacy.dm similarity index 100% rename from code/click/adjacency_legacy.dm rename to code/game/click/adjacency_legacy.dm diff --git a/code/click/ai.dm b/code/game/click/ai.dm similarity index 100% rename from code/click/ai.dm rename to code/game/click/ai.dm diff --git a/code/click/click.dm b/code/game/click/click.dm similarity index 100% rename from code/click/click.dm rename to code/game/click/click.dm diff --git a/code/click/cyborg.dm b/code/game/click/cyborg.dm similarity index 100% rename from code/click/cyborg.dm rename to code/game/click/cyborg.dm diff --git a/code/click/drag_drop.dm b/code/game/click/drag_drop.dm similarity index 100% rename from code/click/drag_drop.dm rename to code/game/click/drag_drop.dm diff --git a/code/click/item_attack.dm b/code/game/click/item_attack.dm similarity index 100% rename from code/click/item_attack.dm rename to code/game/click/item_attack.dm diff --git a/code/click/items.dm b/code/game/click/items.dm similarity index 100% rename from code/click/items.dm rename to code/game/click/items.dm diff --git a/code/click/mobs.dm b/code/game/click/mobs.dm similarity index 100% rename from code/click/mobs.dm rename to code/game/click/mobs.dm diff --git a/code/click/observer.dm b/code/game/click/observer.dm similarity index 100% rename from code/click/observer.dm rename to code/game/click/observer.dm diff --git a/code/click/other_mobs.dm b/code/game/click/other_mobs.dm similarity index 100% rename from code/click/other_mobs.dm rename to code/game/click/other_mobs.dm diff --git a/code/click/reachability.dm b/code/game/click/reachability.dm similarity index 100% rename from code/click/reachability.dm rename to code/game/click/reachability.dm diff --git a/code/click/rig.dm b/code/game/click/rig.dm similarity index 100% rename from code/click/rig.dm rename to code/game/click/rig.dm diff --git a/code/click/telekinesis.dm b/code/game/click/telekinesis.dm similarity index 100% rename from code/click/telekinesis.dm rename to code/game/click/telekinesis.dm diff --git a/code/rendering/atom_huds/alternate_appearance.dm b/code/game/rendering/atom_huds/alternate_appearance.dm similarity index 100% rename from code/rendering/atom_huds/alternate_appearance.dm rename to code/game/rendering/atom_huds/alternate_appearance.dm diff --git a/code/rendering/atom_huds/atom_hud.dm b/code/game/rendering/atom_huds/atom_hud.dm similarity index 100% rename from code/rendering/atom_huds/atom_hud.dm rename to code/game/rendering/atom_huds/atom_hud.dm diff --git a/code/rendering/atom_huds/data_huds.dm b/code/game/rendering/atom_huds/data_huds.dm similarity index 100% rename from code/rendering/atom_huds/data_huds.dm rename to code/game/rendering/atom_huds/data_huds.dm diff --git a/code/rendering/atom_huds/other_huds.dm b/code/game/rendering/atom_huds/other_huds.dm similarity index 100% rename from code/rendering/atom_huds/other_huds.dm rename to code/game/rendering/atom_huds/other_huds.dm diff --git a/code/rendering/clickcatcher/clickcatcher.dm b/code/game/rendering/clickcatcher/clickcatcher.dm similarity index 100% rename from code/rendering/clickcatcher/clickcatcher.dm rename to code/game/rendering/clickcatcher/clickcatcher.dm diff --git a/code/rendering/client.dm b/code/game/rendering/client.dm similarity index 100% rename from code/rendering/client.dm rename to code/game/rendering/client.dm diff --git a/code/rendering/fullscreen/fullscreen.dm b/code/game/rendering/fullscreen/fullscreen.dm similarity index 100% rename from code/rendering/fullscreen/fullscreen.dm rename to code/game/rendering/fullscreen/fullscreen.dm diff --git a/code/rendering/legacy/ability_screen_objects.dm b/code/game/rendering/legacy/ability_screen_objects.dm similarity index 100% rename from code/rendering/legacy/ability_screen_objects.dm rename to code/game/rendering/legacy/ability_screen_objects.dm diff --git a/code/rendering/legacy/ai.dm b/code/game/rendering/legacy/ai.dm similarity index 100% rename from code/rendering/legacy/ai.dm rename to code/game/rendering/legacy/ai.dm diff --git a/code/rendering/legacy/alert.dm b/code/game/rendering/legacy/alert.dm similarity index 100% rename from code/rendering/legacy/alert.dm rename to code/game/rendering/legacy/alert.dm diff --git a/code/rendering/legacy/alien_larva.dm b/code/game/rendering/legacy/alien_larva.dm similarity index 100% rename from code/rendering/legacy/alien_larva.dm rename to code/game/rendering/legacy/alien_larva.dm diff --git a/code/rendering/legacy/ghost.dm b/code/game/rendering/legacy/ghost.dm similarity index 100% rename from code/rendering/legacy/ghost.dm rename to code/game/rendering/legacy/ghost.dm diff --git a/code/rendering/legacy/gun_mode.dm b/code/game/rendering/legacy/gun_mode.dm similarity index 100% rename from code/rendering/legacy/gun_mode.dm rename to code/game/rendering/legacy/gun_mode.dm diff --git a/code/rendering/legacy/hud.dm b/code/game/rendering/legacy/hud.dm similarity index 100% rename from code/rendering/legacy/hud.dm rename to code/game/rendering/legacy/hud.dm diff --git a/code/rendering/legacy/hud_object.dm b/code/game/rendering/legacy/hud_object.dm similarity index 100% rename from code/rendering/legacy/hud_object.dm rename to code/game/rendering/legacy/hud_object.dm diff --git a/code/rendering/legacy/human.dm b/code/game/rendering/legacy/human.dm similarity index 100% rename from code/rendering/legacy/human.dm rename to code/game/rendering/legacy/human.dm diff --git a/code/rendering/legacy/intents/throwing.dm b/code/game/rendering/legacy/intents/throwing.dm similarity index 100% rename from code/rendering/legacy/intents/throwing.dm rename to code/game/rendering/legacy/intents/throwing.dm diff --git a/code/rendering/legacy/inventory/inventory.dm b/code/game/rendering/legacy/inventory/inventory.dm similarity index 100% rename from code/rendering/legacy/inventory/inventory.dm rename to code/game/rendering/legacy/inventory/inventory.dm diff --git a/code/rendering/legacy/map_popups.dm b/code/game/rendering/legacy/map_popups.dm similarity index 100% rename from code/rendering/legacy/map_popups.dm rename to code/game/rendering/legacy/map_popups.dm diff --git a/code/rendering/legacy/movable_screen_objects.dm b/code/game/rendering/legacy/movable_screen_objects.dm similarity index 100% rename from code/rendering/legacy/movable_screen_objects.dm rename to code/game/rendering/legacy/movable_screen_objects.dm diff --git a/code/rendering/legacy/objects/waypoint_tracker.dm b/code/game/rendering/legacy/objects/waypoint_tracker.dm similarity index 100% rename from code/rendering/legacy/objects/waypoint_tracker.dm rename to code/game/rendering/legacy/objects/waypoint_tracker.dm diff --git a/code/rendering/legacy/other_mobs.dm b/code/game/rendering/legacy/other_mobs.dm similarity index 100% rename from code/rendering/legacy/other_mobs.dm rename to code/game/rendering/legacy/other_mobs.dm diff --git a/code/rendering/legacy/radial.dm b/code/game/rendering/legacy/radial.dm similarity index 100% rename from code/rendering/legacy/radial.dm rename to code/game/rendering/legacy/radial.dm diff --git a/code/rendering/legacy/radial_persistent.dm b/code/game/rendering/legacy/radial_persistent.dm similarity index 100% rename from code/rendering/legacy/radial_persistent.dm rename to code/game/rendering/legacy/radial_persistent.dm diff --git a/code/rendering/legacy/render.dm b/code/game/rendering/legacy/render.dm similarity index 100% rename from code/rendering/legacy/render.dm rename to code/game/rendering/legacy/render.dm diff --git a/code/rendering/legacy/rigmech.dm b/code/game/rendering/legacy/rigmech.dm similarity index 100% rename from code/rendering/legacy/rigmech.dm rename to code/game/rendering/legacy/rigmech.dm diff --git a/code/rendering/legacy/robot.dm b/code/game/rendering/legacy/robot.dm similarity index 100% rename from code/rendering/legacy/robot.dm rename to code/game/rendering/legacy/robot.dm diff --git a/code/rendering/legacy/spell_screen_objects.dm b/code/game/rendering/legacy/spell_screen_objects.dm similarity index 100% rename from code/rendering/legacy/spell_screen_objects.dm rename to code/game/rendering/legacy/spell_screen_objects.dm diff --git a/code/rendering/mob.dm b/code/game/rendering/mob.dm similarity index 100% rename from code/rendering/mob.dm rename to code/game/rendering/mob.dm diff --git a/code/rendering/parallax/parallax.dm b/code/game/rendering/parallax/parallax.dm similarity index 100% rename from code/rendering/parallax/parallax.dm rename to code/game/rendering/parallax/parallax.dm diff --git a/code/rendering/parallax/parallax_holder.dm b/code/game/rendering/parallax/parallax_holder.dm similarity index 100% rename from code/rendering/parallax/parallax_holder.dm rename to code/game/rendering/parallax/parallax_holder.dm diff --git a/code/rendering/parallax/parallax_object.dm b/code/game/rendering/parallax/parallax_object.dm similarity index 100% rename from code/rendering/parallax/parallax_object.dm rename to code/game/rendering/parallax/parallax_object.dm diff --git a/code/rendering/parallax/types/space.dm b/code/game/rendering/parallax/types/space.dm similarity index 100% rename from code/rendering/parallax/types/space.dm rename to code/game/rendering/parallax/types/space.dm diff --git a/code/rendering/perspectives/darksight.dm b/code/game/rendering/perspectives/darksight.dm similarity index 100% rename from code/rendering/perspectives/darksight.dm rename to code/game/rendering/perspectives/darksight.dm diff --git a/code/rendering/perspectives/perspective.dm b/code/game/rendering/perspectives/perspective.dm similarity index 100% rename from code/rendering/perspectives/perspective.dm rename to code/game/rendering/perspectives/perspective.dm diff --git a/code/rendering/perspectives/vision.dm b/code/game/rendering/perspectives/vision.dm similarity index 100% rename from code/rendering/perspectives/vision.dm rename to code/game/rendering/perspectives/vision.dm diff --git a/code/rendering/plane_masters/plane_holder.dm b/code/game/rendering/plane_masters/plane_holder.dm similarity index 100% rename from code/rendering/plane_masters/plane_holder.dm rename to code/game/rendering/plane_masters/plane_holder.dm diff --git a/code/rendering/plane_masters/plane_master.dm b/code/game/rendering/plane_masters/plane_master.dm similarity index 100% rename from code/rendering/plane_masters/plane_master.dm rename to code/game/rendering/plane_masters/plane_master.dm diff --git a/code/rendering/plane_masters/plane_render.dm b/code/game/rendering/plane_masters/plane_render.dm similarity index 100% rename from code/rendering/plane_masters/plane_render.dm rename to code/game/rendering/plane_masters/plane_render.dm diff --git a/code/rendering/screen.dm b/code/game/rendering/screen.dm similarity index 100% rename from code/rendering/screen.dm rename to code/game/rendering/screen.dm diff --git a/code/game/world.dm b/code/game/world.dm index 57a3f545a5c..7b265dd9677 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -5,6 +5,21 @@ GLOBAL_VAR(restart_counter) GLOBAL_VAR(topic_status_lastcache) GLOBAL_LIST(topic_status_cache) +/world + mob = /mob/new_player + turf = /turf/space/basic + area = /area/space + view = "15x15" + hub = "Exadv1.spacestation13" + hub_password = "kMZy3U5jJHSiBQjr" + name = "Citadel Station 13 - Roleplay" + status = "ERROR: Default status" + visibility = TRUE + fps = 20 +#ifdef FIND_REF_NO_CHECK_TICK + loop_checks = FALSE +#endif + /** * World creation * diff --git a/code/world.dm b/code/world.dm deleted file mode 100644 index 8d04aa4aadc..00000000000 --- a/code/world.dm +++ /dev/null @@ -1,17 +0,0 @@ - -//This file is just for the necessary /world definition -//Try looking in game/world.dm -/world - mob = /mob/new_player - turf = /turf/space/basic - area = /area/space - view = "15x15" - hub = "Exadv1.spacestation13" - hub_password = "kMZy3U5jJHSiBQjr" - name = "Citadel Station 13 - Roleplay" - status = "ERROR: Default status" - visibility = TRUE - fps = 20 -#ifdef FIND_REF_NO_CHECK_TICK - loop_checks = FALSE -#endif