Merge branch 'master' into upstream-merge-34667

_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm

@@ -120,9 +120,6 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered)
 "t" = (
-/turf/open/floor/plasteel/cult{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
 /obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/mineral/cult,
 /area/ruin/unpowered)
@@ -169,7 +166,7 @@ s
 d
 c
 c
-n
+g
 c
 c
 d
@@ -234,7 +231,7 @@ b
 b
 c
 c
-h
+g
 i
 b
 b
@@ -252,14 +249,14 @@ b
 g
 b
 b
-j
+d
 b
 o
 b
-j
+d
 b
 b
-r
+g
 b
 c
 "}
@@ -285,10 +282,10 @@ a
 c
 c
 c
-h
+g
 b
 m
-j
+d
 q
 b
 b
@@ -339,7 +336,7 @@ s
 d
 c
 c
-p
+g
 c
 c
 d

_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm

@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE 
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /turf/closed/mineral/volcanic/lava_land_surface,
 /area/lavaland/surface/outdoors)
@@ -145,9 +145,6 @@
 /turf/open/floor/pod/dark,
 /area/ruin/powered)
 "E" = (
-/turf/open/floor/plating{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
 /obj/structure/shuttle/engine/propulsion/burst{
 	dir = 8
 	},

_maps/RandomRuins/SpaceRuins/asteroid4.dmm

@@ -30,7 +30,6 @@
 /turf/closed/wall/mineral/titanium,
 /area/ruin/unpowered)
 "k" = (
-/turf/open/floor/plating,
 /obj/item/stack/sheet/mineral/bananium{
 	amount = 15
 	},

_maps/RandomRuins/SpaceRuins/caravanambush.dmm

@@ -355,7 +355,6 @@
 /turf/closed/wall/mineral/titanium,
 /area/ruin/unpowered)
 "bm" = (
-/turf/open/floor/plating,
 /obj/machinery/door/poddoor{
 	id = "caravantrade1";
 	name = "cargo blastdoor"
@@ -399,17 +398,6 @@
 /obj/structure/lattice,
 /turf/template_noop,
 /area/template_noop)
-"bt" = (
-/turf/open/floor/plating/airless{
-	icon_plating = "platingdmg3";
-	icon_state = "platingdmg3"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
-	icon_plating = "platingdmg2";
-	icon_state = "platingdmg2"
-	},
-/area/ruin/unpowered)
 "bu" = (
 /obj/item/stack/sheet/metal,
 /obj/effect/decal/cleanable/dirt,
@@ -493,7 +481,6 @@
 /turf/open/floor/mineral/titanium/blue/airless,
 /area/ruin/unpowered)
 "bJ" = (
-/turf/open/floor/plating,
 /obj/effect/spawner/structure/window/shuttle,
 /turf/open/floor/plating/airless{
 	icon_plating = "platingdmg2";
@@ -649,7 +636,6 @@
 /turf/template_noop,
 /area/template_noop)
 "ch" = (
-/turf/template_noop,
 /obj/item/stack/rods,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/airless{
@@ -754,7 +740,6 @@
 	},
 /area/ruin/unpowered)
 "cx" = (
-/turf/template_noop,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/airless{
 	icon_plating = "platingdmg2";
@@ -1159,12 +1144,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ruin/powered)
-"dB" = (
-/obj/machinery/computer{
-	dir = 8
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered)
 "dC" = (
 /obj/machinery/computer{
 	dir = 8
@@ -1862,7 +1841,7 @@ aa
 aa
 ab
 ce
-dB
+dC
 ce
 ab
 aa
@@ -3497,7 +3476,7 @@ aa
 aa
 aa
 bl
-bt
+ci
 bB
 bB
 bU

_maps/RandomRuins/SpaceRuins/derelict6.dmm

@@ -11,16 +11,8 @@
 	icon_plating = "platingdmg3";
 	icon_state = "platingdmg3"
 	},
-/turf/open/floor/plating/airless{
-	icon_plating = "platingdmg2";
-	icon_state = "platingdmg2"
-	},
 /area/ruin/unpowered)
 "ad" = (
-/turf/open/floor/plating/airless{
-	icon_plating = "platingdmg3";
-	icon_state = "platingdmg3"
-	},
 /obj/structure/girder,
 /turf/open/floor/plating/airless{
 	icon_plating = "platingdmg2";
@@ -33,10 +25,6 @@
 /turf/template_noop,
 /area/template_noop)
 "af" = (
-/turf/open/floor/plating/airless{
-	icon_plating = "platingdmg3";
-	icon_state = "platingdmg3"
-	},
 /obj/item/stack/sheet/metal,
 /turf/open/floor/plating/airless{
 	icon_plating = "platingdmg2";
@@ -63,10 +51,6 @@
 /turf/template_noop,
 /area/template_noop)
 "ak" = (
-/turf/open/floor/plating/airless{
-	icon_plating = "platingdmg3";
-	icon_state = "platingdmg3"
-	},
 /obj/item/stack/rods,
 /turf/open/floor/plating/airless{
 	icon_plating = "platingdmg2";
@@ -116,7 +100,6 @@
 /turf/open/floor/plating/airless,
 /area/ruin/unpowered)
 "as" = (
-/turf/open/floor/plating/airless,
 /obj/item/stack/sheet/metal,
 /turf/open/floor/plating/airless{
 	icon_plating = "platingdmg2";
@@ -147,7 +130,6 @@
 /turf/open/floor/plasteel/airless,
 /area/ruin/unpowered)
 "ay" = (
-/turf/open/floor/plating/airless,
 /obj/item/stack/tile/plasteel,
 /turf/open/floor/plating/airless{
 	icon_plating = "platingdmg2";
@@ -328,9 +310,6 @@
 /turf/open/floor/plasteel/airless/bar,
 /area/ruin/unpowered)
 "be" = (
-/turf/open/floor/plasteel/bar{
-	initial_gas_mix = "TEMP=2.7"
-	},
 /turf/open/floor/plating/airless{
 	icon_plating = "platingdmg2";
 	icon_state = "platingdmg2"

_maps/RandomRuins/SpaceRuins/vaporwave.dmm

@@ -162,7 +162,6 @@
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/unpowered/no_grav)
 "I" = (
-/turf/open/space,
 /obj/effect/turf_decal/sand,
 /turf/open/floor/plasteel/airless/asteroid,
 /area/ruin/unpowered/no_grav)

_maps/RandomZLevels/caves.dmm

@@ -137,9 +137,6 @@
 	},
 /area/awaymission/caves/BMP_asteroid/level_four)
 "ax" = (
-/turf/open/floor/engine/cult{
-	initial_gas_mix = "n2=23;o2=14"
-	},
 /turf/closed/wall/mineral/cult,
 /area/awaymission/caves/BMP_asteroid/level_four)
 "ay" = (
@@ -377,9 +374,6 @@
 	},
 /area/awaymission/caves/BMP_asteroid/level_three)
 "bd" = (
-/turf/open/floor/plating/asteroid/basalt/lava{
-	initial_gas_mix = "n2=23;o2=14"
-	},
 /turf/closed/wall/mineral/cult,
 /area/awaymission/caves/BMP_asteroid/level_four)
 "be" = (

_maps/RandomZLevels/centcomAway.dmm

@@ -350,9 +350,6 @@
 	},
 /area/awaymission/centcomAway/hangar)
 "bn" = (
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
 /turf/closed/wall/mineral/titanium/interior,
 /area/awaymission/centcomAway/hangar)
 "bo" = (
@@ -1884,7 +1881,6 @@
 /turf/open/floor/plasteel/dark,
 /area/awaymission/centcomAway/hangar)
 "gS" = (
-/turf/open/floor/plating,
 /obj/structure/shuttle/engine/propulsion/burst{
 	dir = 8
 	},

_maps/RandomZLevels/moonoutpost19.dmm

@@ -5685,10 +5685,6 @@
 	},
 /area/awaymission/moonoutpost19/arrivals)
 "lc" = (
-/turf/open/floor/plating/asteroid{
-	initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
-	heat_capacity = 1e+006
-	},
 /turf/closed/wall/mineral/titanium/interior,
 /area/awaymission/moonoutpost19/arrivals)
 "ld" = (

_maps/RandomZLevels/research.dmm

@@ -20,8 +20,7 @@
 /area/awaymission/research/exterior)
 "ag" = (
 /turf/closed/wall/mineral/plastitanium{
-	dir = 8;
-	icon_state = "diagonalWall3"
+	dir = 8
 	},
 /area/awaymission/research/interior/engineering)
 "ah" = (
@@ -42,8 +41,7 @@
 /area/awaymission/research/interior/engineering)
 "ak" = (
 /turf/closed/wall/mineral/plastitanium{
-	dir = 1;
-	icon_state = "diagonalWall3"
+	dir = 1
 	},
 /area/awaymission/research/interior/engineering)
 "al" = (
@@ -231,9 +229,7 @@
 /turf/open/floor/plasteel{
 	icon_state = "damaged4"
 	},
-/turf/closed/wall/mineral/plastitanium{
-	icon_state = "diagonalWall3"
-	},
+/turf/closed/wall/mineral/plastitanium,
 /area/awaymission/research/interior/engineering)
 "aT" = (
 /mob/living/simple_animal/hostile/syndicate/melee,
@@ -244,8 +240,7 @@
 	icon_state = "damaged1"
 	},
 /turf/closed/wall/mineral/plastitanium{
-	dir = 4;
-	icon_state = "diagonalWall3"
+	dir = 4
 	},
 /area/awaymission/research/interior/engineering)
 "aV" = (
@@ -303,9 +298,7 @@
 /turf/open/floor/plasteel{
 	icon_state = "damaged5"
 	},
-/turf/closed/wall/mineral/plastitanium{
-	icon_state = "diagonalWall3"
-	},
+/turf/closed/wall/mineral/plastitanium,
 /area/awaymission/research/interior/engineering)
 "bd" = (
 /turf/open/floor/plasteel{
@@ -320,12 +313,8 @@
 	},
 /area/awaymission/research/interior/engineering)
 "bf" = (
-/turf/open/floor/plasteel{
-	icon_state = "damaged3"
-	},
 /turf/closed/wall/mineral/plastitanium{
-	dir = 4;
-	icon_state = "diagonalWall3"
+	dir = 4
 	},
 /area/awaymission/research/interior/engineering)
 "bg" = (
@@ -4041,7 +4030,6 @@
 /turf/closed/wall/mineral/titanium,
 /area/awaymission/research/exterior)
 "mf" = (
-/turf/open/floor/plating/asteroid/airless,
 /obj/structure/shuttle/engine/propulsion/burst{
 	dir = 4
 	},
@@ -4152,7 +4140,6 @@
 /turf/closed/wall/mineral/titanium/interior,
 /area/awaymission/research/exterior)
 "mz" = (
-/turf/open/floor/plating/asteroid/airless,
 /obj/structure/shuttle/engine/propulsion/burst{
 	dir = 8
 	},
@@ -4357,6 +4344,12 @@
 "ne" = (
 /turf/open/floor/mineral/plasma,
 /area/space/nearstation)
+"nf" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/research/interior/engineering)
+"ng" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/research/interior/engineering)
 
 (1,1,1) = {"
 aa
@@ -41728,7 +41721,7 @@ ap
 ap
 an
 aJ
-al
+nf
 bc
 bp
 bH
@@ -42499,7 +42492,7 @@ aq
 ay
 an
 aL
-al
+ng
 bf
 bs
 bK

_maps/RandomZLevels/snowdin.dmm

@@ -1464,7 +1464,6 @@
 /turf/open/floor/plating/ice/colder,
 /area/awaymission/snowdin/dungeon1)
 "eK" = (
-/turf/open/space,
 /obj/structure/girder,
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/post)

_maps/_basemap.dm

@@ -0,0 +1,25 @@
+//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
+
+#include "map_files\generic\CentCom.dmm"
+#include "map_files\generic\SpaceStation.dmm"
+
+#ifndef LOWMEMORYMODE
+
+	#include "map_files\generic\Space.dmm"
+	#include "map_files\generic\SpaceDock.dmm"
+	#include "map_files\Mining\Lavaland.dmm"
+	#include "map_files\generic\City_of_Cogs.dmm"
+
+	#ifdef ALL_MAPS
+		#include "map_files\debug\runtimestation.dmm"
+		#include "cit_map_files\Deltastation\DeltaStation2.dmm"
+		#include "cit_map_files\MetaStation\MetaStation.dmm"
+		#include "cit_map_files\OmegaStation\OmegaStation.dmm"
+		#include "cit_map_files\PubbyStation\PubbyStation.dmm"
+		#include "cit_map_files\BoxStation\BoxStation.dmm"
+
+		#ifdef TRAVISBUILDING
+			#include "templates.dm"
+		#endif
+	#endif
+#endif

_maps/map_files/BoxStation/BoxStation.dmm

@@ -57126,15 +57126,12 @@
 /area/science/circuit)
 "Qpp" = (
 /turf/closed/wall,
-/turf/open/floor/circuit,
 /area/science/circuit)
 "Qpq" = (
 /turf/closed/wall,
-/turf/open/floor/circuit,
 /area/science/circuit)
 "Qpr" = (
 /turf/closed/wall,
-/turf/open/floor/circuit,
 /area/science/circuit)
 "Qps" = (
 /turf/closed/wall/r_wall,
@@ -57155,7 +57152,6 @@
 /area/maintenance/starboard/aft)
 "Qpw" = (
 /turf/closed/wall,
-/turf/open/floor/circuit,
 /area/science/circuit)
 "Qpx" = (
 /obj/structure/table/reinforced,
@@ -57186,7 +57182,6 @@
 /area/maintenance/starboard/aft)
 "QpB" = (
 /turf/closed/wall,
-/turf/open/floor/circuit,
 /area/science/circuit)
 "QpC" = (
 /obj/structure/table/reinforced,
@@ -57212,7 +57207,6 @@
 /area/science/circuit)
 "QpG" = (
 /turf/closed/wall,
-/turf/open/floor/circuit,
 /area/science/circuit)
 "QpH" = (
 /turf/open/floor/plasteel/white,
@@ -57229,7 +57223,6 @@
 /area/science/circuit)
 "QpK" = (
 /turf/closed/wall,
-/turf/open/floor/circuit,
 /area/science/circuit)
 "QpL" = (
 /turf/open/floor/plasteel/white,
@@ -57243,7 +57236,6 @@
 /area/science/circuit)
 "QpO" = (
 /turf/closed/wall,
-/turf/open/floor/circuit,
 /area/science/circuit)
 "QpP" = (
 /obj/machinery/light_switch{
@@ -57264,9 +57256,8 @@
 /turf/open/floor/plasteel,
 /area/science/circuit)
 "QpS" = (
-/turf/closed/wall,
 /obj/structure/sign/nanotrasen,
-/turf/open/floor/circuit,
+/turf/closed/wall,
 /area/science/circuit)
 "QpT" = (
 /obj/machinery/light{
@@ -57367,16 +57358,14 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
 "Qqg" = (
-/turf/closed/wall,
 /obj/structure/sign/nanotrasen,
-/turf/open/floor/circuit,
+/turf/closed/wall,
 /area/science/circuit)
 "Qqh" = (
-/turf/open/floor/plasteel/white,
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
 /obj/item/pen,
-/turf/open/floor/circuit,
+/turf/open/floor/plasteel/white,
 /area/science/circuit)
 "Qqi" = (
 /obj/machinery/light{
@@ -57391,7 +57380,6 @@
 /area/science/misc_lab)
 "Qqk" = (
 /turf/closed/wall,
-/turf/open/floor/circuit,
 /area/science/circuit)
 "Qql" = (
 /obj/structure/table/reinforced,
@@ -57413,7 +57401,6 @@
 /area/science/circuit)
 "Qqo" = (
 /turf/closed/wall,
-/turf/open/floor/circuit,
 /area/science/circuit)
 "Qqp" = (
 /obj/structure/table/reinforced,

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -19457,7 +19457,6 @@
 /turf/open/floor/plasteel/redyellow/side,
 /area/security/prison)
 "aPt" = (
-/turf/open/floor/plasteel/redyellow/side,
 /obj/machinery/vending/sustenance,
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"
@@ -59948,7 +59947,6 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "crA" = (
-/turf/open/floor/plating,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"

_maps/map_files/OmegaStation/OmegaStation.dmm

@@ -2113,7 +2113,6 @@
 /turf/open/floor/plasteel,
 /area/asteroid/nearstation)
 "aep" = (
-/turf/open/floor/plating,
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"
 	},

_maps/shuttles/emergency_mini.dmm

@@ -195,7 +195,6 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "F" = (
-/turf/closed/wall/mineral/titanium,
 /obj/structure/table,
 /obj/item/storage/firstaid/fire,
 /obj/item/storage/firstaid/regular{
@@ -204,7 +203,7 @@
 	},
 /obj/item/crowbar,
 /obj/item/extinguisher,
-/turf/open/floor/mineral/titanium,
+/turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
 "G" = (
 /turf/closed/wall/mineral/titanium,
@@ -246,11 +245,10 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "N" = (
-/turf/closed/wall/mineral/titanium,
 /obj/machinery/computer/security{
 	dir = 8
 	},
-/turf/open/floor/mineral/titanium,
+/turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
 "O" = (
 /obj/machinery/computer/crew{

_maps/templates/medium_shuttle1.dmm

@@ -20,19 +20,6 @@
 "d" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ruin/powered/shuttle/medium_1)
-"e" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 1;
-	icon_state = "diagonalWall3"
-	},
-/area/ruin/powered/shuttle/medium_1)
-"f" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 4;
-	icon_state = "diagonalWall3"
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_1)
 "g" = (
 /turf/closed/wall/mineral/titanium,
 /area/ruin/powered/shuttle/medium_1)
@@ -100,19 +87,6 @@
 	},
 /turf/open/space,
 /area/ruin/powered/shuttle/medium_1)
-"x" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 1;
-	icon_state = "diagonalWall3"
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_1)
-"y" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 4;
-	icon_state = "diagonalWall3"
-	},
-/area/ruin/powered/shuttle/medium_1)
 
 (1,1,1) = {"
 a
@@ -202,7 +176,7 @@ c
 (6,1,1) = {"
 d
 d
-f
+g
 g
 k
 g
@@ -212,7 +186,7 @@ g
 g
 k
 g
-x
+g
 d
 d
 "}
@@ -248,10 +222,10 @@ j
 j
 g
 d
-y
+d
 "}
 (9,1,1) = {"
-e
+d
 d
 g
 j
@@ -264,12 +238,12 @@ g
 j
 j
 g
-y
+d
 a
 "}
 (10,1,1) = {"
 a
-e
+d
 g
 g
 g

_maps/templates/medium_shuttle2.dmm

@@ -20,37 +20,18 @@
 "d" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ruin/powered/shuttle/medium_2)
-"e" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 1;
-	icon_state = "diagonalWall3"
-	},
-/area/ruin/powered/shuttle/medium_2)
 "f" = (
 /obj/structure/shuttle/engine/propulsion/burst/right{
 	dir = 8
 	},
 /turf/open/space,
 /area/ruin/powered/shuttle/medium_2)
-"g" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 4;
-	icon_state = "diagonalWall3"
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_2)
 "h" = (
 /turf/closed/wall/mineral/titanium,
 /area/ruin/powered/shuttle/medium_2)
 "i" = (
 /turf/closed/wall/mineral/titanium/overspace,
 /area/ruin/powered/shuttle/medium_2)
-"j" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 8;
-	icon_state = "diagonalWall3"
-	},
-/area/ruin/powered/shuttle/medium_2)
 "k" = (
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered/shuttle/medium_2)
@@ -71,11 +52,6 @@
 "p" = (
 /turf/open/floor/plasteel/darkyellow,
 /area/ruin/powered/shuttle/medium_2)
-"q" = (
-/turf/closed/wall/mineral/plastitanium{
-	icon_state = "diagonalWall3"
-	},
-/area/ruin/powered/shuttle/medium_2)
 "r" = (
 /obj/structure/table,
 /turf/open/floor/plasteel,
@@ -114,19 +90,6 @@
 	},
 /turf/open/floor/plasteel/darkyellow,
 /area/ruin/powered/shuttle/medium_2)
-"z" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 1;
-	icon_state = "diagonalWall3"
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_2)
-"A" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 4;
-	icon_state = "diagonalWall3"
-	},
-/area/ruin/powered/shuttle/medium_2)
 "B" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ruin/powered/shuttle/medium_2)
@@ -179,15 +142,15 @@ a
 (4,1,1) = {"
 b
 f
-j
 d
 d
-q
+d
+d
 a
-j
 d
 d
-q
+d
+d
 b
 f
 "}
@@ -196,11 +159,11 @@ c
 c
 d
 d
-g
+h
 h
 l
 h
-z
+h
 d
 d
 c
@@ -209,7 +172,7 @@ c
 (6,1,1) = {"
 d
 d
-g
+h
 h
 h
 r
@@ -217,7 +180,7 @@ m
 r
 h
 h
-z
+h
 d
 d
 "}
@@ -238,7 +201,7 @@ d
 "}
 (8,1,1) = {"
 d
-g
+h
 h
 n
 h
@@ -248,7 +211,7 @@ B
 h
 n
 h
-z
+h
 d
 "}
 (9,1,1) = {"
@@ -267,7 +230,7 @@ h
 d
 "}
 (10,1,1) = {"
-e
+d
 h
 k
 k
@@ -279,7 +242,7 @@ h
 k
 k
 h
-A
+d
 "}
 (11,1,1) = {"
 a

_maps/templates/medium_shuttle3.dmm

@@ -17,34 +17,13 @@
 	},
 /turf/open/floor/plating/airless,
 /area/ruin/powered/shuttle/medium_3)
-"e" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 8;
-	icon_state = "diagonalWall3"
-	},
-/area/ruin/powered/shuttle/medium_3)
-"f" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 1;
-	icon_state = "diagonalWall3"
-	},
-/area/ruin/powered/shuttle/medium_3)
 "g" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 4;
-	icon_state = "diagonalWall3"
-	},
+/turf/closed/wall/mineral/plastitanium,
 /turf/closed/wall/mineral/titanium,
 /area/ruin/powered/shuttle/medium_3)
 "h" = (
 /turf/closed/wall/mineral/titanium,
 /area/ruin/powered/shuttle/medium_3)
-"i" = (
-/turf/closed/wall/mineral/plastitanium{
-	icon_state = "diagonalWall3"
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_3)
 "j" = (
 /obj/machinery/door/airlock/external/glass,
 /turf/open/floor/plating,
@@ -87,24 +66,10 @@
 	},
 /turf/open/space,
 /area/ruin/powered/shuttle/medium_3)
-"s" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 1;
-	icon_state = "diagonalWall3"
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_3)
 "t" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/ruin/powered/shuttle/medium_3)
-"u" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 8;
-	icon_state = "diagonalWall3"
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_3)
 "v" = (
 /obj/structure/table,
 /turf/open/floor/plasteel/darkyellow,
@@ -118,11 +83,6 @@
 	},
 /turf/open/floor/plasteel/darkyellow,
 /area/ruin/powered/shuttle/medium_3)
-"y" = (
-/turf/closed/wall/mineral/plastitanium{
-	icon_state = "diagonalWall3"
-	},
-/area/ruin/powered/shuttle/medium_3)
 "z" = (
 /obj/machinery/sleeper,
 /turf/open/floor/plasteel/darkblue,
@@ -130,12 +90,6 @@
 "A" = (
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered/shuttle/medium_3)
-"B" = (
-/turf/closed/wall/mineral/plastitanium{
-	dir = 4;
-	icon_state = "diagonalWall3"
-	},
-/area/ruin/powered/shuttle/medium_3)
 "C" = (
 /turf/open/floor/plasteel/darkblue,
 /area/ruin/powered/shuttle/medium_3)
@@ -210,18 +164,18 @@ a
 a
 a
 a
-e
+c
 o
 c
 c
-y
+c
 a
 a
-e
+c
 c
 c
 o
-y
+c
 a
 a
 a
@@ -233,7 +187,7 @@ a
 a
 a
 a
-e
+c
 c
 c
 c
@@ -246,7 +200,7 @@ c
 c
 c
 c
-y
+c
 a
 a
 a
@@ -256,22 +210,22 @@ a
 a
 a
 a
-e
-g
-h
-h
-s
-c
-g
-j
-j
-s
 c
 g
 h
 h
-s
-y
+g
+c
+g
+j
+j
+g
+c
+g
+h
+h
+g
+c
 a
 a
 a
@@ -279,7 +233,7 @@ a
 (6,1,1) = {"
 a
 a
-e
+c
 c
 h
 k
@@ -296,7 +250,7 @@ l
 k
 h
 c
-y
+c
 a
 a
 "}
@@ -329,7 +283,7 @@ a
 c
 c
 c
-i
+g
 G
 l
 l
@@ -342,7 +296,7 @@ l
 l
 l
 G
-u
+g
 c
 c
 c
@@ -375,7 +329,7 @@ F
 (10,1,1) = {"
 a
 a
-f
+c
 c
 g
 G
@@ -390,9 +344,9 @@ A
 G
 p
 G
-s
+g
+c
 c
-B
 a
 a
 "}
@@ -447,9 +401,9 @@ a
 (13,1,1) = {"
 a
 a
-e
 c
-i
+c
+g
 G
 p
 G
@@ -462,9 +416,9 @@ A
 G
 p
 G
-u
+g
+c
 c
-y
 a
 a
 "}
@@ -510,7 +464,7 @@ l
 l
 l
 G
-s
+g
 c
 c
 c
@@ -543,7 +497,7 @@ a
 (17,1,1) = {"
 a
 a
-f
+c
 c
 h
 k
@@ -560,7 +514,7 @@ l
 k
 h
 c
-B
+c
 a
 a
 "}
@@ -568,22 +522,22 @@ a
 a
 a
 a
-f
-i
-h
-h
-u
 c
-i
+g
+h
+h
+g
+c
+g
 j
 j
-u
+g
 c
-i
+g
 h
 h
-u
-B
+g
+c
 a
 a
 a
@@ -593,7 +547,7 @@ a
 a
 a
 a
-f
+c
 c
 c
 c
@@ -606,7 +560,7 @@ c
 c
 c
 c
-B
+c
 a
 a
 a
@@ -618,18 +572,18 @@ a
 a
 a
 a
-f
+c
 q
 c
 c
-B
+c
 a
 a
-f
+c
 c
 c
 q
-B
+c
 a
 a
 a

code/__DEFINES/atmospherics.dm

@@ -86,16 +86,18 @@
 #define HAZARD_LOW_PRESSURE					20		//This is when the black ultra-low pressure icon is displayed. (This one is set as a constant)
 
 #define TEMPERATURE_DAMAGE_COEFFICIENT		1.5		//This is used in handle_temperature_damage() for humans, and in reagents that affect body temperature. Temperature damage is multiplied by this amount.
-#define BODYTEMP_AUTORECOVERY_DIVISOR		12		//This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive.
-#define BODYTEMP_AUTORECOVERY_MINIMUM		10		//Minimum amount of kelvin moved toward 310.15K per tick. So long as abs(310.15 - bodytemp) is more than 50.
-#define BODYTEMP_NORMAL						310.15	//98.6F, or 37C, the normal temprature of the human body.
-#define BODYTEMP_COLD_DIVISOR				6		//Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster.
-#define BODYTEMP_HEAT_DIVISOR				6		//Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster.
-#define BODYTEMP_COOLING_MAX				30		//The maximum number of degrees that your body can cool in 1 tick, when in a cold area.
-#define BODYTEMP_HEATING_MAX				30		//The maximum number of degrees that your body can heat up in 1 tick, when in a hot area.
 
-#define BODYTEMP_HEAT_DAMAGE_LIMIT			360.15 // The limit the human body can take before it starts taking damage from heat.
-#define BODYTEMP_COLD_DAMAGE_LIMIT			260.15 // The limit the human body can take before it starts taking damage from coldness.
+#define BODYTEMP_NORMAL						310.15			//The natural temperature for a body
+#define BODYTEMP_AUTORECOVERY_DIVISOR		11		//This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive.
+#define BODYTEMP_AUTORECOVERY_MINIMUM		12		//Minimum amount of kelvin moved toward 310K per tick. So long as abs(310.15 - bodytemp) is more than 50.
+#define BODYTEMP_COLD_DIVISOR				6		//Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster.
+#define BODYTEMP_HEAT_DIVISOR				15		//Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster.
+#define BODYTEMP_COOLING_MAX				-100		//The maximum number of degrees that your body can cool in 1 tick, due to the environment, when in a cold area.
+#define BODYTEMP_HEATING_MAX				30		//The maximum number of degrees that your body can heat up in 1 tick, due to the environment, when in a hot area.
+
+#define BODYTEMP_HEAT_DAMAGE_LIMIT			(BODYTEMP_NORMAL + 50) // The limit the human body can take before it starts taking damage from heat.
+#define BODYTEMP_COLD_DAMAGE_LIMIT			(BODYTEMP_NORMAL - 50) // The limit the human body can take before it starts taking damage from coldness.
+
 
 #define SPACE_HELM_MIN_TEMP_PROTECT			2.0		//what min_cold_protection_temperature is set to for space-helmet quality headwear. MUST NOT BE 0.
 #define SPACE_HELM_MAX_TEMP_PROTECT			1500	//Thermal insulation works both ways /Malkevin

code/__DEFINES/subsystems.dm

@@ -75,36 +75,31 @@
 // Subsystem fire priority, from lowest to highest priority
 // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
 
-#define FIRE_PRIORITY_IDLE_NPC		1
-#define FIRE_PRIORITY_SERVER_MAINT	1
-
-#define FIRE_PRIORITY_GARBAGE		4
-#define FIRE_PRIORITY_RESEARCH		4
-#define FIRE_PRIORITY_AIR			5
-#define FIRE_PRIORITY_NPC			5
-#define FIRE_PRIORITY_PROCESS		6
-#define FIRE_PRIORITY_THROWING		6
-#define FIRE_PRIORITY_FLIGHTPACKS	7
-#define FIRE_PRIORITY_SPACEDRIFT	7
-#define FIRE_PRIOTITY_SMOOTHING		8
-#define FIRE_PRIORITY_ORBIT			8
-#define FIRE_PRIORITY_OBJ			9
-#define FIRE_PRIORUTY_FIELDS		9
-#define FIRE_PRIORITY_ACID			9
-#define FIRE_PRIOTITY_BURNING		9
-#define FIRE_PRIORITY_INBOUNDS		9
-
-#define FIRE_PRIORITY_DEFAULT		10
-
-#define FIRE_PRIORITY_PARALLAX		11
-#define FIRE_PRIORITY_NETWORKS		12
-#define FIRE_PRIORITY_MOBS			13
-#define FIRE_PRIORITY_TGUI			14
-
-#define FIRE_PRIORITY_TICKER		19
-#define FIRE_PRIORITY_OVERLAYS		20
-
-#define FIRE_PRIORITY_INPUT			100 // This must always always be the max highest priority. Player input must never be lost.
+#define FIRE_PRIORITY_IDLE_NPC		10
+#define FIRE_PRIORITY_SERVER_MAINT	10
+#define FIRE_PRIORITY_GARBAGE		15
+#define FIRE_PRIORITY_RESEARCH		15
+#define FIRE_PRIORITY_AIR			20
+#define FIRE_PRIORITY_NPC			20
+#define FIRE_PRIORITY_PROCESS		25
+#define FIRE_PRIORITY_THROWING		25
+#define FIRE_PRIORITY_FLIGHTPACKS	30
+#define FIRE_PRIORITY_SPACEDRIFT	30
+#define FIRE_PRIOTITY_SMOOTHING		35
+#define FIRE_PRIORITY_ORBIT			35
+#define FIRE_PRIORITY_OBJ			40
+#define FIRE_PRIORUTY_FIELDS		40
+#define FIRE_PRIORITY_ACID			40
+#define FIRE_PRIOTITY_BURNING		40
+#define FIRE_PRIORITY_INBOUNDS		40
+#define FIRE_PRIORITY_DEFAULT		50
+#define FIRE_PRIORITY_PARALLAX		65
+#define FIRE_PRIORITY_NETWORKS		80
+#define FIRE_PRIORITY_MOBS			100
+#define FIRE_PRIORITY_TGUI			110
+#define FIRE_PRIORITY_TICKER		200
+#define FIRE_PRIORITY_OVERLAYS		500
+#define FIRE_PRIORITY_INPUT			1000 // This must always always be the max highest priority. Player input must never be lost.
 
 // SS runlevels
 

code/_compile_options.dm

@@ -18,6 +18,9 @@
 #endif							//	1 to use the default behaviour;
 								//	2 for preloading absolutely everything;
 
+#ifdef LOWMEMORYMODE
+#define FORCE_MAP "_maps/runtimestation.json"
+#endif
 
 #define BACKGROUND_ENABLED 0    // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
 								// 1 will enable set background. 0 will disable set background.

code/controllers/subsystem/mapping.dm

@@ -42,7 +42,7 @@ SUBSYSTEM_DEF(mapping)
 	repopulate_sorted_areas()
 	process_teleport_locs()			//Sets up the wizard teleport locations
 	preloadTemplates()
-
+#ifndef LOWMEMORYMODE
 	// Create space levels
 	for(var/I in 1 to ZLEVEL_SPACE_RUIN_COUNT)
 		add_new_zlevel("Empty Area [2 + I]", CROSSLINKED, list(ZTRAIT_SPACE_RUINS = TRUE))
@@ -67,7 +67,7 @@ SUBSYSTEM_DEF(mapping)
 	if (space_ruins.len)
 		seedRuins(space_ruins, CONFIG_GET(number/space_budget), /area/space, space_ruins_templates)
 	loading_ruins = FALSE
-
+#endif
 	repopulate_sorted_areas()
 	// Set up Z-level transitions.
 	setup_map_transitions()

code/game/machinery/doors/airlock.dm

@@ -979,7 +979,7 @@
 		charge.forceMove(get_turf(user))
 		charge = null
 		return
-	if( beingcrowbarred && (density && welded && !operating && src.panel_open && (!hasPower()) && !src.locked) )
+	if(beingcrowbarred && panel_open && (emagged || (density && welded && !operating && !hasPower() && !locked)))
 		playsound(src.loc, I.usesound, 100, 1)
 		user.visible_message("[user] removes the electronics from the airlock assembly.", \
 							 "<span class='notice'>You start to remove electronics from the airlock assembly...</span>")

code/modules/food_and_drinks/food/snacks_other.dm

@@ -193,7 +193,7 @@
 	name = "spiderling"
 	desc = "It's slightly twitching in your hand. Ew..."
 	icon_state = "spiderling"
-	list_reagents = list("nutrient" = 1, "toxin" = 4)
+	list_reagents = list("nutriment" = 1, "toxin" = 4)
 	filling_color = "#00800"
 	tastes = list("cobwebs" = 1, "guts" = 2)
 	foodtype = MEAT | TOXIC

code/modules/jobs/job_types/cargo_service.dm

@@ -54,7 +54,7 @@ Cargo Technician
 	belt = /obj/item/device/pda/cargo
 	ears = /obj/item/device/radio/headset/headset_cargo
 	uniform = /obj/item/clothing/under/rank/cargotech
-
+	l_hand = /obj/item/device/export_scanner
 
 /*
 Shaft Miner

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

@@ -1623,24 +1623,29 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 	var/loc_temp = H.get_temperature(environment)
 
-	//Body temperature is adjusted in two steps. First, your body tries to stabilize itself a bit.
-	if(H.stat != DEAD)
-		H.natural_bodytemperature_stabilization()
-
-	//Then, it reacts to the surrounding atmosphere based on your thermal protection
+	//Body temperature is adjusted in two parts: first there your body tries to naturally preserve homeostasis (shivering/sweating), then it reacts to the surrounding environment
+	//Thermal protection (insulation) has mixed benefits in two situations (hot in hot places, cold in hot places)
 	if(!H.on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
-		if(loc_temp < H.bodytemperature)
-			//Place is colder than we are
-			var/thermal_protection = H.get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
-			if(thermal_protection < 1)
-				H.bodytemperature += min((1-thermal_protection) * ((loc_temp - H.bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX)
-		else
-			//Place is hotter than we are
-			var/thermal_protection = H.get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
-			if(thermal_protection < 1)
-				H.bodytemperature += min((1-thermal_protection) * ((loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX)
+		if((abs(BODYTEMP_NORMAL - H.bodytemperature) <= 5) && (abs(BODYTEMP_NORMAL - loc_temp) <= 25))
+			return //Performance saver
+		var/natural = 0
+		if(H.stat != DEAD)
+			natural = H.natural_bodytemperature_stabilization()
+		var/thermal_protection = 1
+		if(loc_temp < H.bodytemperature) //Place is colder than we are
+			thermal_protection -= H.get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
+			if(H.bodytemperature < BODYTEMP_NORMAL) //we're cold, insulation helps us retain body heat and will reduce the heat we lose to the environment
+				H.bodytemperature += (thermal_protection+1)*natural + max(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX)
+			else //we're sweating, insulation hinders our ability to reduce heat - and it will reduce the amount of cooling you get from the environment
+				H.bodytemperature += natural*(1/(thermal_protection+1)) + max((thermal_protection * (loc_temp - H.bodytemperature) + BODYTEMP_NORMAL - H.bodytemperature) / BODYTEMP_COLD_DIVISOR , BODYTEMP_COOLING_MAX) //Extra calculation for hardsuits to bleed off heat
+		else //Place is hotter than we are
+			thermal_protection -= H.get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
+			if(H.bodytemperature < BODYTEMP_NORMAL) //and we're cold, insulation enhances our ability to retain body heat but reduces the heat we get from the environment
+				H.bodytemperature += (thermal_protection+1)*natural + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX)
+			else //we're sweating, insulation hinders out ability to reduce heat - but will reduce the amount of heat we get from the environment
+				H.bodytemperature += natural*(1/(thermal_protection+1)) + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX)
 
-	// +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt.
+	// +/- 50 degrees from 310K is the 'safe' zone, where no damage is dealt.
 	if(H.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !(RESISTHOT in species_traits))
 		//Body temperature is too hot.
 		var/burn_damage

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

@@ -214,7 +214,7 @@
 	default_features = list("slimecoontail" = "Slimecoon Tail", "slimecoonears" = "Slimecoon Ears", "slimecoonsnout" = "Slimecoon Snout")*/
 
 // Fat Shark <3
-
+/*
 /datum/species/shark/datashark
 	name = "DataShark"
 	id = "datashark"
@@ -228,6 +228,7 @@
 	whitelisted = 1
 	whitelist = list("rubyflamewing")
 	blacklisted = 0
+	*/
 
 /datum/species/guilmon
 	name = "Guilmon"

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

@@ -396,15 +396,14 @@
 /mob/living/carbon/proc/natural_bodytemperature_stabilization()
 	var/body_temperature_difference = BODYTEMP_NORMAL - bodytemperature
 	switch(bodytemperature)
-		if(-INFINITY to BODYTEMP_COLD_DAMAGE_LIMIT) //BODYTEMP_COLD_DAMAGE_LIMIT is BODYTEMP_NORMAL(310.15) - 50, the temperature where you start to feel effects.
-			bodytemperature += max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
+		if(-INFINITY to BODYTEMP_COLD_DAMAGE_LIMIT) //Cold damage limit is 50 below the default, the temperature where you start to feel effects.
+			return max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
 		if(BODYTEMP_COLD_DAMAGE_LIMIT to BODYTEMP_NORMAL)
-			bodytemperature += max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM/4))
-		if(BODYTEMP_NORMAL to BODYTEMP_HEAT_DAMAGE_LIMIT)
-			bodytemperature += min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, max(body_temperature_difference, -BODYTEMP_AUTORECOVERY_MINIMUM/4))
-		if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY) //BODYTEMP_HEAT_DAMAGE_LIMIT is BODYTEMP_NORMAL(310.15) + 50, the temperature where you start to feel effects.
-			//We totally need a sweat system cause it totally makes sense...~
-			bodytemperature += min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM)	//We're dealing with negative numbers
+			return max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM/4))
+		if(BODYTEMP_NORMAL to BODYTEMP_HEAT_DAMAGE_LIMIT) // Heat damage limit is 50 above the default, the temperature where you start to feel effects.
+			return min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, max(body_temperature_difference, -BODYTEMP_AUTORECOVERY_MINIMUM/4))
+		if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY)
+			return min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM)	//We're dealing with negative numbers
 /////////
 //LIVER//
 /////////
@@ -460,4 +459,4 @@
 		death()
 		var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
 		if(B)
-			B.damaged_brain = TRUE
+			B.damaged_brain = TRUE

code/modules/mob/living/carbon/monkey/life.dm

@@ -66,13 +66,13 @@
 	var/loc_temp = get_temperature(environment)
 
 	if(stat != DEAD)
-		natural_bodytemperature_stabilization()
+		bodytemperature += natural_bodytemperature_stabilization()
 
 	if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
 		if(loc_temp < bodytemperature)
 			bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX)
 		else
-			bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX)
+			bodytemperature += max(((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX)
 
 	if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
 		switch(bodytemperature)

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

@@ -231,7 +231,7 @@
 	var/atom/A = src.loc
 	if(isturf(A))
 		var/areatemp = get_temperature(environment)
-		if( abs(areatemp - bodytemperature) > 40 )
+		if( abs(areatemp - bodytemperature) > 5)
 			var/diff = areatemp - bodytemperature
 			diff = diff / 5
 			bodytemperature += diff

code/modules/mob/living/simple_animal/slime/life.dm

@@ -341,7 +341,6 @@
 					var/ally = FALSE
 					for(var/F in faction)
 						if(F == "neutral") //slimes are neutral so other mobs not target them, but they can target neutral mobs
-							continue
 						if(F in L.faction)
 							ally = TRUE
 							break

code/modules/projectiles/guns/energy/kinetic_accelerator.dm

@@ -87,7 +87,7 @@
 
 /obj/item/gun/energy/kinetic_accelerator/dropped()
 	. = ..()
-	if(!holds_charge)
+	if(!QDELING(src) && !holds_charge)
 		// Put it on a delay because moving item from slot to hand
 		// calls dropped().
 		addtimer(CALLBACK(src, .proc/empty_if_not_held), 2)
@@ -97,10 +97,13 @@
 		empty()
 
 /obj/item/gun/energy/kinetic_accelerator/proc/empty()
-	cell.use(cell.charge)
+	if(cell)
+		cell.use(cell.charge)
 	update_icon()
 
 /obj/item/gun/energy/kinetic_accelerator/proc/attempt_reload(recharge_time)
+	if(!cell)
+		return
 	if(overheat)
 		return
 	if(!recharge_time)

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -213,29 +213,31 @@
 	taste_description = "mint"
 
 /datum/reagent/consumable/frostoil/on_mob_life(mob/living/M)
-	switch(current_cycle)
-		if(1 to 15)
-			M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT
-			if(holder.has_reagent("capsaicin"))
-				holder.remove_reagent("capsaicin", 5)
-			if(isslime(M))
-				M.bodytemperature -= rand(5,20)
-		if(15 to 25)
-			M.bodytemperature -= 20 * TEMPERATURE_DAMAGE_COEFFICIENT
-			if(isslime(M))
-				M.bodytemperature -= rand(10,20)
-		if(25 to 35)
-			M.bodytemperature -= 30 * TEMPERATURE_DAMAGE_COEFFICIENT
-			if(prob(1))
-				M.emote("shiver")
-			if(isslime(M))
-				M.bodytemperature -= rand(15,20)
-		if(35 to INFINITY)
-			M.bodytemperature -= 40 * TEMPERATURE_DAMAGE_COEFFICIENT
-			if(prob(5))
-				M.emote("shiver")
-			if(isslime(M))
-				M.bodytemperature -= rand(20,25)
+	if(M.bodytemperature > 50)
+		switch(current_cycle)
+			if(1 to 15)
+				M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT
+				if(holder.has_reagent("capsaicin"))
+					holder.remove_reagent("capsaicin", 5)
+				if(isslime(M))
+					M.bodytemperature -= rand(5,20)
+			if(15 to 25)
+				M.bodytemperature -= 20 * TEMPERATURE_DAMAGE_COEFFICIENT
+				if(isslime(M))
+					M.bodytemperature -= rand(10,20)
+			if(25 to 35)
+				M.bodytemperature -= 30 * TEMPERATURE_DAMAGE_COEFFICIENT
+				if(prob(1))
+					M.emote("shiver")
+				if(isslime(M))
+					M.bodytemperature -= rand(15,20)
+			if(35 to INFINITY)
+				M.bodytemperature -= 40 * TEMPERATURE_DAMAGE_COEFFICIENT
+				if(prob(5))
+					M.emote("shiver")
+				if(isslime(M))
+					M.bodytemperature -= rand(20,25)
+		M.bodytemperature = max(50, M.bodytemperature)
 	..()
 
 /datum/reagent/consumable/frostoil/reaction_turf(turf/T, reac_volume)

html/changelogs/AutoChangeLog-pr-4929.yml

@@ -0,0 +1,6 @@
+author: "Robustin"
+delete-after: True
+changes: 
+  - bugfix: "Fixed frost oil (cryosting) sending insulated crewmembers below absolute zero temperatures."
+  - bugfix: "Fixed damaging cold temps being a death sentence to simple mobs (they wouldn't heat back up to safe temps at room temperature)."
+  - refactor: "Refactored human temperature code, insulating clothing now helps you stay warm but going unprotected will help you cool off. However, you will now benefit from colder temps when you're overheating even in full EVA/hardsuit gear and you will warm up faster at room temperature in insulated gear as well (i.e. putting on a winter coat will no longer suppress your temperature if your already cold)."

html/changelogs/AutoChangeLog-pr-4954.yml

@@ -0,0 +1,4 @@
+author: "XDTM"
+delete-after: True
+changes: 
+  - bugfix: "Slimes no longer attack people with their same faction."

html/changelogs/AutoChangeLog-pr-4970.yml

@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes: 
+  - rscadd: "All Cargo Techs now come equipped with a standard supply Export Scanner! Get to selling!"

html/changelogs/AutoChangeLog-pr-4973.yml

@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes: 
+  - tweak: "Emagged airlocks can now be deconstructed simply by crowbarring when the panel is open"

tgstation.dme

@@ -13,7 +13,7 @@
 // END_PREFERENCES
 
 // BEGIN_INCLUDE
-#include "_maps\basemap.dm"
+#include "_maps\_basemap.dm"
 #include "code\_compile_options.dm"
 #include "code\world.dm"
 #include "code\__DATASTRUCTURES\globals.dm"

tools/travis/build_byond.sh

@@ -35,7 +35,10 @@ if [ "$BUILD_TOOLS" = false ]; then
 	fi;
 
 	#config folder should not be mandatory
-	rm -rf config
+	rm -rf config/*
+	
+	#disable all ruins
+	echo -e "LAVALAND_BUDGET 0\nSPACE_BUDGET 0" > config/config.txt
 
     source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
 	if [ "$BUILD_TESTING" = true ]; then