Merge remote-tracking branch 'upstream/master'

.vscode/launch.json

@@ -0,0 +1,12 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "byond",
+      "request": "launch",
+      "name": "Launch DreamSeeker",
+      "preLaunchTask": "Build All",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}"
+    }
+  ]
+}

.vscode/settings.json

@@ -6,8 +6,11 @@
 	"typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
 	"typescript.enablePromptUseWorkspaceTsdk": true,
 	"search.exclude": {
-		"tgui/.yarn": true,
-		"tgui/.pnp.*": true
+		"**/.yarn": true,
+		"**/.pnp.*": true
+	},
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": true
 	},
 	"workbench.editorAssociations": [
 		{
@@ -17,5 +20,14 @@
 	],
 	"files.eol": "\n",
 	"gitlens.advanced.blame.customArguments": ["-w"],
-	"tgstationTestExplorer.project.resultsType": "json"
+	"tgstationTestExplorer.project.resultsType": "json",
+	"[javascript]": {
+		"editor.rulers": [80]
+	},
+	"[typescript]": {
+		"editor.rulers": [80]
+	},
+	"[scss]": {
+		"editor.rulers": [80]
+	}
 }

.vscode/tasks.json

@@ -0,0 +1,55 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "process",
+			"command": "tools/build/build",
+			"windows": {
+				"command": ".\\tools\\build\\build.bat"
+			},
+			"options": {
+				"env": {
+					"DM_EXE": "${config:dreammaker.byondPath}"
+				}
+			},
+			"problemMatcher": [
+				"$dreammaker",
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"dependsOn": "dm: reparse",
+			"label": "Build All"
+		},
+		{
+			"type": "dreammaker",
+			"dme": "tgstation.dme",
+			"problemMatcher": [
+				"$dreammaker"
+			],
+			"group": "build",
+			"label": "dm: build - tgstation.dme"
+		},
+		{
+			"type": "shell",
+			"command": "tgui/bin/tgui",
+			"windows": {
+				"command": ".\\tgui\\bin\\tgui.bat"
+			},
+			"problemMatcher": [
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": "build",
+			"label": "tgui: build"
+		},
+		{
+			"command": "${command:dreammaker.reparse}",
+			"group": "build",
+			"label": "dm: reparse"
+		}
+	]
+}

_maps/map_files/MetaStation/MetaStation.dmm

@@ -44290,6 +44290,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cRW" = (
@@ -44301,10 +44304,13 @@
 	name = "containment blast door"
 	},
 /obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/science/xenobiology)
 "cRX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cRY" = (
@@ -44316,6 +44322,7 @@
 	name = "test chamber blast door"
 	},
 /obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
 /area/science/xenobiology)
 "cRZ" = (
@@ -44328,6 +44335,9 @@
 	name = "containment blast door"
 	},
 /obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/science/xenobiology)
 "cSa" = (
@@ -44398,10 +44408,12 @@
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "cSi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cSj" = (
@@ -44432,6 +44444,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cSm" = (
@@ -44446,6 +44461,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cSn" = (
@@ -44477,10 +44495,16 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "cSr" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cSs" = (
@@ -44492,6 +44516,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cSt" = (
@@ -44510,6 +44537,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "cSw" = (
@@ -44523,6 +44553,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cSx" = (
@@ -44540,16 +44573,6 @@
 /mob/living/simple_animal/slime,
 /turf/open/floor/engine,
 /area/science/xenobiology)
-"cSA" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/turf/open/floor/plasteel/white,
-/area/science/xenobiology)
 "cSB" = (
 /obj/structure/table/reinforced,
 /obj/machinery/button/door{
@@ -44567,6 +44590,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cSD" = (
@@ -44579,6 +44605,9 @@
 	name = "containment blast door"
 	},
 /obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/science/xenobiology)
 "cSE" = (
@@ -44628,10 +44657,12 @@
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cSK" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cSL" = (
@@ -44644,6 +44675,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cSM" = (
@@ -44658,6 +44690,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cSN" = (
@@ -44675,6 +44710,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "cSO" = (
@@ -44686,6 +44724,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cSP" = (
@@ -44708,6 +44749,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "cSR" = (
@@ -44721,6 +44765,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cSS" = (
@@ -44740,6 +44787,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cST" = (
@@ -44759,6 +44809,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cSV" = (
@@ -44806,6 +44859,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cTa" = (
@@ -44826,6 +44880,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cTc" = (
@@ -44843,18 +44900,14 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "cTe" = (
-/obj/machinery/door/window/northleft{
-	base_state = "right";
-	dir = 8;
-	icon_state = "right";
-	name = "Containment Pen #6";
-	req_access_txt = "55"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
@@ -44871,6 +44924,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "cTj" = (
@@ -44955,6 +45011,7 @@
 	},
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cTs" = (
@@ -44996,6 +45053,7 @@
 /obj/item/clothing/glasses/science,
 /obj/structure/table,
 /obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "cTA" = (
@@ -45060,6 +45118,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cUN" = (
@@ -45095,6 +45156,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cVd" = (
@@ -45552,6 +45614,7 @@
 /area/science/xenobiology)
 "daC" = (
 /obj/structure/sign/warning/electricshock,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall/r_wall,
 /area/science/xenobiology)
 "daD" = (
@@ -46193,6 +46256,9 @@
 /area/science/xenobiology)
 "dcy" = (
 /obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "dcz" = (
@@ -46207,8 +46273,8 @@
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "dcB" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
 	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
@@ -46358,6 +46424,9 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "dcR" = (
@@ -46369,6 +46438,9 @@
 	name = "containment blast door"
 	},
 /obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/science/xenobiology)
 "dcS" = (
@@ -46419,6 +46491,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "dcW" = (
@@ -46430,6 +46505,9 @@
 	name = "containment blast door"
 	},
 /obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/science/xenobiology)
 "dcX" = (
@@ -46442,16 +46520,21 @@
 	name = "containment blast door"
 	},
 /obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/science/xenobiology)
 "dcY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "dcZ" = (
@@ -46476,6 +46559,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "ddb" = (
@@ -46683,6 +46767,7 @@
 	name = "test chamber blast door"
 	},
 /obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
 /area/science/xenobiology)
 "ddx" = (
@@ -49271,6 +49356,9 @@
 /area/hallway/secondary/exit/departure_lounge)
 "dDI" = (
 /obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "dDJ" = (
@@ -50816,6 +50904,14 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/commons/fitness/recreation)
+"ezU" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
 "eAd" = (
 /obj/machinery/door/airlock/highsecurity{
 	name = "Secure Tech Storage";
@@ -53469,6 +53565,13 @@
 	},
 /turf/open/floor/wood,
 /area/service/theater)
+"ggU" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 8;
+	name = "Air to Distro"
+	},
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
 "ghb" = (
 /turf/open/floor/plating,
 /area/engineering/main)
@@ -54419,6 +54522,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/office)
+"gLN" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "gLV" = (
 /obj/machinery/vending/boozeomat,
 /obj/machinery/light/small{
@@ -54656,6 +54765,12 @@
 /obj/item/clothing/under/suit/tan,
 /turf/open/floor/carpet,
 /area/commons/dorms)
+"gTs" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "gTN" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 10
@@ -54783,6 +54898,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/engineering/gravity_generator)
 "gZF" = (
@@ -56621,6 +56739,12 @@
 "icE" = (
 /turf/closed/wall,
 /area/security/office)
+"idm" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
 "idx" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
@@ -57342,6 +57466,11 @@
 "izZ" = (
 /turf/open/floor/engine/n2o,
 /area/engineering/atmos)
+"iAD" = (
+/obj/structure/sign/warning/electricshock,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/science/xenobiology)
 "iAK" = (
 /obj/structure/window/reinforced,
 /obj/effect/turf_decal/tile/red{
@@ -57468,6 +57597,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/engineering/gravity_generator)
 "iFq" = (
@@ -57645,6 +57777,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/command/nuke_storage)
+"iIk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "iIJ" = (
 /obj/item/instrument/violin,
 /obj/structure/table/wood,
@@ -58605,6 +58743,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/service/bar)
+"jqj" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "jra" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -60105,6 +60249,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/engineering/break_room)
+"kje" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8;
+	name = "Xenobiology air connection"
+	},
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
 "kjA" = (
 /obj/item/clothing/gloves/color/yellow,
 /obj/item/clothing/gloves/color/yellow,
@@ -61596,6 +61747,12 @@
 	dir = 5
 	},
 /area/service/kitchen)
+"lbz" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "lbV" = (
 /obj/item/folder/white{
 	pixel_x = 4;
@@ -61820,6 +61977,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/service/hydroponics/garden)
+"lhY" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "lix" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -63141,6 +63304,12 @@
 	dir = 1
 	},
 /area/engineering/atmos)
+"lYC" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
 "lYW" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
@@ -65519,6 +65688,16 @@
 	},
 /turf/open/floor/plating,
 /area/commons/fitness/pool)
+"nBJ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
 "nBX" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin{
@@ -65816,6 +65995,10 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/wood,
 /area/service/library)
+"nPc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/science/xenobiology)
 "nPf" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -70937,10 +71120,10 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
 /obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/engineering/gravity_generator)
 "qID" = (
@@ -73740,11 +73923,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/command/storage/eva)
-"spO" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/turf/open/floor/plating,
-/area/engineering/atmos)
 "spZ" = (
 /obj/structure/chair/stool,
 /turf/open/floor/plasteel/chapel,
@@ -75262,6 +75440,10 @@
 	dir = 5
 	},
 /area/service/kitchen)
+"tpE" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "tpO" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -76675,13 +76857,18 @@
 	},
 /turf/open/floor/wood,
 /area/service/library)
+"uiZ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
 "ujb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel,
 /area/engineering/gravity_generator)
 "ujE" = (
@@ -78599,6 +78786,13 @@
 /obj/effect/landmark/start/atmospheric_technician,
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
+"vzs" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/mob/living/simple_animal/slime,
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "vzO" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -79000,6 +79194,10 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engineering/storage/tech)
+"vNv" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/science/xenobiology)
 "vNx" = (
 /obj/machinery/computer/security,
 /obj/machinery/computer/security/telescreen{
@@ -81539,6 +81737,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/commons/toilet/auxiliary)
+"xjK" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "xjY" = (
 /obj/machinery/holopad,
 /turf/open/floor/wood,
@@ -82350,6 +82554,12 @@
 	dir = 1
 	},
 /area/engineering/atmos)
+"xGQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "xGS" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -82432,6 +82642,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/storage)
+"xIL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "xJf" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -116073,16 +116287,16 @@ cRi
 cRe
 cRi
 cSg
-cSn
-cSn
+lbz
+xjK
 cSd
 cSg
-cSn
-cSn
+lbz
+xjK
 cSd
 cSg
-cSn
-cSn
+lbz
+xjK
 cRi
 cTA
 cTn
@@ -116330,16 +116544,16 @@ cRi
 cRD
 cSd
 cSg
-cSn
-cSn
+xGQ
+iIk
 cSd
 cSg
-cSn
-cSn
+xGQ
+iIk
 cSd
 cSg
-cSn
-cSn
+xGQ
+iIk
 cRi
 cRi
 cTq
@@ -116854,14 +117068,14 @@ cSI
 cSj
 cTb
 cST
-cSd
+nPc
 cSL
 cVa
 cTr
 cRY
 daC
-cSn
-cSn
+xIL
+lhY
 cSn
 cRi
 dmq
@@ -117102,11 +117316,11 @@ dcG
 cSe
 cSi
 cSr
-cSA
+dcY
 cSG
 cSK
 cSr
-cSA
+dcY
 cSW
 cSK
 cSr
@@ -117358,15 +117572,15 @@ cRk
 dcH
 cSf
 cSl
-cSJ
+uiZ
 cSa
 cSJ
-cSJ
+nBJ
 cUM
 cUN
 cSJ
-cSJ
-cSJ
+nBJ
+uiZ
 cSV
 cSJ
 cSX
@@ -117882,14 +118096,14 @@ cSI
 dcV
 cTe
 dda
-cSd
+vNv
 cSZ
-ddn
+ezU
 cTz
 ddv
-daC
-cSn
-cSn
+iAD
+tpE
+gTs
 daN
 cRi
 dmr
@@ -118124,8 +118338,8 @@ aaa
 cRi
 doj
 dcp
-cSt
-cSt
+idm
+lYC
 dcK
 cSd
 cRW
@@ -118385,16 +118599,16 @@ dcy
 cSt
 dcL
 cSd
-cSn
-cSn
+iIk
+xGQ
 cSg
 cSd
-cSn
-cSn
+iIk
+xGQ
 cSg
 cSd
-cSn
-cSn
+iIk
+xGQ
 cSg
 cRi
 cRi
@@ -118638,20 +118852,20 @@ aaa
 cRi
 dce
 cSt
-cSt
+ggU
 dcC
 dcM
 cSd
-cSn
-cSn
+iIk
+gLN
 cSg
 cSd
-cSn
-cSn
+iIk
+gLN
 cSg
 cSd
-cSn
-cSn
+iIk
+gLN
 cSg
 cRi
 ddh
@@ -118895,19 +119109,19 @@ aaa
 cRi
 dcf
 dcr
-dcr
+kje
 dcD
 dcN
 cSd
-cSn
+jqj
 cSx
 cSF
 cSd
-cSy
+vzs
 dbp
 cSF
 cSd
-cSn
+jqj
 dbt
 cSF
 cRi
@@ -125275,7 +125489,7 @@ mMn
 mMn
 iAK
 tie
-spO
+rid
 cfw
 mTL
 ilE
@@ -125729,7 +125943,7 @@ mNX
 xXs
 pHX
 qIq
-kCp
+jgc
 gZo
 nPJ
 kCp
@@ -126303,7 +126517,7 @@ mMn
 tSa
 guR
 elE
-spO
+rid
 cfw
 mTL
 ygg

code/__HELPERS/roundend.dm

@@ -551,8 +551,7 @@
 	///How many players joined the round.
 	var/total_players = GLOB.joined_player_list.len
 	var/list/typecache_bank = typecacheof(list(/datum/bank_account/department, /datum/bank_account/remote))
-	for(var/i in SSeconomy.generated_accounts)
-		var/datum/bank_account/current_acc = SSeconomy.generated_accounts[i]
+	for(var/datum/bank_account/current_acc in SSeconomy.generated_accounts)
 		if(typecache_bank[current_acc.type])
 			continue
 		station_vault += current_acc.account_balance

code/_onclick/hud/radial.dm

@@ -13,7 +13,6 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	icon_state = "radial_slice"
 	var/choice
 	var/next_page = FALSE
-	var/tooltips = FALSE
 
 /obj/screen/radial/slice/MouseEntered(location, control, params)
 	. = ..()

code/datums/components/radioactive.dm

@@ -52,8 +52,15 @@
 		return
 	strength -= strength / hl3_release_date
 	if(strength <= RAD_BACKGROUND_RADIATION)
-		qdel(src)
+		addtimer(CALLBACK(src, .proc/check_dissipate), 5 SECONDS)
+		return PROCESS_KILL
 
+/datum/component/radioactive/proc/check_dissipate()
+	if(strength <= RAD_BACKGROUND_RADIATION)
+		qdel(src)
+		return
+	if(!(datum_flags & DF_ISPROCESSING))	// keep going
+		START_PROCESSING(SSradiation, src)
 
 /datum/component/radioactive/proc/glow_loop(atom/movable/master)
 	var/filter = master.get_filter("rad_glow")

code/datums/components/storage/concrete/pockets.dm

@@ -57,7 +57,7 @@
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
 		/obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/magrifle/pistol,
-		/obj/item/toy/plush/snakeplushie, /obj/item/gun/energy/e_gun/mini
+		/obj/item/toy/plush/snakeplushie, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/ballistic/derringer
 		))
 
 /datum/component/storage/concrete/pockets/shoes/clown/Initialize()

code/datums/helper_datums/teleport.dm

@@ -142,7 +142,8 @@
 		// Can most things breathe?
 		if(trace_gases)
 			continue
-		if(A.get_moles(/datum/gas/oxygen) >= 16)
+		var/oxy_moles = A.get_moles(/datum/gas/oxygen)
+		if(oxy_moles < 16 || oxy_moles > 50)
 			continue
 		if(A.get_moles(/datum/gas/plasma))
 			continue

code/game/atoms_movable.dm

@@ -55,6 +55,9 @@
 	///Internal holder for emissive blocker object, do not use directly use blocks_emissive
 	var/atom/movable/emissive_blocker/em_block
 
+	/// Should we use tooltips, if the thing does not have the code implemented `get_tooltip_data()`, it will default to examine(src)
+	var/tooltips = FALSE
+
 
 /atom/movable/Initialize(mapload)
 	. = ..()

code/game/machinery/computer/communications.dm

@@ -79,6 +79,7 @@
 	if (obj_flags & EMAGGED)
 		return
 	obj_flags |= EMAGGED
+	SSshuttle.shuttle_purchase_requirements_met |= "emagged"
 	if (authenticated)
 		authorize_access = get_all_accesses()
 	to_chat(user, "<span class='danger'>You scramble the communication routing circuits!</span>")

code/game/objects/effects/effect_system/effects_foam.dm

@@ -309,6 +309,10 @@
 
 /obj/structure/foamedmetal/resin/Initialize()
 	. = ..()
+	neutralize_air()
+	addtimer(CALLBACK(src, .proc/neutralize_air), 5)		// yeah this sucks, maybe when auxmos is out
+
+/obj/structure/foamedmetal/resin/proc/neutralize_air()
 	if(isopenturf(loc))
 		var/turf/open/O = loc
 		O.ClearWet()

code/game/objects/items/cards_ids.dm

@@ -553,6 +553,9 @@
 /obj/item/card/id/syndicate/locked_banking
 	bank_support = ID_LOCKED_BANK_ACCOUNT
 
+/obj/item/card/id/pirate
+	access = list(ACCESS_SYNDICATE)
+
 /obj/item/card/id/captains_spare
 	name = "captain's spare ID"
 	desc = "The spare ID of the High Lord himself."

code/game/objects/items/kitchen.dm

@@ -248,6 +248,24 @@
 /obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return BRUTELOSS
+
+/obj/item/kitchen/unrollingpin
+	name = "unrolling pin"
+	desc = "For when you accidentally flattened something."
+	icon_state = "unrolling_pin"
+	force = 8
+	throwforce = 5
+	throw_speed = 3
+	throw_range = 7
+	w_class = WEIGHT_CLASS_NORMAL
+	custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5)
+	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+	custom_price = PRICE_ALMOST_CHEAP
+
+/obj/item/kitchen/unrollingpin/suicide_act(mob/living/carbon/user)
+	user.visible_message("<span class='suicide'>[user] begins unflattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	return BRUTELOSS
+
 /* Trays  moved to /obj/item/storage/bag */
 
 /obj/item/kitchen/knife/scimitar

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -248,6 +248,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	null, \
 	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 20), \
 	new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
+	new/datum/stack_recipe("unrolling pin", /obj/item/kitchen/unrollingpin, 2, time = 30), \
 	new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wood, 2, time = 30), \
 	new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
 	new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \

code/game/objects/items/storage/fancy.dm

@@ -367,7 +367,7 @@
 /obj/item/storage/fancy/cigarettes/derringer/AltClick(mob/living/carbon/user)
 	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
 		return
-	var/obj/item/W = (locate(/obj/item/ammo_casing/a357) in contents) || (locate(/obj/item/clothing/mask/cigarette) in contents) || locate(/obj/item/ammo_casing/g4570) //Easy access smokes and bullets
+	var/obj/item/W = (locate(/obj/item/ammo_casing/a357) in contents) || (locate(/obj/item/clothing/mask/cigarette) in contents) ||(locate(/obj/item/gun/ballistic/derringer) in contents) || (locate(/obj/item/ammo_casing/c38) in contents) || locate(/obj/item/ammo_casing/g4570) in contents//Easy access smokes and bullets
 	if(W && contents.len > 0)
 		SEND_SIGNAL(src, COMSIG_TRY_STORAGE_TAKE, W, user)
 		user.put_in_hands(W)
@@ -382,6 +382,7 @@
 	new /obj/item/ammo_casing/a357(src)
 	new /obj/item/ammo_casing/a357(src)
 	new /obj/item/ammo_casing/a357(src)
+	new /obj/item/ammo_casing/a357(src)
 	new /obj/item/clothing/mask/cigarette/syndicate(src)
 
 //For traitors with luck/class
@@ -404,6 +405,7 @@
 	new /obj/item/ammo_casing/g4570(src)
 	new /obj/item/ammo_casing/g4570(src)
 	new /obj/item/ammo_casing/g4570(src)
+	new /obj/item/ammo_casing/g4570(src)
 	new /obj/item/clothing/mask/cigarette/xeno(src)
 
 //For Cargomen, looking for a good deal on arms, with no quarrels as to where they're from.
@@ -419,6 +421,7 @@
 	new /obj/item/ammo_casing/c38/lethal(src)
 	new /obj/item/ammo_casing/c38/lethal(src)
 	new /obj/item/ammo_casing/c38/lethal(src)
+	new /obj/item/ammo_casing/c38/lethal(src)
 	new /obj/item/clothing/mask/cigarette/shadyjims (src)
 /////////////
 //CIGAR BOX//

code/modules/admin/verbs/randomverbs.dm

@@ -571,6 +571,26 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	message_admins("[key_name_admin(src)] has created a command report")
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/proc/cmd_admin_make_priority_announcement()
+	set category = "Admin.Events"
+	set name = "Make Priority Announcement"
+
+	if(!check_rights(R_ADMIN))
+		return
+
+	var/input = input(usr, "Enter a priority announcement. Ensure it makes sense IC.", "What?", "") as message|null
+	if(!input)
+		return
+
+	var/title = input(src, "What should the title be?", "What?","") as text|null
+
+	var/special_name = input(src, "Who is making the announcement?", "Who?", "") as text|null
+	priority_announce(input, title, sender_override = special_name)
+
+	log_admin("[key_name(src)] has sent a priority announcement: [input]")
+	message_admins("[key_name_admin(src)] has made a priority announcement")
+	SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Priority Announcement") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /client/proc/cmd_change_command_name()
 	set category = "Admin.Events"
 	set name = "Change Command Name"

code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm

@@ -115,7 +115,7 @@
 			skewee.visible_message("<span class='warning'>[skewee] painfully slides back down [src].</span>")
 			if(skewee.stat >= UNCONSCIOUS)
 				return //by ratvar, no more spamming my deadchat, holy fuck
-			skewee.say("Oof, ouch owwie!!", forced = "fail brass skewer removal")
+			skewee.emote("pain")
 			return
 	skewee.visible_message("<span class='danger'>[skewee] comes free of [src] with a squelching pop!</span>", \
 	"<span class='boldannounce'>You come free of [src]!</span>")

code/modules/antagonists/eldritch_cult/eldritch_items.dm

@@ -62,13 +62,24 @@
 
 /datum/action/innate/heretic_shatter/IsAvailable()
 	if(IS_HERETIC(holder) || IS_HERETIC_MONSTER(holder))
-		return TRUE
+		return ..()
 	else
 		return FALSE
 
 /datum/action/innate/heretic_shatter/Activate()
 	if(do_after(holder,10, target = holder))
-		var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE)
+		if(!sword || QDELETED(sword))
+			return
+		if(!IsAvailable())	//Never trust the user.
+			return
+		var/swordz = (get_turf(sword))?.z	//SHOULD usually have a turf but if it doesn't better be prepared.
+		if(!swordz)
+			to_chat(holder, "<span class='warning'>[sword] flickers but remains in place, as do you...</span>")
+			return
+		var/turf/safe_turf = find_safe_turf(zlevels = swordz, extended_safety_checks = TRUE)
+		if(!safe_turf)
+			to_chat(holder, "<span class='warning'>[sword] flickers but remains in place, as do you...</span>")
+			return
 		do_teleport(holder,safe_turf,forceMove = TRUE,channel=TELEPORT_CHANNEL_MAGIC)
 		to_chat(holder,"<span class='warning'>You feel a gust of energy flow through your body... the Rusted Hills heard your call...</span>")
 		qdel(sword)

code/modules/atmospherics/environmental/LINDA_system.dm

@@ -44,7 +44,7 @@
 	return FALSE
 
 /turf/proc/ImmediateCalculateAdjacentTurfs()
-	var/canpass = CANATMOSPASS(src, src) 
+	var/canpass = CANATMOSPASS(src, src)
 	var/canvpass = CANVERTICALATMOSPASS(src, src)
 	for(var/direction in GLOB.cardinals_multiz)
 		var/turf/T = get_step_multiz(src, direction)
@@ -79,31 +79,27 @@
 	if (atmos_adjacent_turfs)
 		adjacent_turfs = atmos_adjacent_turfs.Copy()
 	else
-		adjacent_turfs = list()
+		return list()		// don't bother checking diagonals, diagonals are going to be cardinal checks anyways.
 
 	if (!alldir)
 		return adjacent_turfs
 
-	var/turf/curloc = src
-
-	for (var/direction in GLOB.diagonals_multiz)
-		var/matchingDirections = 0
-		var/turf/S = get_step_multiz(curloc, direction)
-		if(!S)
+	var/turf/other
+	var/turf/mid
+	for (var/d in GLOB.diagonals)
+		other = get_step(src, d)
+		if(!other)
+			continue
+		// NS step
+		mid = get_step(src, NSCOMPONENT(d))
+		if((mid in adjacent_turfs) && (get_step(mid, EWCOMPONENT(d)) in adjacent_turfs))
+			adjacent_turfs += other
+			continue
+		// EW step
+		mid = get_step(src, EWCOMPONENT(d))
+		if((mid in adjacent_turfs) && (get_step(mid, NSCOMPONENT(d)) in adjacent_turfs))
+			adjacent_turfs += other
 			continue
-
-		for (var/checkDirection in GLOB.cardinals_multiz)
-			var/turf/checkTurf = get_step(S, checkDirection)
-			if(!S.atmos_adjacent_turfs || !S.atmos_adjacent_turfs[checkTurf])
-				continue
-
-			if (adjacent_turfs[checkTurf])
-				matchingDirections++
-
-			if (matchingDirections >= 2)
-				adjacent_turfs += S
-				break
-
 	return adjacent_turfs
 
 /atom/proc/air_update_turf(command = 0)

code/modules/cargo/packs/armory.dm

@@ -240,7 +240,6 @@
 	desc = "Hey kid.. c'mere. Boss says we need to offload these, to any buyer, no questions asked. You pay us, we give you three of these guns, no strings attached. Locks are to ensure they get to PAYING customers."
 	cost = 2000
 	contraband = TRUE
-	can_private_buy = TRUE
 	contains = list(/obj/item/storage/fancy/cigarettes/derringer/smuggled,
 					/obj/item/storage/fancy/cigarettes/derringer/smuggled,
 					/obj/item/storage/fancy/cigarettes/derringer/smuggled,

code/modules/client/preferences_savefile.dm

@@ -5,7 +5,7 @@
 //	You do not need to raise this if you are adding new values that have sane defaults.
 //	Only raise this value when changing the meaning/format/name/layout of an existing value
 //	where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX	50
+#define SAVEFILE_VERSION_MAX	51
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -295,6 +295,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 			L -= ROLE_SYNDICATE
 		S["be_special"] << L
 
+	if(current_version < 51) //humans can have digi legs now, make sure they dont default to them or human players will murder me in my sleep
+		if(S["species"] == SPECIES_HUMAN)
+			features["legs"] = "Plantigrade"
+
 /datum/preferences/proc/load_path(ckey,filename="preferences.sav")
 	if(!ckey)
 		return

code/modules/clothing/outfits/standard.dm

@@ -89,10 +89,8 @@
 /datum/outfit/pirate/space
 	suit = /obj/item/clothing/suit/space/pirate
 	head = /obj/item/clothing/head/helmet/space/pirate/bandana
-	mask = /obj/item/clothing/mask/breath
-	suit_store = /obj/item/tank/internals/oxygen
 	ears = /obj/item/radio/headset/syndicate
-	id = /obj/item/card/id
+	id = /obj/item/card/id/pirate
 
 /datum/outfit/pirate/space/captain
 	head = /obj/item/clothing/head/helmet/space/pirate

code/modules/events/pirates.dm

@@ -206,6 +206,7 @@
 	icon_screen = "syndishuttle"
 	icon_keyboard = "syndie_key"
 	light_color = LIGHT_COLOR_RED
+	req_access = list(ACCESS_SYNDICATE)
 	possible_destinations = "pirateship_away;pirateship_home;pirateship_custom"
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate
@@ -214,8 +215,8 @@
 	shuttleId = "pirateship"
 	lock_override = CAMERA_LOCK_STATION
 	shuttlePortId = "pirateship_custom"
-	x_offset = 9
-	y_offset = 0
+	x_offset = 11
+	y_offset = 1
 	see_hidden = FALSE
 
 /obj/docking_port/mobile/pirate
@@ -224,11 +225,7 @@
 	rechargeTime = 3 MINUTES
 
 /obj/machinery/suit_storage_unit/pirate
-	suit_type = /obj/item/clothing/suit/space
-	helmet_type = /obj/item/clothing/head/helmet/space
-	mask_type = /obj/item/clothing/mask/breath
-	storage_type = /obj/item/tank/jetpack/void
-	// storage_type = /obj/item/tank/internals/oxygen
+	storage_type = /obj/item/tank/jetpack/carbondioxide
 
 /obj/machinery/loot_locator
 	name = "Booty Locator"

code/modules/events/supernova.dm

@@ -17,24 +17,29 @@
 	announceWhen = rand(4, 60)
 	supernova = new
 	SSsun.suns += supernova
-	if(prob(20))
-		power = rand(5,100) / 100
-	else
-		power = rand(5,5000) / 100
+	switch(rand(1,5))
+		if(1)
+			power = rand(5,100) / 100
+		if(2)
+			power = rand(5,500) / 100
+		if(3)
+			power = rand(5,1000) / 100
+		if(4, 5)
+			power = rand(5,5000) / 100
 	supernova.azimuth = rand(0, 359)
 	supernova.power_mod = 0
 
 /datum/round_event/supernova/announce()
-	var/message = "Our tachyon-doppler array has detected a supernova in your vicinity. Peak flux from the supernova estimated to be [round(power,0.1)] times current solar flux. [power > 1 ? "Short burts of radiation may be possible, so please prepare accordingly." : ""]"
+	var/message = "[station_name()]: Our tachyon-doppler array has detected a supernova in your vicinity. Peak flux from the supernova estimated to be [round(power,0.1)] times current solar flux; if the supernova is close to your sun in the sky, your solars may receive this as a power boost.[power > 1 ? " Short burts of radiation may be possible, so please prepare accordingly." : ""] We hope you enjoy the light."
 	if(prob(power * 25))
-		priority_announce(message)
+		priority_announce(message, sender_override = "Nanotrasen Meteorology Division")
 	else
 		print_command_report(message)
 
 
 /datum/round_event/supernova/start()
 	supernova.power_mod = 0.001 * power
-	var/explosion_size = rand(1000000000, 999999999)
+	var/explosion_size = rand(1000000000, 10000000000)
 	var/turf/epicenter = get_turf_in_angle(supernova.azimuth, SSmapping.get_station_center(), round(world.maxx * 0.45))
 	for(var/array in GLOB.doppler_arrays)
 		var/obj/machinery/doppler_array/A = array
@@ -51,13 +56,15 @@
 		supernova.power_mod = min(supernova.power_mod*1.2, power)
 	if(activeFor > endWhen-10)
 		supernova.power_mod /= 4
-	if(prob(round(supernova.power_mod)) && prob(5) && storm_count < 5 && !SSweather.get_weather_by_type(/datum/weather/rad_storm))
+	if(prob(round(supernova.power_mod*2)) && prob(3) && storm_count < 5 && !SSweather.get_weather_by_type(/datum/weather/rad_storm))
 		SSweather.run_weather(/datum/weather/rad_storm/supernova)
 		storm_count++
 
 /datum/round_event/supernova/end()
 	SSsun.suns -= supernova
 	qdel(supernova)
+	priority_announce("The supernova's flux is now negligible. Radiation storms have ceased. Have a pleasant shift, [station_name()], and thank you for bearing with nature.",
+	sender_override = "Nanotrasen Meteorology Division")
 
 /datum/weather/rad_storm/supernova
 	weather_duration_lower = 50

code/modules/food_and_drinks/food/snacks/dough.dm

@@ -26,6 +26,17 @@
 	else
 		..()
 
+/obj/item/reagent_containers/food/snacks/flatdough/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/kitchen/unrollingpin))
+		if(isturf(loc))
+			new /obj/item/reagent_containers/food/snacks/dough(loc)
+			to_chat(user, "<span class='notice'>You unflatten [src].</span>")
+			qdel(src)
+		else
+			to_chat(user, "<span class='warning'>You need to put [src] on a surface to undo the rolling!</span>")
+	else
+		..()
+
 
 // sliceable into 3xdoughslices
 /obj/item/reagent_containers/food/snacks/flatdough
@@ -98,6 +109,17 @@
 	else
 		..()
 
+/obj/item/reagent_containers/food/snacks/piedough/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/kitchen/unrollingpin))
+		if(isturf(loc))
+			new /obj/item/reagent_containers/food/snacks/cakebatter(loc)
+			to_chat(user, "<span class='notice'>You unflatten [src].</span>")
+			qdel(src)
+		else
+			to_chat(user, "<span class='warning'>You need to put [src] on a surface to undo the rolling!</span>")
+	else
+		..()
+
 /obj/item/reagent_containers/food/snacks/piedough
 	name = "pie dough"
 	desc = "Cook it to get a pie."

code/modules/library/soapstone.dm

@@ -152,7 +152,7 @@
 	var/newcolor = copytext_char(hash, 1, 7)
 	add_atom_colour("#[newcolor]", FIXED_COLOUR_PRIORITY)
 	light_color = "#[newcolor]"
-	set_light(1)
+	set_light(0.3)
 
 /obj/structure/chisel_message/proc/pack()
 	var/list/data = list()

code/modules/mapping/space_management/multiz_helpers.dm

@@ -13,13 +13,15 @@
 	var/offset
 	while((offset = SSmapping.level_trait(other_z, ZTRAIT_DOWN)))
 		other_z += offset
+		if(other_z in .)
+			break	// no infinite loops
 		. += other_z
 	other_z = center_z
 	while((offset = SSmapping.level_trait(other_z, ZTRAIT_UP)))
 		other_z += offset
+		if(other_z in .)
+			break	// no infinite loops
 		. += other_z
-	return .
-
 
 /proc/get_dir_multiz(turf/us, turf/them)
 	us = get_turf(us)
@@ -46,4 +48,4 @@
 
 /turf/proc/below()
 	return get_step_multiz(src, DOWN)
-	
+

code/modules/mob/living/carbon/human/human.dm

@@ -1083,6 +1083,17 @@
 	. = ..()
 	set_species(race)
 
+/mob/living/carbon/human/get_tooltip_data()
+	var/t_He = p_they(TRUE)
+	var/t_is = p_are()
+	. = list()
+	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
+	if(skipface || get_visible_name() == "Unknown")
+		. += "You can't make out what species they are."
+	else
+		. += "[t_He] [t_is] a [dna.custom_species ? dna.custom_species : dna.species.name]"
+	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .)
+
 /mob/living/carbon/human/species/abductor
 	race = /datum/species/abductor
 

code/modules/mob/living/carbon/human/human_defines.dm

@@ -77,6 +77,8 @@
 	var/last_fire_update
 	var/hardcore_survival_score = 0
 
+	tooltips = TRUE
+
 /// Unarmed parry data for human
 /datum/block_parry_data/unarmed/human
 	parry_respect_clickdelay = TRUE

code/modules/mob/living/carbon/human/species_types/humans.dm

@@ -4,7 +4,7 @@
 	default_color = "FFFFFF"
 
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR,HAS_FLESH,HAS_BONE)
-	mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF","tail_human" = "None", "ears" = "None", "taur" = "None", "deco_wings" = "None")
+	mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF","tail_human" = "None", "ears" = "None", "taur" = "None", "deco_wings" = "None", "legs" = "Plantigrade")
 	use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM
 	skinned_type = /obj/item/stack/sheet/animalhide/human
 	disliked_food = GROSS | RAW

code/modules/mob/living/silicon/examine.dm

@@ -1,5 +1,4 @@
 /mob/living/silicon/examine(mob/user) //Displays a silicon's laws to ghosts
-	. = ..()
 	if(laws && isobserver(user))
 		. += "<b>[src] has the following laws:</b>"
 		for(var/law in laws.get_law_list(include_zeroth = TRUE))

code/modules/mob/living/silicon/robot/examine.dm

@@ -48,6 +48,9 @@
 			. += "<span class='warning'>It doesn't seem to be responding.</span>"
 		if(DEAD)
 			. += "<span class='deadsay'>It looks like its system is corrupted and requires a reset.</span>"
+
+	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .)
+
 	. += "*---------*</span>"
 
 	. += ..()

code/modules/mob/living/silicon/robot/robot.dm

@@ -1326,3 +1326,18 @@
 	var/datum/computer_file/program/robotact/program = modularInterface.get_robotact()
 	if(program)
 		program.force_full_update()
+
+/mob/living/silicon/robot/get_tooltip_data()
+	var/t_He = p_they(TRUE)
+	var/t_is = p_are()
+	. = list()
+	var/borg_type = module ? module : "Default"
+//This isn't even used normally, but if that ever changes, just uncomment this
+/*	var/obj/item/borg_chameleon/chameleon = locate() in src
+	if(!chameleon)
+		chameleon = locate() in src.module
+	if(chameleon?.active)
+		borg_type = "Engineering"
+*/
+	. += "[t_He] [t_is] a [borg_type] unit"
+	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .)

code/modules/mob/living/silicon/robot/robot_defines.dm

@@ -125,3 +125,5 @@
 	var/sleeper_g
 	var/sleeper_r
 	var/sleeper_nv
+
+	tooltips = TRUE

code/modules/mob/living/silicon/silicon.dm

@@ -59,8 +59,8 @@
 
 /mob/living/silicon/ComponentInitialize()
 	. = ..()
-	AddElement(/datum/element/flavor_text, _name = "Silicon Flavor Text", _save_key = "silicon_flavor_text")
-	AddElement(/datum/element/flavor_text, "", "Temporary Flavor Text", "This should be used only for things pertaining to the current round!")
+	AddElement(/datum/element/flavor_text, _name = "Silicon Flavor Text", _always_show = TRUE, _save_key = "silicon_flavor_text")
+	AddElement(/datum/element/flavor_text, "", "Temporary Flavor Text", "This should be used only for things pertaining to the current round!", _always_show = TRUE)
 	AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE)
 
 /mob/living/silicon/med_hud_set_health()

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -130,11 +130,11 @@
 	QDEL_NULL(sord)
 	return ..()
 
-/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj)
-	if(prob(25))
-		return ..()
-	visible_message("<span class='danger'>[src] blocks [Proj] with its shield!</span>")
-	return BULLET_ACT_BLOCK
+/mob/living/simple_animal/hostile/syndicate/melee/sword/bullet_act(obj/item/projectile/Proj)
+	if(prob(50))
+		visible_message("<span class='danger'>[src] blocks [Proj] with its shield!</span>")
+		return BULLET_ACT_BLOCK
+	return ..()
 
 /mob/living/simple_animal/hostile/syndicate/melee/sword/space
 	icon_state = "syndicate_space_sword"

code/modules/power/solar.dm

@@ -152,7 +152,7 @@
 		else
 			//dot product of sun and panel -- Lambert's Cosine Law
 			cur_pow = cos(azimuth_current - sun_azimuth) * sun.power_mod
-			cur_pow = clamp(round(cur_pow, 0.01), 0, 1)
+			cur_pow = clamp(round(cur_pow, 0.01), 0, sun.power_mod)
 		total_flux += cur_pow
 
 /obj/machinery/power/solar/process()

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -60,6 +60,13 @@
 	desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with."
 	ammo_type = /obj/item/ammo_casing/c38/match
 
+/obj/item/ammo_box/g4570
+	name = "ammo box (.45-70 GOVT)"
+	desc = "Brought to you at great expense,this box contains 10 more .45-70 GOVT bullets."
+	ammo_type = /obj/item/ammo_casing/g4570
+	icon_state = "45box"
+	max_ammo = 10
+
 /obj/item/ammo_box/c9mm
 	name = "ammo box (9mm)"
 	icon_state = "9mmbox"

code/modules/projectiles/boxes_magazines/internal/derringer.dm

@@ -3,28 +3,17 @@
 	ammo_type = /obj/item/ammo_casing/c38
 	caliber = "38"
 	max_ammo = 2
-	multiload = FALSE
-
-/obj/item/ammo_box/magazine/internal/derringer/ammo_count(countempties = 1)
-	if (!countempties)
-		var/boolets = 0
-		for(var/obj/item/ammo_casing/bullet in stored_ammo)
-			if(bullet.BB)
-				boolets++
-		return boolets
-	else
-		return ..()
 
 /obj/item/ammo_box/magazine/internal/derringer/a357
 	name = "\improper derringer muzzle"
 	ammo_type = /obj/item/ammo_casing/a357
 	caliber = "357"
 	max_ammo = 2
-	multiload = FALSE
+	multiload = 0
 
 /obj/item/ammo_box/magazine/internal/derringer/g4570
 	name = "\improper derringer muzzle"
 	ammo_type = /obj/item/ammo_casing/g4570
 	caliber = "45-70g"
 	max_ammo = 2
-	multiload = FALSE
+	multiload = 0

code/modules/projectiles/guns/ballistic/derringer.dm

@@ -3,16 +3,14 @@
 	desc = "A easily concealable derringer. Uses .38 ammo"
 	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "derringer"
+	flags_1 = CONDUCT_1
 	mag_type = /obj/item/ammo_box/magazine/internal/derringer
+	fire_delay = 5
 	obj_flags = UNIQUE_RENAME
 	fire_sound = 'sound/weapons/revolvershot.ogg'
 	casing_ejector = FALSE
 	w_class = WEIGHT_CLASS_TINY
 
-/obj/item/gun/ballistic/derringer/Initialize()
-	..()
-	transform *= 0.8 //Spriter too lazy to make icons smaller than default revolvers, local coder hacks in solution.
-
 /obj/item/gun/ballistic/derringer/get_ammo(countchambered = FALSE, countempties = TRUE)
 	var/boolets = 0 //legacy var name maturity
 	if (chambered && countchambered)
@@ -27,7 +25,7 @@
 		return
 	var/num_loaded = magazine.attackby(A, user, params, 1)
 	if(num_loaded)
-		to_chat(user, "<span class='notice'>You load [num_loaded] shell\s into \the [src].</span>")
+		to_chat(user, "<span class='notice'>You load [num_loaded] bullet\s into \the [src].</span>")
 		playsound(user, 'sound/weapons/bulletinsert.ogg', 60, 1)
 		A.update_icon()
 		update_icon()

code/modules/reagents/chemistry/machinery/pandemic.dm

@@ -210,7 +210,7 @@
 				to_chat(usr, "<span class='warning'>ERROR: Cannot replicate virus strain.</span>")
 				return
 			A = A.Copy()
-			var/list/data = list("viruses" = list(A))
+			var/list/data = list("donor"=null,"viruses"=list(A),"blood_DNA"="REPLICATED", "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 			var/obj/item/reagent_containers/glass/bottle/B = new(drop_location())
 			B.name = "[A.name] culture bottle"
 			B.desc = "A small bottle. Contains [A.agent] culture in synthblood medium."

code/modules/reagents/reagent_containers.dm

@@ -26,7 +26,7 @@
 	create_reagents(volume, reagent_flags, reagent_value)
 	if(spawned_disease)
 		var/datum/disease/F = new spawned_disease()
-		var/list/data = list("blood_DNA" = "UNKNOWN DNA", "blood_type" = "SY","viruses"= list(F))
+		var/list/data = list("donor"=null,"viruses"=list(F),"blood_DNA"="REPLICATED", "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 		reagents.add_reagent(/datum/reagent/blood, disease_amount, data)
 	add_initial_reagents()
 

code/modules/reagents/reagent_containers/bottle.dm

@@ -44,6 +44,26 @@
 	desc = "A small bottle. Contains epinephrine - used to stabilize patients."
 	list_reagents = list(/datum/reagent/medicine/epinephrine = 30)
 
+/obj/item/reagent_containers/glass/bottle/bicaridine
+	name = "bicaridine bottle"
+	desc = "A small bottle. Contains bicaridine - used to treat brute damage."
+	list_reagents = list(/datum/reagent/medicine/bicaridine = 30)
+
+/obj/item/reagent_containers/glass/bottle/kelotane
+	name = "kelotane bottle"
+	desc = "A small bottle. Contains kelotane - used to treat burn damage."
+	list_reagents = list(/datum/reagent/medicine/kelotane = 30)
+
+/obj/item/reagent_containers/glass/bottle/antitoxin
+	name = "anti-toxin bottle"
+	desc = "A small bottle. Contains anti-toxin - used to treat minor poisoning."
+	list_reagents = list(/datum/reagent/medicine/antitoxin = 30)
+
+/obj/item/reagent_containers/glass/bottle/dexalin
+	name = "dexalin bottle"
+	desc = "A small bottle. Contains dexalin - used to treat minor suffocation."
+	list_reagents = list(/datum/reagent/medicine/dexalin = 30)
+
 /obj/item/reagent_containers/glass/bottle/toxin
 	name = "toxin bottle"
 	desc = "A small bottle of toxins. Do not drink, it is poisonous."

code/modules/spells/spell_types/shadow_walk.dm

@@ -56,9 +56,9 @@
 /obj/effect/dummy/phased_mob/shadow/proc/check_light_level()
 	var/turf/T = get_turf(src)
 	var/light_amount = T.get_lumcount()
-	if(light_amount > 0.2) // jaunt ends
+	if(light_amount > 0.4) // jaunt ends
 		end_jaunt(TRUE)
-	else if (light_amount < 0.2 && (!QDELETED(jaunter))) //heal in the dark
+	else if (light_amount < 0.4 && (!QDELETED(jaunter))) //heal in the dark
 		jaunter.heal_overall_damage(1,1)
 
 /obj/effect/dummy/phased_mob/shadow/proc/end_jaunt(forced = FALSE)

code/modules/tooltip/tooltip.dm

@@ -51,7 +51,7 @@ Notes:
 
 /datum/tooltip/proc/show(atom/movable/thing, params = null, title = null, content = null, theme = "default", special = "none")
 	if (!thing || !params || (!title && !content) || !owner || !isnum(world.icon_size))
-		return 0
+		return FALSE
 	if (!init)
 		//Initialize some vars
 		init = 1
@@ -83,7 +83,7 @@ Notes:
 	if (queueHide)
 		hide()
 
-	return 1
+	return TRUE
 
 
 /datum/tooltip/proc/hide()
@@ -122,4 +122,33 @@ Notes:
 		if(user.client && user.client.tooltips)
 			user.client.tooltips.hide()
 
+/**
+ * # `get_tooltip_data()`
+ *
+ * If set, will return a list for the tooltip (that will also be put together in a `Join()`)
+ * However, if returning `null`, falls back to default behavior, which is `examine(src)`, and it will definitely include
+ * images since it is the default behavior
+ *
+ * Though no tooltips will be created for atoms that have `tooltips = FALSE`
+*/
+/atom/movable/proc/get_tooltip_data()
+	return
 
+/atom/movable/MouseEntered(location, control, params)
+	. = ..()
+	if(tooltips)
+		if(!QDELETED(src))
+			var/list/examine_list = examine(src)
+			var/get_tooltip_data = get_tooltip_data()
+			if(length(get_tooltip_data))
+				examine_list = get_tooltip_data
+			var/examine_data = examine_list.Join("<br />")
+			openToolTip(usr, src, params, title = name, content = examine_data)
+
+/atom/movable/MouseExited(location, control, params)
+	. = ..()
+	closeToolTip(usr)
+
+/client/MouseDown(object, location, control, params)
+	closeToolTip(usr)
+	. = ..()

code/modules/tooltip/tooltip.html

@@ -65,12 +65,12 @@
 
 		.hisgrace .wrap {border-color: #7C1414;}
 		.hisgrace .content {color: #15D512; border-color: #9D1414; background-color: #861414;}
-	
+
 		/* TG: Themes */
 		/* ScreenUI */
 		.midnight .wrap {border-color: #2B2B33;}
 		.midnight .content {color: #6087A0; border-color: #2B2B33; background-color: #36363C;}
-		
+
 		.plasmafire .wrap {border-color: #21213D;}
 		.plasmafire .content {color: #FFA800 ; border-color: #21213D; background-color:#1D1D36;}
 
@@ -85,7 +85,7 @@
 
 		.clockwork .wrap {border-color: #170800;}
 		.clockwork .content {color: #B18B25; border-color: #000000; background-color: #5F380E;}
-		
+
 
 	</style>
 </head>

code/modules/uplink/uplink_items/uplink_ammo.dm

@@ -7,6 +7,13 @@
 
 // Ammunition
 
+/datum/uplink_item/ammo/derringer
+	name = "Ammo Box - .45-70 GOVT"
+	desc = "Contains 10 additional .45-70 GOVT rounds. Caliber is exceedingly rare, and thus, comes at a premium."
+	item = /obj/item/ammo_box/g4570
+	cost = 5
+	include_modes = list(/datum/game_mode/nuclear)
+
 /datum/uplink_item/ammo/pistol
 	name = "10mm Handgun Magazine"
 	desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. These rounds \

code/modules/uplink/uplink_items/uplink_bundles.dm

@@ -135,7 +135,7 @@
 			but you never know. Contents are sorted to always be worth 50 TC."
 	item = /obj/structure/closet/crate
 	cost = 20
-	player_minimum = 25
+	player_minimum = 20
 	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs)
 	cant_discount = TRUE
 	var/starting_crate_value = 50
@@ -145,7 +145,7 @@
 	desc = "A dusty SUPER-SIZED from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \
 			but you never know. Contents are sorted to always be worth 125 TC."
 	cost = 40
-	player_minimum = 40
+	player_minimum = 30
 	starting_crate_value = 125
 
 /datum/uplink_item/bundles_TC/surplus/purchase(mob/user, datum/component/uplink/U)

code/modules/uplink/uplink_items/uplink_stealth.dm

@@ -49,7 +49,7 @@
 	name = "Compact Derringer"
 	desc = "An easily concealable handgun capable of firing .357 rounds. Comes in an inconspicuious packet of cigarettes with additional munitions."
 	item = /obj/item/storage/fancy/cigarettes/derringer
-	cost = 8
+	cost = 6
 	surplus = 30
 
 /datum/uplink_item/stealthy_weapons/derringerpack/purchase(mob/user, datum/component/uplink/U)
@@ -57,7 +57,7 @@
 		item = /obj/item/storage/fancy/cigarettes/derringer/gold
 	..()
 
-/datum/uplink_item/stalthy_weapons/derringerpack_nukie
+/datum/uplink_item/stealthy_weapons/derringerpack_nukie
 	name = "Antique Derringer"
 	desc = "An easy to conceal, yet extremely deadly handgun, capable of firing .45-70 Govt rounds. Comes in a unique pack of cigarettes with additional munitions."
 	item = /obj/item/storage/fancy/cigarettes/derringer/midworld

code/modules/vending/_vending.dm

@@ -55,7 +55,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
 	circuit = /obj/item/circuitboard/machine/vendor
 	payment_department = ACCOUNT_SRV
-	light_power = 0.5
+	light_power = 0.3
 	light_range = MINIMUM_USEFUL_LIGHT_RANGE
 	/// Is the machine active (No sales pitches if off)!
 	var/active = TRUE

code/modules/vending/dinnerware.dm

@@ -8,6 +8,7 @@
 					/obj/item/kitchen/fork = 6,
 					/obj/item/kitchen/knife = 6,
 					/obj/item/kitchen/rollingpin = 4,
+					/obj/item/kitchen/unrollingpin = 4,
 					/obj/item/reagent_containers/food/drinks/drinkingglass = 8,
 					/obj/item/clothing/suit/apron/chef = 2,
 					/obj/item/storage/box/cups = 2,

html/changelog.html

@@ -50,6 +50,74 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">11 May 2021</h2>
+			<h3 class="author">LetterN updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fixes emagging console shuttle purchases</li>
+				<li class="balance">syndie melee simplemobs has no more bullshit shield</li>
+			</ul>
+			<h3 class="author">bunny232 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Delta station xenobiology department has received enhanced scrubbing and ventilation capabilities similar to box and meta</li>
+			</ul>
+
+			<h2 class="date">09 May 2021</h2>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Priority announcement admeme verb</li>
+			</ul>
+			<h3 class="author">SandPoot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed Cyborg examines adding an extra weird line.</li>
+				<li class="code_imp">Everything can be set to have tooltips, and even coded to have neat tooltips.</li>
+				<li class="rscadd">Makes it so humans and borgs already have tooltips.</li>
+			</ul>
+			<h3 class="author">TheObserver-sys updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes most of the weird handling bugs and improves cigarette case handling in general.</li>
+				<li class="rscadd">The Gorlex Marauders have seen fit to allow you to purchase the .45-70 GOVT rare ammo, at a premium cost. Don't waste it.</li>
+			</ul>
+			<h3 class="author">WanderingFox95 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">added the unrolling pin, an innovative solution to dough-based mishaps.</li>
+				<li class="imageadd">added visuals for the unrolling pin</li>
+			</ul>
+			<h3 class="author">dzahlus updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="soundadd">added new malf AI spawn and doomsday sound</li>
+				<li class="sounddel">removed old malf AI spawn and doomsday sound</li>
+			</ul>
+			<h3 class="author">zeroisthebiggay updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">pirates now have a medbay and several other things qualifying as a buff</li>
+				<li class="balance">pirates lost their toilet</li>
+			</ul>
+
+			<h2 class="date">08 May 2021</h2>
+			<h3 class="author">Arturlang updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Synthblood bottles now have the proper color and probably won't poison you anymore</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">lets humans have digi legs (and avian legs)</li>
+			</ul>
+
+			<h2 class="date">05 May 2021</h2>
+			<h3 class="author">The0bserver, with a great amount of advice from TripleZeta/TetraZeta updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds a new crate type, for use with any manner of cheeky breeki shenanigans, as well as with existing Russian contraband.</li>
+			</ul>
+			<h3 class="author">bunny232 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">There's some new vents and scrubbers in the meta station xenobiology department. Welders and wrenches not included*</li>
+			</ul>
+			<h3 class="author">keronshb updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">Nightmare Shadow Jaunt threshold up to 0.4</li>
+				<li class="balance">Vendor and Engraved message light down to 0.3</li>
+			</ul>
+
 			<h2 class="date">03 May 2021</h2>
 			<h3 class="author">TripleShades updated:</h3>
 			<ul class="changes bgimages16">
@@ -703,85 +771,6 @@
 			<ul class="changes bgimages16">
 				<li class="balance">uncapped TEG power, buffing high-temp TEGs</li>
 			</ul>
-
-			<h2 class="date">09 March 2021</h2>
-			<h3 class="author">LetterN updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="refactor">tg hardsync, mostly contains tgui</li>
-			</ul>
-
-			<h2 class="date">07 March 2021</h2>
-			<h3 class="author">Hatterhat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">You can now reskin your improvised shotguns.</li>
-				<li class="rscadd">The spontaneous brain trauma event now announces to ghosts whoever got funnied upon.</li>
-				<li class="imageadd">Ports EikoBiko's cat tail sprite.</li>
-			</ul>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">nitryl now consumes oxygen/nitrogen instead of generating them</li>
-				<li class="balance">Hyper-nob and nitryl are easier to make.</li>
-			</ul>
-			<h3 class="author">dzahlus updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added taser microbattery for MWS-01</li>
-				<li class="tweak">tweaked MWS-01 beacondrop to have more batteries</li>
-				<li class="balance">rebalanced MWS-01 disabler battery to fire 10 shots</li>
-				<li class="soundadd">added unique sound to the MWS-01</li>
-				<li class="spellcheck">fixed Modula Weapons System to "Modular Weapon System"</li>
-			</ul>
-			<h3 class="author">timothyteakettle updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">exiting a bluespace jar through any means, hardstuns you for 5 seconds</li>
-			</ul>
-
-			<h2 class="date">05 March 2021</h2>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Lowered ash storm volume</li>
-				<li class="tweak">Minesweeper can no longer be made to lag the server on purpose</li>
-			</ul>
-			<h3 class="author">keronshb updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Prevents heat from going through reinforced plasma glass.</li>
-			</ul>
-
-			<h2 class="date">04 March 2021</h2>
-			<h3 class="author">LetterN updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">removes bsql</li>
-			</ul>
-
-			<h2 class="date">03 March 2021</h2>
-			<h3 class="author">MarinaGryphon updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">The AOOC mute pref is now properly respected.</li>
-				<li class="bugfix">Muting adminhelp sounds no longer mutes AOOC.</li>
-			</ul>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="config">pAIs now have a policy config</li>
-				<li class="rscadd">"Supermatter surge" event, which might cause problems if the supermatter is not sufficiently cooled (i.e. the setup is messed up in some way)</li>
-				<li class="rscdel">Fusion can no longer be done in open air.</li>
-				<li class="rscdel">Valentine's day event no longer gives everyone a valentine's antag.</li>
-			</ul>
-			<h3 class="author">SandPoot updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Legions should now pass their type to the person they infect (if valid).</li>
-			</ul>
-			<h3 class="author">dzahlus updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added new subtype to lesser ash drake balanced around player control</li>
-				<li class="balance">rebalanced dragon transformation to a 1 minute cooldown as well as using the new subtype of megafauna</li>
-			</ul>
-			<h3 class="author">qweq12yt updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed infectious zombies not being able to attack if host was pacifist</li>
-				<li class="rscadd">adds a way for species to have blacklisted quirks, the removal, and restoration of said quirks upon species changes</li>
-				<li class="bugfix">Now pacifists won't be able to use flamethrowers</li>
-				<li class="bugfix">Kinetic Accelerator now properly reloads a charge to it's chamber instead of nulling the variable forever</li>
-				<li class="bugfix">Now pacifists won't be able to use Kinetic Accelerators if a non-pacifist shoots it first</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -29231,3 +29231,48 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: 'Box Paramedic Station camera is now renamed to be on the network, and
       no longer steals the Morgue''s cam tweak: Box Surgery Storage is now it''s own
       proper room'
+2021-05-05:
+  The0bserver, with a great amount of advice from TripleZeta/TetraZeta:
+  - rscadd: Adds a new crate type, for use with any manner of cheeky breeki shenanigans,
+      as well as with existing Russian contraband.
+  bunny232:
+  - rscadd: There's some new vents and scrubbers in the meta station xenobiology department.
+      Welders and wrenches not included*
+  keronshb:
+  - balance: Nightmare Shadow Jaunt threshold up to 0.4
+  - balance: Vendor and Engraved message light down to 0.3
+2021-05-08:
+  Arturlang:
+  - bugfix: Synthblood bottles now have the proper color and probably won't poison
+      you anymore
+  timothyteakettle:
+  - rscadd: lets humans have digi legs (and avian legs)
+2021-05-09:
+  Putnam3145:
+  - rscadd: Priority announcement admeme verb
+  SandPoot:
+  - bugfix: Fixed Cyborg examines adding an extra weird line.
+  - code_imp: Everything can be set to have tooltips, and even coded to have neat
+      tooltips.
+  - rscadd: Makes it so humans and borgs already have tooltips.
+  TheObserver-sys:
+  - bugfix: Fixes most of the weird handling bugs and improves cigarette case handling
+      in general.
+  - rscadd: The Gorlex Marauders have seen fit to allow you to purchase the .45-70
+      GOVT rare ammo, at a premium cost. Don't waste it.
+  WanderingFox95:
+  - rscadd: added the unrolling pin, an innovative solution to dough-based mishaps.
+  - imageadd: added visuals for the unrolling pin
+  dzahlus:
+  - soundadd: added new malf AI spawn and doomsday sound
+  - sounddel: removed old malf AI spawn and doomsday sound
+  zeroisthebiggay:
+  - balance: pirates now have a medbay and several other things qualifying as a buff
+  - balance: pirates lost their toilet
+2021-05-11:
+  LetterN:
+  - bugfix: fixes emagging console shuttle purchases
+  - balance: syndie melee simplemobs has no more bullshit shield
+  bunny232:
+  - rscadd: Delta station xenobiology department has received enhanced scrubbing and
+      ventilation capabilities similar to box and meta

html/changelogs/AutoChangeLog-pr-14673.yml

@@ -1,4 +0,0 @@
-author: "The0bserver, with a great amount of advice from TripleZeta/TetraZeta"
-delete-after: True
-changes: 
-  - rscadd: "Adds a new crate type, for use with any manner of cheeky breeki shenanigans, as well as with existing Russian contraband."

html/changelogs/AutoChangeLog-pr-14706.yml

@@ -0,0 +1,7 @@
+author: "DeltaFire15"
+delete-after: True
+changes: 
+  - bugfix: "find_safe_turf no longer always fails on safe oxygen levels(??)"
+  - bugfix: "Heretic bladeshatters now actually take the heretic's z into account as intended, instead of always being station z
+tweak: Message for failing the bladeshatter despite succeeding the do_after
+tweak: Improves bladeshatter a bit by making it safer codewise"

modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm

@@ -217,6 +217,6 @@
 
 /datum/reagent/fermi/zeolites/reaction_obj(obj/O, reac_volume)
 	var/datum/component/radioactive/contamination = O.GetComponent(/datum/component/radioactive)
-	if(contamination && reac_volume >= 5 && purity >= 0.7) //you need at least 0.7 purity to instantly purge all contam on an object.
+	if(contamination && purity >= 0.7) //you need at least 0.7 purity to instantly purge all contam on an object.
 		qdel(contamination)
-		return
+	..()