Merge branch 'master' into Awaymissoin-gate_lizard

.gitignore

@@ -25,6 +25,7 @@ stddef.dm
 .atom-build.json
 *.vscode/*
 !/.vscode/extensions.json
+!/.vscode/tasks.json
 
 # ignore DMI tool build cache
 /tools/dmitool/bin/

.vscode/extensions.json

@@ -6,6 +6,7 @@
 		"dbaeumer.vscode-eslint",
 		"eamodio.gitlens",
 		"usernamehw.errorlens",
-		"anturk.dmi-editor"
+		"anturk.dmi-editor",
+		"esbenp.prettier-vscode"
     ]
 }

.vscode/tasks.json

@@ -0,0 +1,54 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "dreammaker",
+			"dme": "paradise.dme",
+			"problemMatcher": [
+				"$dreammaker"
+			],
+			"group": "build",
+			"label": "dm: build - paradise.dme"
+		},
+		{
+			"type": "shell",
+			"command": "tgui/bin/tgui-build",
+			"windows": {
+				"command": ".\\tgui\\bin\\tgui-build.bat"
+			},
+			"problemMatcher": [
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": "build",
+			"label": "tgui: build"
+		},
+		{
+			"type": "shell",
+			"command": "tgui/bin/tgui-dev-server",
+			"windows": {
+				"command": ".\\tgui\\bin\\tgui-dev-server.bat"
+			},
+			"problemMatcher": [
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": "build",
+			"label": "tgui: run dev server"
+		}
+		,
+		{
+			"type": "shell",
+			"command": "tgui/bin/tgui-formatting",
+			"windows": {
+				"command": ".\\tgui\\bin\\tgui-formatting.bat"
+			},
+			"problemMatcher": [
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": "build",
+			"label": "tgui: run prettier formatting"
+		}
+	]
+}

SQL/paradise_schema.sql

@@ -625,13 +625,17 @@ CREATE TABLE `json_datum_saves` (
 	INDEX `ckey` (`ckey`) USING BTREE
 ) COLLATE = 'utf8mb4_general_ci' ENGINE = InnoDB;
 
+
+
 --
--- Table structure for table `ckey_whitelist`
+-- SS220 ADDITION AND EDITS
 --
 
+--
+-- Table structure for table `ckey_whitelist`
+--
 DROP TABLE IF EXISTS `ckey_whitelist`;
-CREATE TABLE `ckey_whitelist`
-(
+CREATE TABLE `ckey_whitelist` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`date` DATETIME DEFAULT now() NOT NULL,
 	`ckey` VARCHAR(32) NOT NULL,
@@ -646,29 +650,13 @@ CREATE TABLE `ckey_whitelist`
 --
 -- Table structure for table `admin_wl`
 --
-
 CREATE TABLE `admin_wl` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `admin_rank` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Administrator',
-  `level` int(2) NOT NULL DEFAULT '0',
-  `flags` int(16) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`),
-  KEY `ckey` (`ckey`)
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+	`ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
+	`admin_rank` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Administrator',
+	`level` int(2) NOT NULL DEFAULT '0',
+	`flags` int(16) NOT NULL DEFAULT '0',
+	PRIMARY KEY (`id`),
+	KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
---
--- Table structure for table `json_datum_saves`
---
-DROP TABLE IF EXISTS `json_datum_saves`;
-CREATE TABLE `json_datum_saves` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`ckey` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`slotname` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`slotjson` LONGTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
-	`created` DATETIME NOT NULL DEFAULT current_timestamp(),
-	`updated` DATETIME NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-	PRIMARY KEY (`id`) USING BTREE,
-	UNIQUE INDEX `ckey_unique` (`ckey`, `slotname`) USING BTREE,
-	INDEX `ckey` (`ckey`) USING BTREE
-) COLLATE = 'utf8mb4_general_ci' ENGINE = InnoDB;

_build_dependencies.sh

@@ -2,7 +2,7 @@
 # For dreamchecker
 export SPACEMANDMM_TAG=suite-1.7.1
 # For TGUI
-export NODE_VERSION=12
+export NODE_VERSION=18
 # Stable Byond Major
 export STABLE_BYOND_MAJOR=514
 # Stable Byond Minor

_maps/map_files/cyberiad/cyberiad.dmm

@@ -66899,6 +66899,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 4
 	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "ifN" = (
@@ -73595,6 +73600,15 @@
 /obj/effect/spawner/random_spawners/fungus_maybe,
 /turf/simulated/wall,
 /area/station/legal/courtroom)
+"lQH" = (
+/obj/structure/cable,
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
+	},
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/asmaint)
 "lQS" = (
 /obj/structure/shuttle/engine/propulsion/burst{
 	dir = 8
@@ -74770,6 +74784,11 @@
 /area/station/maintenance/apmaint2)
 "mAv" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "mBl" = (
@@ -76674,11 +76693,11 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/atmos{
-	name = "Aft-Starboard Atmospherics Maintenance"
-	},
 /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/door/airlock/atmos{
+	name = "Fore-Port Secondary Atmospherics Maintenance"
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint2)
 "nMd" = (
@@ -80941,6 +80960,15 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/apmaint)
+"qmp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/asmaint)
 "qms" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -145983,10 +146011,10 @@ hlu
 nXc
 pfF
 mAv
-csL
-csL
-ePu
-hyk
+cOm
+cOm
+qmp
+lQH
 cga
 hyk
 csL

_maps/map_files220/cyberiad/cyberiad.dmm

@@ -9274,16 +9274,17 @@
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "aGQ" = (
-/obj/machinery/newscaster{
-	name = "north bump";
-	pixel_y = 28
-	},
+/obj/machinery/prize_counter,
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "aGR" = (
 /obj/structure/chair/comfy/black{
 	dir = 8
 	},
+/obj/machinery/newscaster{
+	name = "north bump";
+	pixel_y = 28
+	},
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "aGT" = (
@@ -10423,19 +10424,24 @@
 /obj/structure/chair/comfy/black{
 	dir = 1
 	},
+/obj/machinery/computer/mob_healer_terminal{
+	pixel_x = -30
+	},
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "aKK" = (
 /obj/machinery/economy/arcade/claw,
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "aKL" = (
-/obj/machinery/hologram/holopad,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/structure/chair/stool{
+	dir = 4
+	},
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "aKO" = (
@@ -10918,11 +10924,6 @@
 /obj/effect/decal/warning_stripes/south,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
-"aMC" = (
-/obj/structure/table,
-/obj/machinery/computer/mob_healer_terminal,
-/turf/simulated/floor/carpet/arcade,
-/area/station/public/arcade)
 "aMD" = (
 /obj/machinery/status_display{
 	layer = 4;
@@ -11284,10 +11285,10 @@
 	},
 /area/station/service/barber)
 "aOb" = (
-/obj/machinery/prize_counter,
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/economy/arcade/claw,
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "aOg" = (
@@ -52649,6 +52650,15 @@
 /obj/machinery/economy/slot_machine,
 /turf/simulated/floor/wood/fancy/cherry,
 /area/station/service/bar/atrium)
+"fio" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/carpet/arcade,
+/area/station/public/arcade)
 "fiM" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/spawner/random_spawners/oil_maybe,
@@ -55201,6 +55211,12 @@
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/station/command/office/captain)
+"ggd" = (
+/obj/machinery/computer/arcade/recruiter{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/arcade,
+/area/station/public/arcade)
 "ggr" = (
 /obj/item/stack/rods{
 	amount = 4
@@ -65490,6 +65506,8 @@
 /area/station/maintenance/asmaint)
 "jPN" = (
 /obj/machinery/computer/mob_battle_terminal/blue{
+	dir = 2;
+	pixel_y = 0;
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel,
@@ -96191,6 +96209,12 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/station/engineering/hallway)
+"uZJ" = (
+/obj/machinery/computer/arcade/recruiter{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/arcade,
+/area/station/public/arcade)
 "uZW" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -104434,6 +104458,9 @@
 /area/station/maintenance/fpmaint2)
 "xYc" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/chair/stool{
+	dir = 8
+	},
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "xYi" = (
@@ -139767,7 +139794,7 @@ aFI
 aFI
 aFI
 aFI
-aMC
+aKK
 aOb
 aFI
 aDv
@@ -140793,9 +140820,9 @@ ayb
 aFI
 aGP
 mEs
-aJw
-aKK
 fmN
+uZJ
+aJw
 lFe
 ckc
 aQv
@@ -141049,9 +141076,9 @@ aCh
 aEw
 aFI
 aGZ
-mEs
+fio
 aJz
-aKK
+ggd
 dwg
 lFe
 aPf