Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Donkie.vscode-tgstation-test-adapter",
"anturk.dmi-editor",
"esbenp.prettier-vscode",
"biomejs.biome"
"biomejs.biome",
"ss13.ss13buildflags"
]
}
14 changes: 4 additions & 10 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker",
"name": "Launch DreamSeeker (With selected flags)",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
},
Expand Down Expand Up @@ -39,7 +39,7 @@
{
"type": "byond",
"request": "launch",
"name": "Launch DreamDaemon",
"name": "Launch DreamDaemon (With selected flags)",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
Expand Down Expand Up @@ -82,10 +82,7 @@
"request": "launch",
"program": "${command:dreammaker.returnDreamDaemonPath}",
"cwd": "${workspaceRoot}",
"args": [
"${command:dreammaker.getFilenameDmb}",
"-trusted"
],
"args": ["${command:dreammaker.getFilenameDmb}", "-trusted"],
"preLaunchTask": "Build All"
},
{
Expand All @@ -94,10 +91,7 @@
"request": "launch",
"program": "${command:dreammaker.returnDreamDaemonPath}",
"cwd": "${workspaceRoot}",
"args": [
"${command:dreammaker.getFilenameDmb}",
"-trusted"
],
"args": ["${command:dreammaker.getFilenameDmb}", "-trusted"],
"preLaunchTask": "Build All (low memory mode)"
}
]
Expand Down
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,8 @@
"**/node_modules": true
},
"Lua.diagnostics.enable": false,
"tgstationTestExplorer.project.DMEName": "maplestation.dme"
"tgstationTestExplorer.project.DMEName": "maplestation.dme",
"ss13BuildFlags.baseTask": "Build All",
"ss13BuildFlags.configPath": "tools/build/build_flags.json",
"ss13BuildFlags.injectionMode": "cli-args"
}
98 changes: 42 additions & 56 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,36 @@
"DM_EXE": "${config:dreammaker.byondPath}"
}
},
"problemMatcher": [
"$dreammaker",
"$tsc",
"$eslint-stylish"
],
"problemMatcher": ["$dreammaker", "$tsc", "$eslint-stylish"],
"group": {
"kind": "build",
"isDefault": true
},
"dependsOn": "dm: reparse",
"dependsOn": ["dm: reparse", "Compile BT Trees"],
"label": "Build All"
},
{
"type": "process",
"command": "tools/build/build.sh",
"args": ["-DLOWMEMORYMODE"],
"args": [
"-DSKIP_LAVALAND",
"-DSKIP_SPACE_LEVELS",
"-DFORCE_MAP=\"runtimestation\""
],
"windows": {
"command": ".\\tools\\build\\build.bat",
"args": ["-DLOWMEMORYMODE"]
"args": [
"-DSKIP_LAVALAND",
"-DSKIP_SPACE_LEVELS",
"-DFORCE_MAP=\"runtimestation\""
]
},
"options": {
"env": {
"DM_EXE": "${config:dreammaker.byondPath}"
}
},
"problemMatcher": [
"$dreammaker",
"$tsc",
"$eslint-stylish"
],
"problemMatcher": ["$dreammaker", "$tsc", "$eslint-stylish"],
"group": {
"kind": "build"
},
Expand All @@ -59,18 +59,19 @@
],
"windows": {
"command": ".\\tools\\build\\build.bat",
"args": ["-DTESTING","-DREAGENTS_TESTING","-DTIMER_DEBUG","-DREFERENCE_DOING_IT_LIVE"]
"args": [
"-DTESTING",
"-DREAGENTS_TESTING",
"-DTIMER_DEBUG",
"-DREFERENCE_DOING_IT_LIVE"
]
},
"options": {
"env": {
"DM_EXE": "${config:dreammaker.byondPath}"
}
},
"problemMatcher": [
"$dreammaker",
"$tsc",
"$eslint-stylish"
],
"problemMatcher": ["$dreammaker", "$tsc", "$eslint-stylish"],
"group": {
"kind": "build"
},
Expand All @@ -81,26 +82,32 @@
"type": "process",
"command": "tools/build/build.sh",
"args": [
"-DLOWMEMORYMODE",
"-DSKIP_LAVALAND",
"-DSKIP_SPACE_LEVELS",
"-DTESTING",
"-DREAGENTS_TESTING",
"-DTIMER_DEBUG",
"-DREFERENCE_DOING_IT_LIVE"
"-DREFERENCE_DOING_IT_LIVE",
"-DFORCE_MAP=\"runtimestation\""
],
"windows": {
"command": ".\\tools\\build\\build.bat",
"args": ["-DLOWMEMORYMODE","-DTESTING","-DREAGENTS_TESTING","-DTIMER_DEBUG","-DREFERENCE_DOING_IT_LIVE"]
"args": [
"-DSKIP_LAVALAND",
"-DSKIP_SPACE_LEVELS",
"-DTESTING",
"-DREAGENTS_TESTING",
"-DTIMER_DEBUG",
"-DREFERENCE_DOING_IT_LIVE",
"-DFORCE_MAP=\"runtimestation\""
]
},
"options": {
"env": {
"DM_EXE": "${config:dreammaker.byondPath}"
}
},
"problemMatcher": [
"$dreammaker",
"$tsc",
"$eslint-stylish"
],
"problemMatcher": ["$dreammaker", "$tsc", "$eslint-stylish"],
"group": {
"kind": "build"
},
Expand All @@ -113,18 +120,14 @@
"args": ["-DTESTING", "-DMAP_TEST"],
"windows": {
"command": ".\\tools\\build\\build.bat",
"args": ["-DTESTING","-DMAP_TEST"]
"args": ["-DTESTING", "-DMAP_TEST"]
},
"options": {
"env": {
"DM_EXE": "${config:dreammaker.byondPath}"
}
},
"problemMatcher": [
"$dreammaker",
"$tsc",
"$eslint-stylish"
],
"problemMatcher": ["$dreammaker", "$tsc", "$eslint-stylish"],
"group": {
"kind": "build"
},
Expand All @@ -134,9 +137,7 @@
{
"type": "dreammaker",
"dme": "tgstation.dme",
"problemMatcher": [
"$dreammaker"
],
"problemMatcher": ["$dreammaker"],
"group": "build",
"label": "dm: build - tgstation.dme"
},
Expand All @@ -151,10 +152,7 @@
"windows": {
"command": ".\\bin\\tgui-build.cmd"
},
"problemMatcher": [
"$tsc",
"$eslint-stylish"
],
"problemMatcher": ["$tsc", "$eslint-stylish"],
"group": "build",
"label": "tgui: build"
},
Expand All @@ -164,10 +162,7 @@
"windows": {
"command": ".\\bin\\tgui-dev.cmd"
},
"problemMatcher": [
"$tsc",
"$eslint-stylish"
],
"problemMatcher": ["$tsc", "$eslint-stylish"],
"group": "build",
"label": "tgui: dev server"
},
Expand All @@ -177,10 +172,7 @@
"windows": {
"command": ".\\bin\\tgui-bench.cmd"
},
"problemMatcher": [
"$tsc",
"$eslint-stylish"
],
"problemMatcher": ["$tsc", "$eslint-stylish"],
"group": "build",
"label": "tgui: bench"
},
Expand All @@ -190,10 +182,7 @@
"windows": {
"command": ".\\bin\\tgui-sonar.cmd"
},
"problemMatcher": [
"$tsc",
"$eslint-stylish"
],
"problemMatcher": ["$tsc", "$eslint-stylish"],
"group": "build",
"label": "tgui: sonar"
},
Expand All @@ -203,10 +192,7 @@
"windows": {
"command": ".\\bin\\tgfont.cmd"
},
"problemMatcher": [
"$tsc",
"$eslint-stylish"
],
"problemMatcher": ["$tsc", "$eslint-stylish"],
"group": "build",
"label": "tgui: rebuild tgfont"
}
Expand Down
35 changes: 17 additions & 18 deletions _maps/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,21 @@

#include "map_files\generic\CentCom.dmm"

#ifndef LOWMEMORYMODE
#ifdef ALL_MAPS
#include "map_files\debug\multiz.dmm"
#include "map_files\debug\runtimestation.dmm"
#include "map_files\Deltastation\DeltaStation2.dmm"
#include "map_files\IceBoxStation\IceBoxStation.dmm"
#include "map_files\KiloStation\KiloStation.dmm"
#include "map_files\Limastation\limastation.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\Mining\Lavaland.dmm"
#include "map_files\NebulaStation\NebulaStation.dmm"
#include "map_files\NorthStar\north_star.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\tramstation\tramstation.dmm"
#endif
#ifdef ALL_TEMPLATES
#include "templates.dm"
#endif
#ifdef ALL_MAPS
#include "map_files\debug\multiz.dmm"
#include "map_files\debug\runtimestation.dmm"
#include "map_files\Deltastation\DeltaStation2.dmm"
#include "map_files\IceBoxStation\IceBoxStation.dmm"
#include "map_files\KiloStation\KiloStation.dmm"
#include "map_files\Limastation\limastation.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\Mining\Lavaland.dmm"
#include "map_files\NebulaStation\NebulaStation.dmm"
#include "map_files\NorthStar\north_star.dmm"
#include "map_files\OmegaStation\OmegaStation.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\tramstation\tramstation.dmm"
#endif
#ifdef ALL_TEMPLATES
#include "templates.dm"
#endif
3 changes: 0 additions & 3 deletions code/_compile_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,7 @@
#endif // 1 to use the default behaviour;
// 2 for preloading absolutely everything;

#ifdef LOWMEMORYMODE
#define FORCE_MAP "runtimestation"
#define FORCE_MAP_DIRECTORY "_maps"
#endif

//Additional code for the above flags.
#ifdef TESTING
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/mapping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ SUBSYSTEM_DEF(mapping)

var/start_time

#ifndef LOWMEMORYMODE
#ifndef SKIP_SPACE_LEVELS
start_time = REALTIMEOFDAY
SStitle.add_init_text("Empty Space", "> Space", "<font color='yellow'>LOADING...</font>")
// Create space ruin levels
Expand Down Expand Up @@ -456,7 +456,7 @@ Used by the AI doomsday and the self-destruct nuke.
query_round_map_name.Execute()
qdel(query_round_map_name)

#ifndef LOWMEMORYMODE
#ifndef SKIP_LAVALAND

if(config.minetype == "lavaland")
LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
Expand Down
4 changes: 4 additions & 0 deletions code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ SUBSYSTEM_DEF(ticker)
/// or a "round-ending" event, like summoning Nar'Sie, a blob victory, the nuke going off, etc. ([FORCE_END_ROUND])
var/force_ending = END_ROUND_AS_NORMAL
/// If TRUE, there is no lobby phase, the game starts immediately.
#ifdef AUTOSTART_GAME
var/start_immediately = TRUE
#else
var/start_immediately = FALSE
#endif
/// Boolean to track and check if our subsystem setup is done.
var/setup_done = FALSE

Expand Down
Loading
Loading