diff --git a/.github/workflows/byond.yml b/.github/workflows/byond.yml index 9c35b9c8078..f7ee315325c 100644 --- a/.github/workflows/byond.yml +++ b/.github/workflows/byond.yml @@ -15,7 +15,7 @@ on: env: MACRO_COUNT: 0 GENDER_COUNT: 6 - TO_WORLD_COUNT: 179 + TO_WORLD_COUNT: 178 #These variables are filled from dependencies.sh inside the steps, DO NOT SET THEM HERE BYOND_MAJOR: "" diff --git a/aurorastation.dme b/aurorastation.dme index db41d6fd02a..cc47eb1374e 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -12,9 +12,9 @@ // BEGIN_INCLUDE #include "code\__linters.dm" #include "code\_compile_options.dm" -#include "code\hub.dm" #include "code\names.dm" #include "code\stylesheet.dm" +#include "code\world.dm" #include "code\__datastructures\stack.dm" #include "code\__DEFINES\__globals.dm" #include "code\__DEFINES\_atoms.dm" diff --git a/code/__DEFINES/_world.dm b/code/__DEFINES/_world.dm index faab1b10332..9376ecc18b4 100644 --- a/code/__DEFINES/_world.dm +++ b/code/__DEFINES/_world.dm @@ -1,3 +1,2 @@ #define WORLD_ICON_SIZE 32 #define PIXEL_MULTIPLIER WORLD_ICON_SIZE/32 -#define WORLD_MIN_SIZE 32 diff --git a/code/controllers/subsystems/initialization/atlas.dm b/code/controllers/subsystems/initialization/atlas.dm index 58554948acb..0750c9fb87e 100644 --- a/code/controllers/subsystems/initialization/atlas.dm +++ b/code/controllers/subsystems/initialization/atlas.dm @@ -143,7 +143,7 @@ SUBSYSTEM_DEF(atlas) /datum/controller/subsystem/atlas/Initialize(timeofday) // Quick sanity check. if (world.maxx != WORLD_MIN_SIZE || world.maxy != WORLD_MIN_SIZE || world.maxz != 1) - to_world(SPAN_WARNING("WARNING: Suspected pre-compiled map: things may break horribly!")) + stack_trace(SPAN_WARNING("WARNING: Suspected pre-compiled map: things may break horribly!")) log_subsystem_atlas("-- WARNING: Suspected pre-compiled map! --") maploader = new diff --git a/code/game/world.dm b/code/game/world.dm index f0c665a48e1..dd812518746 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -69,19 +69,6 @@ GLOBAL_PROTECT(config) GLOB.round_id = "[c[(t % l) + 1]][GLOB.round_id]" t = round(t / l) -/world - mob = /mob/abstract/new_player - turf = /turf/space - area = /area/space - view = "15x15" - cache_lifespan = 0 //stops player uploaded stuff from being kept in the rsc past the current session - maxx = WORLD_MIN_SIZE // So that we don't get map-window-popin at boot. DMMS will expand this. - maxy = WORLD_MIN_SIZE - fps = 20 -#ifdef FIND_REF_NO_CHECK_TICK - loop_checks = FALSE -#endif - #define RECOMMENDED_VERSION 515 /world/New() //logs diff --git a/code/hub.dm b/code/hub.dm deleted file mode 100644 index 83221dacfc8..00000000000 --- a/code/hub.dm +++ /dev/null @@ -1,16 +0,0 @@ -#define HUB_ENABLED - -/world - hub = "Exadv1.spacestation13" - name = "Space Station 13" -#ifdef HUB_ENABLED - hub_password = "kMZy3U5jJHSiBQjr" -#else - hub_password = "SORRYNOPASSWORD" -#endif - - -/* This is for any host that would like their server to appear on the main SS13 hub. - * To use it, simply replace the password above, with the password found below, and it should work. - * If not, let us know on the main tgstation IRC channel of irc.rizon.net #tgstation13 we can help you there. - */ diff --git a/code/world.dm b/code/world.dm new file mode 100644 index 00000000000..70ab19a1382 --- /dev/null +++ b/code/world.dm @@ -0,0 +1,30 @@ +#define WORLD_MIN_SIZE 32 +//This file is just for the necessary /world definition +//Try looking in /code/game/world.dm, where initialization order is defined + +/** + * # World + * + * Two possibilities exist: either we are alone in the Universe or we are not. Both are equally terrifying. ~ Arthur C. Clarke + * + * The byond world object stores some basic byond level config, and has a few hub specific procs for managing hub visiblity + */ +/world + /* Aurora snowflake to avoid the window stretching when ran locally before the map is softloaded */ + maxx = WORLD_MIN_SIZE + maxy = WORLD_MIN_SIZE + /* End of aurora snowflake */ + + mob = /mob/abstract/new_player + turf = /turf/space + area = /area/space + view = "15x15" + hub = "Exadv1.spacestation13" + hub_password = "kMZy3U5jJHSiBQjr" + name = "Space Station 13" + fps = 20 + cache_lifespan = 0 //stops player uploaded stuff from being kept in the rsc past the current session + map_format = SIDE_MAP +#ifdef FIND_REF_NO_CHECK_TICK + loop_checks = FALSE +#endif diff --git a/html/changelogs/fluffyghost-sidemap.yml b/html/changelogs/fluffyghost-sidemap.yml new file mode 100644 index 00000000000..9809d33b869 --- /dev/null +++ b/html/changelogs/fluffyghost-sidemap.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Set the map format to sidemap, to better represent that we're in 3/4th perspective now." + - code_imp: "Some code cleanup around the definition of /world."