Merge pull request #538 from Sea-of-Lost-Souls/upstreammaint

[MDB IGNORE][IDB IGNORE] maint mountain do not lick
Sea-of-Lost-Souls · Mar 18, 2024 · a12ed28 · a12ed28
2 parents 758b6ed + f4c55ba
commit a12ed28
Show file tree

Hide file tree

Showing 696 changed files with 12,770 additions and 6,164 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -68,8 +68,6 @@ These are the few directives we have for project maintainers.
 
 These are not steadfast rules as maintainers are expected to use their best judgement when operating.
 
-Our team is entirely voluntary, as such we extend our thanks to maintainers, issue managers, and contributors alike for helping keep the project alive.
-
 </details>
 
 ### Issue Managers
@@ -94,6 +92,10 @@ For more information reference the [Issue Manager Guide](.github/guides/ISSUE_MA
 
 </details>
 
+---
+
+Our team is entirely voluntary, as such we extend our thanks to maintainers, issue managers, and contributors alike for helping keep the project alive.
+
 ## Development Guides
 
 #### Writing readable code 

diff --git a/.github/alternate_byond_versions.txt b/.github/alternate_byond_versions.txt
@@ -5,4 +5,4 @@
 # Format is version: map
 # Example:
 # 500.1337: runtimestation
-515.1621: runtimestation
+515.1627: runtimestation
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,6 +8,13 @@
 			"preLaunchTask": "Build All",
 			"dmb": "${workspaceFolder}/${command:CurrentDMB}"
 		},
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamSeeker (low memory mode)",
+			"preLaunchTask": "Build All (low memory mode)",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}"
+		},
 		{
 			"type": "byond",
 			"request": "launch",
@@ -16,6 +23,14 @@
 			"dmb": "${workspaceFolder}/${command:CurrentDMB}",
 			"dreamDaemon": true
 		},
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamDaemon (low memory mode)",
+			"preLaunchTask": "Build All (low memory mode)",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}",
+			"dreamDaemon": true
+		},
 		{
 			"name": "Debug External Libraries",
 			"type": "cppvsdbg",
@@ -27,6 +42,18 @@
 				"-trusted"
 			],
 			"preLaunchTask": "Build All"
+		},
+		{
+			"name": "Debug External Libraries (low memory mode)",
+			"type": "cppvsdbg",
+			"request": "launch",
+			"program": "${command:dreammaker.returnDreamDaemonPath}",
+			"cwd": "${workspaceRoot}",
+			"args": [
+				"${command:dreammaker.getFilenameDmb}",
+				"-trusted"
+			],
+			"preLaunchTask": "Build All (low memory mode)"
 		}
 	]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,6 +13,7 @@
 	},
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,
+	"git.branchProtection": ["master"],
 	"gitlens.advanced.blame.customArguments": ["-w"],
 	"tgstationTestExplorer.project.resultsType": "json",
 	"[javascript]": {

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -24,6 +24,30 @@
 			"dependsOn": "dm: reparse",
 			"label": "Build All"
 		},
+		{
+			"type": "process",
+			"command": "tools/build/build",
+			"args": ["-DLOWMEMORYMODE"],
+			"windows": {
+				"command": ".\\tools\\build\\build.bat",
+				"args": ["-DLOWMEMORYMODE"]
+			},
+			"options": {
+				"env": {
+					"DM_EXE": "${config:dreammaker.byondPath}"
+				}
+			},
+			"problemMatcher": [
+				"$dreammaker",
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": {
+				"kind": "build"
+			},
+			"dependsOn": "dm: reparse",
+			"label": "Build All (low memory mode)"
+		},
 		{
 			"type": "dreammaker",
 			"dme": "tgstation.dme",

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm
@@ -54,6 +54,10 @@
 /obj/structure/chair/comfy{
 	dir = 1
 	},
+/obj/effect/decal/remains/human/smokey{
+	pixel_x = -3;
+	pixel_y = 9
+	},
 /turf/open/floor/carpet/blue,
 /area/ruin/smoking_room/room)
 "k" = (
@@ -245,11 +249,6 @@
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "R" = (
-/obj/effect/spawner/random/entertainment/cigarette_pack,
-/obj/effect/decal/cleanable/ash/large{
-	pixel_x = -1;
-	pixel_y = 5
-	},
 /obj/structure/showcase/machinery/tv/broken,
 /turf/open/floor/carpet/blue,
 /area/ruin/smoking_room/room)
@@ -279,17 +278,12 @@
 /turf/open/floor/stone,
 /area/ruin/smoking_room/house)
 "W" = (
-/obj/effect/spawner/random/entertainment/cigarette_pack,
 /obj/structure/chair/plastic{
 	dir = 8
 	},
 /obj/effect/spawner/random/entertainment/cigarette_pack,
 /obj/effect/decal/cleanable/ash/large,
 /obj/structure/sign/calendar/directional/east,
-/obj/effect/decal/remains/human/smokey{
-	pixel_x = -3;
-	pixel_y = 9
-	},
 /turf/open/floor/carpet/blue,
 /area/ruin/smoking_room/room)
 "X" = (

diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
@@ -250,11 +250,7 @@
 /turf/open/floor/iron/dark/textured_large,
 /area/ruin/syndicate_lava_base/bar)
 "bv" = (
-/obj/structure/frame/machine{
-	anchored = 1;
-	state = 2;
-	icon_state = "box_1"
-	},
+/obj/structure/frame/machine/secured,
 /obj/item/circuitboard/machine/ore_redemption,
 /obj/item/assembly/igniter,
 /obj/structure/marker_beacon/burgundy,
@@ -406,11 +402,7 @@
 /turf/open/floor/iron/dark/textured_large,
 /area/ruin/syndicate_lava_base/main)
 "cm" = (
-/obj/structure/frame/machine{
-	anchored = 1;
-	state = 2;
-	icon_state = "box_1"
-	},
+/obj/structure/frame/machine/secured,
 /obj/item/circuitboard/machine/ore_silo,
 /obj/structure/marker_beacon/burgundy,
 /obj/structure/sign/flag/syndicate/directional/north,