[pull] master from Aurorastation:master

.github/CODEOWNERS

@@ -11,7 +11,7 @@
 /code/__defines/master_controller.dm @Arrow768
 /code/controllers/master @Arrow768
 /code/controllers/subsystems/fail2topic.dm @Arrow768
-/code/world.dm @Arrow768
+/code/game/world.dm @Arrow768
 /code/modules/admin/ @Arrow768
 /code/modules/web_interface/ @Arrow768
 /code/modules/world_api/ @Arrow768

.github/workflows/byond.yml

@@ -15,7 +15,7 @@ on:
 env:
   MACRO_COUNT: 0
   GENDER_COUNT: 6
-  TO_WORLD_COUNT: 186
+  TO_WORLD_COUNT: 187
 
   #These variables are filled from dependencies.sh inside the steps, DO NOT SET THEM HERE
   BYOND_MAJOR: ""

.tgs.yml

@@ -3,7 +3,7 @@
 version: 1
 # The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job)
 # Must be interpreted as a string, keep quoted
-byond: "515.1619"
+byond: "515.1620"
 # Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
 static_files:
   # Config directory should be static

aurorastation.dme

@@ -16,14 +16,14 @@
 #include "code\hub.dm"
 #include "code\names.dm"
 #include "code\stylesheet.dm"
-#include "code\world.dm"
 #include "code\__datastructures\stack.dm"
 #include "code\__defines\_click.dm"
 #include "code\__defines\_common.dm"
 #include "code\__defines\_compile_helpers.dm"
 #include "code\__defines\_layers.dm"
 #include "code\__defines\_macros.dm"
 #include "code\__defines\_unit_tests.dm"
+#include "code\__defines\_world.dm"
 #include "code\__defines\accessories.dm"
 #include "code\__defines\admin.dm"
 #include "code\__defines\antagonist.dm"
@@ -350,6 +350,7 @@
 #include "code\datums\ruins.dm"
 #include "code\datums\sound_player.dm"
 #include "code\datums\statistic.dm"
+#include "code\datums\tgs_event_handler.dm"
 #include "code\datums\tgui_module.dm"
 #include "code\datums\weakref.dm"
 #include "code\datums\components\_component.dm"
@@ -498,6 +499,7 @@
 #include "code\game\shuttle_engines.dm"
 #include "code\game\sound.dm"
 #include "code\game\supplyshuttle.dm"
+#include "code\game\world.dm"
 #include "code\game\antagonist\_antagonist_setup.dm"
 #include "code\game\antagonist\antagonist.dm"
 #include "code\game\antagonist\antagonist_add.dm"
@@ -814,7 +816,6 @@
 #include "code\game\machinery\spaceheater.dm"
 #include "code\game\machinery\stargazer.dm"
 #include "code\game\machinery\stasis_bed.dm"
-#include "code\game\machinery\station_holomap.dm"
 #include "code\game\machinery\status_display.dm"
 #include "code\game\machinery\status_display_ai.dm"
 #include "code\game\machinery\status_display_snowflakes.dm"
@@ -2643,7 +2644,11 @@
 #include "code\modules\modular_computers\file_system\program_events.dm"
 #include "code\modules\modular_computers\file_system\script.dm"
 #include "code\modules\modular_computers\file_system\programs\_program.dm"
-#include "code\modules\modular_computers\file_system\programs\app_presets.dm"
+#include "code\modules\modular_computers\file_system\programs\app_presets_.dm"
+#include "code\modules\modular_computers\file_system\programs\app_presets_antag.dm"
+#include "code\modules\modular_computers\file_system\programs\app_presets_crew.dm"
+#include "code\modules\modular_computers\file_system\programs\app_presets_equipment.dm"
+#include "code\modules\modular_computers\file_system\programs\app_presets_third_party.dm"
 #include "code\modules\modular_computers\file_system\programs\antagonist\hacked_camera.dm"
 #include "code\modules\modular_computers\file_system\programs\civilian\cargo_control.dm"
 #include "code\modules\modular_computers\file_system\programs\civilian\cargo_delivery.dm"
@@ -2664,6 +2669,7 @@
 #include "code\modules\modular_computers\file_system\programs\games\arcade.dm"
 #include "code\modules\modular_computers\file_system\programs\generic\lawmanager.dm"
 #include "code\modules\modular_computers\file_system\programs\generic\manifest.dm"
+#include "code\modules\modular_computers\file_system\programs\generic\map.dm"
 #include "code\modules\modular_computers\file_system\programs\generic\news_browser.dm"
 #include "code\modules\modular_computers\file_system\programs\generic\ntnrc_client.dm"
 #include "code\modules\modular_computers\file_system\programs\generic\records.dm"
@@ -3565,8 +3571,11 @@
 #include "maps\away\ships\dionae\diona_rokz_ship\diona_rokz_ship_ghostroles.dm"
 #include "maps\away\ships\dionae\diona_serz_ship\diona_serz_ship.dm"
 #include "maps\away\ships\dionae\diona_serz_ship\diona_serz_ship_ghostroles.dm"
-#include "maps\away\ships\dominia\dominian_corvette.dm"
-#include "maps\away\ships\dominia\dominian_corvette_ghostroles.dm"
+#include "maps\away\ships\dominia\dominian_corvette\dominian_corvette.dm"
+#include "maps\away\ships\dominia\dominian_corvette\dominian_corvette_ghostroles.dm"
+#include "maps\away\ships\dominia\dominian_unathi_privateer\dominian_unathi_privateer.dm"
+#include "maps\away\ships\dominia\dominian_unathi_privateer\dominian_unathi_privateer_areas.dm"
+#include "maps\away\ships\dominia\dominian_unathi_privateer\dominian_unathi_privateer_ghostroles.dm"
 #include "maps\away\ships\dpra\hailstorm\hailstorm_areas.dm"
 #include "maps\away\ships\dpra\hailstorm\hailstorm_ghostroles.dm"
 #include "maps\away\ships\dpra\hailstorm\hailstorm_ship.dm"

code/__defines/_unit_tests.dm

@@ -1,7 +1,7 @@
 //include unit test files in this module in this ifdef
 //Keep this sorted alphabetically
 
-// #if defined(UNIT_TESTS) || defined(SPACEMAN_DMM) //tgstation style, not relevant for us, for now
+// #if defined(UNIT_TEST) || defined(SPACEMAN_DMM) //tgstation style, not relevant for us, for now
 
 /// Constants indicating unit test completion status
 #define UNIT_TEST_FAILED null

code/__defines/_world.dm

@@ -0,0 +1,3 @@
+#define WORLD_ICON_SIZE 32
+#define PIXEL_MULTIPLIER WORLD_ICON_SIZE/32
+#define WORLD_MIN_SIZE 32

code/__defines/manual_unit_testing.dm

@@ -1,3 +1,7 @@
 // !!! For manual use only, remember to recomment before PRing !!!
 // #define UNIT_TEST
 // #define MANUAL_UNIT_TEST
+
+#if defined(MANUAL_UNIT_TEST) && !defined(SPACEMAN_DMM) && !defined(OPENDREAM)
+	#warn Manual unit test is defined, remember to recomment it before PRing!
+#endif // MANUAL_UNIT_TEST

code/__defines/math_physics.dm

@@ -16,9 +16,14 @@
 #define RADIATOR_EXPOSED_SURFACE_AREA_RATIO 0.04 // (3 cm + 100 cm * sin(3deg))/(2*(3+100 cm)). Unitless ratio.
 #define HUMAN_EXPOSED_SURFACE_AREA          5.2 //m^2, surface area of 1.7m (H) x 0.46m (D) cylinder
 
-#define T0C  273.15 //    0.0 degrees celcius
-#define T20C 293.15 //   20.0 degrees celcius
-#define TCMB 2.7    // -270.3 degrees celcius
+/// 0.0 Degrees celsius, in Kelvin
+#define T0C  273.15
+
+/// 20.0 Degrees celsius, in Kelvin
+#define T20C 293.15
+
+/// -270.3 degrees celsius, in Kelvin
+#define TCMB 2.7
 
 #define QUANTIZE(variable) (round(variable,0.0001))
 #define ROUND_UP(x) ( -round(-(x)))

code/__defines/minimap.dm

@@ -1,41 +1,23 @@
 //
-// Constants and standard colors for the holomap
+// Constants and standard colors for the holomap/minimap
 //
 
-#define HOLOMAP_ICON 'icons/480x480.dmi' // Icon file to start with when drawing holomaps (to get a 480x480 canvas).
-#define HOLOMAP_ICON_SIZE 480 // Pixel width & height of the holomap icon.  Used for auto-centering etc.
-#define ui_holomap "CENTER-7, CENTER-7" // Screen location of the holomap "hud"
-
 // Holomap colors
-#define HOLOMAP_OBSTACLE "#FFFFFFDD"	// Color of walls and barriers
-#define HOLOMAP_PATH     "#66666699"	// Color of floors
+#define HOLOMAP_OBSTACLE "#FFFFFF"	// Color of walls and barriers
+#define HOLOMAP_PATH     "#666666"	// Color of floors
 #define HOLOMAP_HOLOFIER "#79FF79"	// Whole map is multiplied by this to give it a green holoish look
 
-#define HOLOMAP_AREACOLOR_COMMAND     "#386d8099"
-#define HOLOMAP_AREACOLOR_SECURITY    "#ae121299"
-#define HOLOMAP_AREACOLOR_MEDICAL     "#6f9e00c2"
-#define HOLOMAP_AREACOLOR_SCIENCE     "#A154A699"
-#define HOLOMAP_AREACOLOR_ENGINEERING "#F1C23199"
-#define HOLOMAP_AREACOLOR_OPERATIONS  "#E06F0099"
-#define HOLOMAP_AREACOLOR_HALLWAYS    "#ffffffa5"
-#define HOLOMAP_AREACOLOR_DOCK        "#0000FFCC"
+#define HOLOMAP_AREACOLOR_COMMAND     "#386d80"
+#define HOLOMAP_AREACOLOR_SECURITY    "#ae1212"
+#define HOLOMAP_AREACOLOR_MEDICAL     "#6f9e00"
+#define HOLOMAP_AREACOLOR_SCIENCE     "#A154A6"
+#define HOLOMAP_AREACOLOR_ENGINEERING "#F1C231"
+#define HOLOMAP_AREACOLOR_OPERATIONS  "#E06F00"
+#define HOLOMAP_AREACOLOR_HALLWAYS    "#ffffff"
+#define HOLOMAP_AREACOLOR_DOCK        "#0000FF"
 #define HOLOMAP_AREACOLOR_HANGAR      "#777777"
-#define HOLOMAP_AREACOLOR_CIVILIAN    "#5bc1c199"
+#define HOLOMAP_AREACOLOR_CIVILIAN    "#5bc1c1"
 // If someone can come up with a non-conflicting color for the lifts, please update this.
 #define HOLOMAP_AREACOLOR_LIFTS       null
 
-// Handy defines to lookup the pixel offsets for this Z-level.  Cache these if you use them in a loop tho.
-//	 	Commenting these out for now. Replace if we ever datumize our maps.
-/*#define HOLOMAP_PIXEL_OFFSET_X(zLevel) ((using_map.holomap_offset_x.len >= zLevel) ? using_map.holomap_offset_x[zLevel] : 0)
-#define HOLOMAP_PIXEL_OFFSET_Y(zLevel) ((using_map.holomap_offset_y.len >= zLevel) ? using_map.holomap_offset_y[zLevel] : 0)
-#define HOLOMAP_LEGEND_X(zLevel) ((using_map.holomap_legend_x.len >= zLevel) ? using_map.holomap_legend_x[zLevel] : 96)
-#define HOLOMAP_LEGEND_Y(zLevel) ((using_map.holomap_legend_y.len >= zLevel) ? using_map.holomap_legend_y[zLevel] : 96)*/
-
-#define HOLOMAP_PIXEL_OFFSET_X(zlevel) ((HOLOMAP_ICON_SIZE - world.maxx) / 2)
-#define HOLOMAP_PIXEL_OFFSET_Y(zlevel) ((HOLOMAP_ICON_SIZE - world.maxx) / 2)
-#define HOLOMAP_LEGEND_X(zlevel) 96
-#define HOLOMAP_LEGEND_Y(zlevel) 96
 
-#define HOLOMAP_EXTRA_STATIONMAP      "stationmapformatted"
-#define HOLOMAP_EXTRA_STATIONMAPAREAS "stationareas"
-#define HOLOMAP_EXTRA_STATIONMAPSMALL "stationmapsmall"

code/__defines/subsystem-priority.dm

@@ -5,7 +5,6 @@
 #define SS_INIT_JOBS        21
 #define SS_INIT_MAPFINALIZE 20	// Asteroid generation.
 #define SS_INIT_PARALLAX    19	// Parallax image cache generation. Must run before ghosts are able to join.
-#define SS_INIT_HOLOMAP     18
 #define SS_INIT_ATOMS       17	// World initialization. Will trigger lighting updates. Observers can join after this loads.
 #define SS_INIT_ASSETS      16	// Assets subsystem setup.
 #define SS_INIT_POWER       15	// Initial powernet build.
@@ -26,9 +25,10 @@
 #define SS_INIT_LIGHTING   	0	// Generation of lighting overlays and pre-bake. May cause openturf updates, should initialize before SSzcopy.
 #define SS_INIT_ZCOPY      -1	// Z-mimic flush. Should run after SSoverlay & SSicon_smooth so it copies the smoothed sprites.
 #define SS_INIT_XENOARCH   -2   // Xenoarch is this far below because it can infinite loop if placed in SS_INIT_MISC as it was before, due to some subsystems spawning stuff there.
-#define SS_INIT_LOBBY      -3	// Lobby timer starts here. The lobby timer won't actually start going down until the MC starts ticking, so you probably want this last
-#define SS_INIT_PING 	   -4	// Pinger for the clients
-#define SS_INIT_CHAT       -5	// To ensure chat remains smooth during init.
+#define SS_INIT_HOLOMAP    -3   // Minimap subsystem. Should be initialized after all maps, away sites, ships, planets, etc.
+#define SS_INIT_LOBBY      -4	// Lobby timer starts here. The lobby timer won't actually start going down until the MC starts ticking, so you probably want this last
+#define SS_INIT_PING 	   -5	// Pinger for the clients
+#define SS_INIT_CHAT       -6	// To ensure chat remains smooth during init.
 
 // Something to remember when setting priorities: SS_TICKER runs before Normal, which runs before SS_BACKGROUND.
 // Each group has its own priority bracket.