From d51618bcc8b35e9541223cc45b31069d0b197988 Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Tue, 29 Sep 2020 18:00:24 +0100
Subject: [PATCH 01/11] wilderness tweak?

---
 code/game/objects/structures/signs.dm |   2 +-
 maps/tether/submaps/tether_plains.dmm | 460 +++++++++++++-------------
 2 files changed, 231 insertions(+), 231 deletions(-)

diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index f93ceaf0a1f..c443d6676d6 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -404,7 +404,7 @@
 	icon = 'icons/obj/decals_vr.dmi'
 	name = "\improper Caution: Hostile fauna"
 	desc = "This sign warns of hostile life forms in the area."
-	icon_state = "h_fauna"
+	icon_state = "xenolab" //was "h_fauna", but this icon was either never included or deleted
 
 /obj/structure/sign/graffiti/pisoff
 	icon = 'icons/obj/decals_vr.dmi'
diff --git a/maps/tether/submaps/tether_plains.dmm b/maps/tether/submaps/tether_plains.dmm
index 784fcc9e915..720f23f9e46 100644
--- a/maps/tether/submaps/tether_plains.dmm
+++ b/maps/tether/submaps/tether_plains.dmm
@@ -37,7 +37,6 @@
 	dir = 1;
 	id = "wilderness";
 	name = "Anti-Fauna shutters";
-	pixel_x = 0;
 	pixel_y = -25
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
@@ -45,8 +44,7 @@
 "aj" = (
 /obj/effect/floor_decal/rust,
 /obj/machinery/light/small{
-	dir = 8;
-	pixel_x = 0
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
 /area/tether/outpost/exploration_shed)
@@ -99,7 +97,6 @@
 /area/tether/outpost/exploration_shed)
 "aq" = (
 /obj/machinery/button/remote/blast_door{
-	dir = 2;
 	id = "wilderness";
 	name = "Anti-Fauna shutters";
 	pixel_x = -1;
@@ -131,6 +128,9 @@
 /mob/living/simple_mob/animal/passive/gaslamp,
 /turf/simulated/floor/outdoors/grass/sif/virgo3b,
 /area/tether/outpost/exploration_plains)
+"TI" = (
+/turf/simulated/mineral/virgo3b,
+/area/tether/outpost/exploration_shed)
 
 (1,1,1) = {"
 as
@@ -987,7 +987,7 @@ ac
 (7,1,1) = {"
 as
 bF
-ad
+bF
 ad
 bF
 bF
@@ -1128,7 +1128,7 @@ ac
 "}
 (8,1,1) = {"
 as
-ad
+bF
 ad
 ad
 ad
@@ -1270,7 +1270,7 @@ ac
 "}
 (9,1,1) = {"
 as
-ad
+bF
 ad
 ad
 ad
@@ -1412,7 +1412,7 @@ ac
 "}
 (10,1,1) = {"
 as
-ab
+bF
 ad
 ad
 ab
@@ -1554,9 +1554,9 @@ ac
 "}
 (11,1,1) = {"
 as
-ab
-ab
-ab
+bF
+ad
+ad
 ab
 ab
 ab
@@ -1696,8 +1696,8 @@ ac
 "}
 (12,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -1838,8 +1838,8 @@ ac
 "}
 (13,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -1980,8 +1980,8 @@ ac
 "}
 (14,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -2122,8 +2122,8 @@ ac
 "}
 (15,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -2264,8 +2264,8 @@ ac
 "}
 (16,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -2406,8 +2406,8 @@ ac
 "}
 (17,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -2548,8 +2548,8 @@ ac
 "}
 (18,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -2690,8 +2690,8 @@ ac
 "}
 (19,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -2832,8 +2832,8 @@ ac
 "}
 (20,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -2974,8 +2974,8 @@ ac
 "}
 (21,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -3116,8 +3116,8 @@ ac
 "}
 (22,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -3258,8 +3258,8 @@ ac
 "}
 (23,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -3400,8 +3400,8 @@ ac
 "}
 (24,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -3542,8 +3542,8 @@ ac
 "}
 (25,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -3684,8 +3684,8 @@ ac
 "}
 (26,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -3826,8 +3826,8 @@ ac
 "}
 (27,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -3968,8 +3968,8 @@ ac
 "}
 (28,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -4110,8 +4110,8 @@ ac
 "}
 (29,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -4252,8 +4252,8 @@ ac
 "}
 (30,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -4394,8 +4394,8 @@ ac
 "}
 (31,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -4536,8 +4536,8 @@ ac
 "}
 (32,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -4678,8 +4678,8 @@ ac
 "}
 (33,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -4820,8 +4820,8 @@ ac
 "}
 (34,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -4962,8 +4962,8 @@ ac
 "}
 (35,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -5104,8 +5104,8 @@ ac
 "}
 (36,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -5246,8 +5246,8 @@ ac
 "}
 (37,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 Em
@@ -5388,8 +5388,8 @@ ac
 "}
 (38,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -5530,8 +5530,8 @@ ac
 "}
 (39,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -5672,8 +5672,8 @@ ac
 "}
 (40,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -5814,8 +5814,8 @@ ac
 "}
 (41,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -5956,8 +5956,8 @@ ac
 "}
 (42,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -6098,8 +6098,8 @@ ac
 "}
 (43,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -6240,8 +6240,8 @@ ac
 "}
 (44,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -6382,8 +6382,8 @@ ac
 "}
 (45,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -6524,8 +6524,8 @@ ac
 "}
 (46,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -6666,8 +6666,8 @@ ac
 "}
 (47,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -6808,8 +6808,8 @@ ac
 "}
 (48,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -6950,8 +6950,8 @@ ac
 "}
 (49,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -7092,8 +7092,8 @@ ac
 "}
 (50,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -7234,8 +7234,8 @@ ac
 "}
 (51,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -7376,8 +7376,8 @@ ac
 "}
 (52,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -7518,8 +7518,8 @@ ac
 "}
 (53,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -7660,8 +7660,8 @@ ac
 "}
 (54,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -7802,8 +7802,8 @@ ac
 "}
 (55,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -7944,8 +7944,8 @@ ac
 "}
 (56,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -8086,8 +8086,8 @@ ac
 "}
 (57,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -8228,8 +8228,8 @@ ac
 "}
 (58,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -8370,8 +8370,8 @@ ac
 "}
 (59,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -8512,8 +8512,8 @@ ac
 "}
 (60,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -8654,8 +8654,8 @@ ac
 "}
 (61,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -8796,8 +8796,8 @@ ac
 "}
 (62,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -8938,7 +8938,7 @@ ac
 "}
 (63,1,1) = {"
 as
-ab
+bF
 ad
 ad
 ab
@@ -9080,7 +9080,7 @@ ac
 "}
 (64,1,1) = {"
 at
-an
+TI
 an
 an
 an
@@ -10784,7 +10784,7 @@ ac
 "}
 (76,1,1) = {"
 at
-an
+TI
 an
 an
 an
@@ -10926,7 +10926,7 @@ ac
 "}
 (77,1,1) = {"
 as
-ad
+bF
 ad
 ad
 ab
@@ -11068,8 +11068,8 @@ ac
 "}
 (78,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -11210,8 +11210,8 @@ ac
 "}
 (79,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -11352,8 +11352,8 @@ ac
 "}
 (80,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -11494,8 +11494,8 @@ ac
 "}
 (81,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -11636,8 +11636,8 @@ ac
 "}
 (82,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -11778,8 +11778,8 @@ ac
 "}
 (83,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -11920,8 +11920,8 @@ ac
 "}
 (84,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -12062,8 +12062,8 @@ ac
 "}
 (85,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -12204,8 +12204,8 @@ ac
 "}
 (86,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -12346,8 +12346,8 @@ ac
 "}
 (87,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -12488,8 +12488,8 @@ ac
 "}
 (88,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -12630,8 +12630,8 @@ ac
 "}
 (89,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -12772,8 +12772,8 @@ ac
 "}
 (90,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -12914,8 +12914,8 @@ ac
 "}
 (91,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -13056,8 +13056,8 @@ ac
 "}
 (92,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -13198,8 +13198,8 @@ ac
 "}
 (93,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -13340,8 +13340,8 @@ ac
 "}
 (94,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -13482,8 +13482,8 @@ ac
 "}
 (95,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -13624,8 +13624,8 @@ ac
 "}
 (96,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -13766,8 +13766,8 @@ ac
 "}
 (97,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -13908,8 +13908,8 @@ ac
 "}
 (98,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -14050,8 +14050,8 @@ ac
 "}
 (99,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -14192,8 +14192,8 @@ ac
 "}
 (100,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -14334,8 +14334,8 @@ ac
 "}
 (101,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -14476,8 +14476,8 @@ ac
 "}
 (102,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -14618,8 +14618,8 @@ ac
 "}
 (103,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -14760,8 +14760,8 @@ ac
 "}
 (104,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -14902,8 +14902,8 @@ ac
 "}
 (105,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -15044,8 +15044,8 @@ ac
 "}
 (106,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -15186,8 +15186,8 @@ ac
 "}
 (107,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -15328,8 +15328,8 @@ ac
 "}
 (108,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -15470,8 +15470,8 @@ ac
 "}
 (109,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -15612,8 +15612,8 @@ ac
 "}
 (110,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -15754,8 +15754,8 @@ ac
 "}
 (111,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -15896,8 +15896,8 @@ ac
 "}
 (112,1,1) = {"
 as
-ab
-ab
+bF
+ad
 BE
 ab
 ab
@@ -16038,8 +16038,8 @@ ac
 "}
 (113,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -16180,8 +16180,8 @@ ac
 "}
 (114,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -16322,8 +16322,8 @@ ac
 "}
 (115,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -16464,8 +16464,8 @@ ac
 "}
 (116,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -16606,8 +16606,8 @@ ac
 "}
 (117,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -16748,8 +16748,8 @@ ac
 "}
 (118,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -16890,8 +16890,8 @@ ac
 "}
 (119,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -17032,8 +17032,8 @@ ac
 "}
 (120,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -17174,8 +17174,8 @@ ac
 "}
 (121,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -17316,8 +17316,8 @@ ac
 "}
 (122,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -17458,8 +17458,8 @@ ac
 "}
 (123,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -17600,8 +17600,8 @@ ac
 "}
 (124,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 Em
 ab
@@ -17742,8 +17742,8 @@ ac
 "}
 (125,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -17884,8 +17884,8 @@ ac
 "}
 (126,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -18026,8 +18026,8 @@ ac
 "}
 (127,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -18168,8 +18168,8 @@ ac
 "}
 (128,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -18310,8 +18310,8 @@ ac
 "}
 (129,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -18452,8 +18452,8 @@ ac
 "}
 (130,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -18594,8 +18594,8 @@ ac
 "}
 (131,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ab
 ab
@@ -18736,8 +18736,8 @@ ac
 "}
 (132,1,1) = {"
 as
-ab
-ab
+bF
+ad
 ab
 ad
 ab
@@ -18878,8 +18878,8 @@ ac
 "}
 (133,1,1) = {"
 as
+bF
 ad
-ab
 ad
 ad
 ad
@@ -19020,8 +19020,8 @@ ac
 "}
 (134,1,1) = {"
 as
-ad
-ad
+bF
+bF
 ad
 ad
 ad

From 6b743affa96f608ce550023f5b3cd2dabaedc6fe Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Mon, 5 Oct 2020 20:12:06 +0300
Subject: [PATCH 02/11] Small item digestion fix/tweak

Fixes gurgle damages higher than the item's w_class value giving excess nutrition (like 6+6 damages would give 3 w_class worth of nutrition per cycle, totaling to be worth w_class 6 when taking 2 cycles) and also lets the digestion handle the entire item with one cycle if the damage is sufficient enough. A ciggy butt will no longer be worth 1,5 mining drills on max damage.
---
 code/modules/vore/eating/digest_act_vr.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm
index df59ffb35da..d5ec12ee855 100644
--- a/code/modules/vore/eating/digest_act_vr.dm
+++ b/code/modules/vore/eating/digest_act_vr.dm
@@ -28,7 +28,7 @@
 		if(g_damage > digest_stage)
 			g_damage = digest_stage
 		digest_stage -= g_damage
-	else
+	if(digest_stage <= 0)
 		for(var/obj/item/O in contents)
 			if(istype(O,/obj/item/weapon/storage/internal)) //Dump contents from dummy pockets.
 				for(var/obj/item/SO in O)
@@ -38,6 +38,8 @@
 			else if(item_storage)
 				O.forceMove(item_storage)
 		qdel(src)
+	if(g_damage > w_class)
+		return w_class
 	return g_damage
 
 /////////////

From 0697bfe5f33b746ac6379b917f42380059171e63 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Wed, 7 Oct 2020 04:35:11 +1000
Subject: [PATCH 03/11] Fixes double chair

---
 maps/tether/tether-01-surface1.dmm | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 08ba427fa91..04ae672b7e6 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -11536,6 +11536,16 @@
 	},
 /turf/simulated/floor/water/pool,
 /area/tether/surfacebase/surface_one_hall)
+"atm" = (
+/obj/structure/bed/chair/wood,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/lino,
+/area/crew_quarters/visitor_dining)
 "atn" = (
 /obj/machinery/status_display{
 	pixel_x = 32;
@@ -17352,17 +17362,6 @@
 	},
 /turf/simulated/floor/lino,
 /area/crew_quarters/visitor_dining)
-"aIs" = (
-/obj/structure/bed/chair/wood,
-/obj/structure/bed/chair/wood,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/lino,
-/area/crew_quarters/visitor_dining)
 "aIt" = (
 /obj/structure/bed/chair/wood,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -46116,7 +46115,7 @@ aEK
 aEK
 aEK
 aDu
-aIs
+atm
 aCQ
 aJV
 aDu

From 5fb488bc4a692dda9d126d75f267b917d7f2bec2 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Tue, 6 Oct 2020 21:38:43 -0400
Subject: [PATCH 04/11] Boom, Lift Button Immortality

Makes the lift button immune to being destroyed by mech drills and other stuff. This is just precautionary so you can't get cucked over if lots of buttons get destroyed if this isn't in place. Also a slight perk, since it means admins won't have to spawn any replacement buttons for said lift.
---
 code/modules/turbolift/turbolift_console_vr.dm | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 code/modules/turbolift/turbolift_console_vr.dm

diff --git a/code/modules/turbolift/turbolift_console_vr.dm b/code/modules/turbolift/turbolift_console_vr.dm
new file mode 100644
index 00000000000..bf25cdd419a
--- /dev/null
+++ b/code/modules/turbolift/turbolift_console_vr.dm
@@ -0,0 +1,3 @@
+// TFF 6/10/20 - Just a little thing to prevent the button from being destroyed by explosions.
+/obj/structure/lift/button/ex_act()
+  return

From 9c497dae2d1978d3c99475774c7cbb7d25996e98 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Tue, 6 Oct 2020 21:43:10 -0400
Subject: [PATCH 05/11] Whoop, almost forgot to update .dme

---
 vorestation.dme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vorestation.dme b/vorestation.dme
index d1de60fdae8..39444239f0b 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3603,6 +3603,7 @@
 #include "code\modules\turbolift\turbolift.dm"
 #include "code\modules\turbolift\turbolift_areas.dm"
 #include "code\modules\turbolift\turbolift_console.dm"
+#include "code\modules\turbolift\turbolift_console_vr.dm"
 #include "code\modules\turbolift\turbolift_door.dm"
 #include "code\modules\turbolift\turbolift_door_vr.dm"
 #include "code\modules\turbolift\turbolift_floor.dm"

From 01da31bc0fcaa51a00be18720fe48e0b069eaa06 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Tue, 6 Oct 2020 22:19:38 -0400
Subject: [PATCH 06/11] Panel ex_act resist, too

Also fixing indentation a bit. Derp.
---
 code/modules/turbolift/turbolift_console_vr.dm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/modules/turbolift/turbolift_console_vr.dm b/code/modules/turbolift/turbolift_console_vr.dm
index bf25cdd419a..a02730c08d9 100644
--- a/code/modules/turbolift/turbolift_console_vr.dm
+++ b/code/modules/turbolift/turbolift_console_vr.dm
@@ -1,3 +1,7 @@
-// TFF 6/10/20 - Just a little thing to prevent the button from being destroyed by explosions.
+// TFF 6/10/20 - Just a little thing to prevent the button
+				// and console from being destroyed by explosions.
 /obj/structure/lift/button/ex_act()
-  return
+	return
+
+/obj/structure/lift/panel/ex_act()
+	return
\ No newline at end of file

From 2192f3342727246438df719bf4dced80d007622d Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Thu, 8 Oct 2020 03:30:42 +0100
Subject: [PATCH 07/11] miscellaneous ship fixes

---
 maps/offmap_vr/om_ships/gecko_cr.dmm          | 53 ++++++++++++++----
 maps/offmap_vr/om_ships/gecko_cr_wreck.dmm    | 40 +++++++++----
 maps/offmap_vr/om_ships/gecko_sh.dmm          | 56 ++++++++++++++-----
 maps/offmap_vr/om_ships/mackerel_hc.dmm       | 13 ++++-
 maps/offmap_vr/om_ships/mackerel_hc_skel.dmm  | 12 +++-
 maps/offmap_vr/om_ships/mackerel_lc.dmm       | 13 ++++-
 maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm | 12 +++-
 maps/offmap_vr/om_ships/mackerel_sh.dmm       | 13 ++++-
 maps/offmap_vr/talon/talon1.dmm               |  8 +--
 9 files changed, 165 insertions(+), 55 deletions(-)

diff --git a/maps/offmap_vr/om_ships/gecko_cr.dmm b/maps/offmap_vr/om_ships/gecko_cr.dmm
index 5d2dab74010..3bc59b8e4f8 100644
--- a/maps/offmap_vr/om_ships/gecko_cr.dmm
+++ b/maps/offmap_vr/om_ships/gecko_cr.dmm
@@ -63,7 +63,9 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_engineering)
 "bJ" = (
-/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
@@ -177,8 +179,10 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/hatch,
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_engineering)
 "eD" = (
@@ -499,12 +503,14 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_cockpit)
 "kU" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_engineering)
 "lg" = (
@@ -814,7 +820,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit)
 "qh" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -824,6 +829,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr)
 "qx" = (
@@ -1401,8 +1409,10 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr)
 "Br" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_cockpit)
 "BH" = (
@@ -1480,6 +1490,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_engineering)
+"Cs" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/gecko_cr_cockpit)
 "Ct" = (
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/machinery/airlock_sensor{
@@ -1901,7 +1920,9 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit)
 "JE" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_cockpit)
 "JL" = (
@@ -1962,7 +1983,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_cockpit)
 "KA" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
@@ -1971,6 +1991,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit)
 "KS" = (
@@ -2223,7 +2246,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit)
 "OJ" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -2233,6 +2255,9 @@
 	name = "Blast Shields";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr)
 "ON" = (
@@ -2459,7 +2484,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr)
 "RB" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -2476,6 +2500,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr)
 "RG" = (
@@ -2848,7 +2875,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_engineering)
 "Xs" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -2858,6 +2884,9 @@
 	name = "Blast Shields";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_engineering)
 "XJ" = (
@@ -3432,7 +3461,7 @@ Mf
 zE
 Gs
 fe
-bJ
+Cs
 dS
 jT
 kI
@@ -3690,7 +3719,7 @@ HJ
 Iz
 XU
 mY
-bJ
+Cs
 Ct
 NE
 Jn
diff --git a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
index 1e1616251f4..18aab66287f 100644
--- a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
+++ b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
@@ -66,10 +66,12 @@
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_engineering_wreck)
 "bJ" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "bL" = (
@@ -838,13 +840,15 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "qh" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/blast/regular{
 	dir = 4;
 	id = "gecko_wreck_cr_blast";
 	name = "Blast Shields"
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_wreck)
 "qx" = (
@@ -1352,8 +1356,10 @@
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_wreck)
 "Br" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "BC" = (
@@ -1818,7 +1824,9 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "JE" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "JL" = (
@@ -1879,7 +1887,6 @@
 	},
 /area/shuttle/gecko_cr_cockpit_wreck)
 "KA" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
@@ -1888,6 +1895,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "KS" = (
@@ -2044,12 +2054,14 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "NG" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_engineering_wreck)
 "NI" = (
@@ -2232,13 +2244,15 @@
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Pv" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	dir = 4;
 	id = "gecko_wreck_cr_blast";
 	name = "Blast Shields"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_wreck)
 "Px" = (
@@ -2410,7 +2424,6 @@
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_wreck)
 "RB" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -2424,6 +2437,9 @@
 	name = "Blast Shields"
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 0;
 	oxygen = 0
@@ -2797,8 +2813,10 @@
 	},
 /area/shuttle/gecko_cr_engineering_wreck)
 "Xs" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 0;
 	oxygen = 0
@@ -2951,8 +2969,10 @@
 	name = "Blast Shields"
 	},
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/hatch,
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_engineering_wreck)
 "Zs" = (
diff --git a/maps/offmap_vr/om_ships/gecko_sh.dmm b/maps/offmap_vr/om_ships/gecko_sh.dmm
index c50673fe9ab..c2a0dbec4ef 100644
--- a/maps/offmap_vr/om_ships/gecko_sh.dmm
+++ b/maps/offmap_vr/om_ships/gecko_sh.dmm
@@ -237,8 +237,10 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/hatch,
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "ec" = (
@@ -289,10 +291,12 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh_cockpit)
 "eP" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "fe" = (
@@ -500,7 +504,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "kJ" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
@@ -513,15 +516,20 @@
 	opacity = 0
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "kU" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "lh" = (
@@ -738,8 +746,10 @@
 /turf/simulated/wall/rshull,
 /area/shuttle/gecko_sh)
 "qh" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "qx" = (
@@ -860,7 +870,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh)
 "rY" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -870,6 +879,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh)
 "sB" = (
@@ -897,7 +909,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "sS" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -907,6 +918,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh)
 "te" = (
@@ -925,7 +939,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh)
 "tM" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -935,6 +948,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "tP" = (
@@ -1079,7 +1095,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh)
 "xc" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
@@ -1088,6 +1103,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "xd" = (
@@ -1307,7 +1325,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh)
 "Br" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -1316,6 +1333,9 @@
 	name = "Blast Shields";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh)
 "Bz" = (
@@ -1811,7 +1831,9 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "JE" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh_cockpit)
 "Kn" = (
@@ -1856,10 +1878,12 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "Lc" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh_cockpit)
 "Lf" = (
@@ -2257,7 +2281,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "RB" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -2266,6 +2289,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh_engineering)
 "RG" = (
@@ -2560,7 +2586,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh_engineering)
 "Xs" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -2570,6 +2595,9 @@
 	name = "Blast Shields";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh_engineering)
 "XJ" = (
diff --git a/maps/offmap_vr/om_ships/mackerel_hc.dmm b/maps/offmap_vr/om_ships/mackerel_hc.dmm
index 63ff651cda3..2bc1ccf030a 100644
--- a/maps/offmap_vr/om_ships/mackerel_hc.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_hc.dmm
@@ -63,7 +63,9 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc)
 "cv" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc)
 "cD" = (
@@ -300,7 +302,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc)
 "uR" = (
-/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc)
 "we" = (
@@ -371,13 +376,15 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc)
 "BN" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc)
 "BP" = (
diff --git a/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm b/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm
index 83a9170b7ac..0fd66f642e8 100644
--- a/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm
@@ -69,7 +69,9 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel_eng)
 "cv" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc_skel_cockpit)
 "cD" = (
@@ -411,7 +413,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel)
 "uR" = (
-/obj/machinery/door/airlock/hatch,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -428,6 +429,9 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc_skel_cockpit)
 "we" = (
@@ -503,13 +507,15 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel)
 "BN" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc_skel_eng)
 "BP" = (
diff --git a/maps/offmap_vr/om_ships/mackerel_lc.dmm b/maps/offmap_vr/om_ships/mackerel_lc.dmm
index b1d65389bbf..03d853964d8 100644
--- a/maps/offmap_vr/om_ships/mackerel_lc.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_lc.dmm
@@ -22,7 +22,9 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_lc)
 "bw" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc)
 "bI" = (
@@ -43,13 +45,15 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc)
 "cg" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc)
 "cv" = (
@@ -314,7 +318,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc)
 "ug" = (
-/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc)
 "um" = (
diff --git a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
index fa1ccb1128e..418b6a416ac 100644
--- a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
@@ -26,7 +26,9 @@
 /turf/simulated/floor/airless,
 /area/shuttle/mackerel_lc_wreck)
 "bw" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint/airless,
 /area/shuttle/mackerel_lc_wreck)
 "bI" = (
@@ -54,13 +56,15 @@
 /turf/simulated/floor/airless,
 /area/shuttle/mackerel_lc_wreck)
 "cg" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc_wreck)
 "cv" = (
@@ -329,8 +333,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "ug" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc_wreck)
 "um" = (
diff --git a/maps/offmap_vr/om_ships/mackerel_sh.dmm b/maps/offmap_vr/om_ships/mackerel_sh.dmm
index de0c58a95cc..7511ece7da8 100644
--- a/maps/offmap_vr/om_ships/mackerel_sh.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_sh.dmm
@@ -22,7 +22,9 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_sh)
 "bw" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_sh)
 "bI" = (
@@ -43,13 +45,15 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_sh)
 "cg" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_sh)
 "cv" = (
@@ -324,7 +328,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_sh)
 "ug" = (
-/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_sh)
 "um" = (
diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm
index 2cba4892a6a..b194f0220a9 100644
--- a/maps/offmap_vr/talon/talon1.dmm
+++ b/maps/offmap_vr/talon/talon1.dmm
@@ -1402,15 +1402,15 @@
 /obj/machinery/atmospherics/pipe/cap/hidden{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "0-4"
-	},
 /obj/machinery/power/apc/talon{
 	dir = 1;
 	name = "north bump";
 	pixel_y = 28
 	},
+/obj/structure/cable/green{
+	d2 = 8;
+	icon_state = "0-8"
+	},
 /turf/simulated/floor/tiled/eris/dark/brown_perforated,
 /area/talon/deckone/port_eng)
 "cQ" = (

From 1468b66290e5fdcc6f505afe1e7b9c289bdbf527 Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Thu, 8 Oct 2020 03:31:28 +0100
Subject: [PATCH 08/11] Revert "wilderness tweak?"

This reverts commit d51618bcc8b35e9541223cc45b31069d0b197988.
---
 code/game/objects/structures/signs.dm |   2 +-
 maps/tether/submaps/tether_plains.dmm | 460 +++++++++++++-------------
 2 files changed, 231 insertions(+), 231 deletions(-)

diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index c443d6676d6..f93ceaf0a1f 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -404,7 +404,7 @@
 	icon = 'icons/obj/decals_vr.dmi'
 	name = "\improper Caution: Hostile fauna"
 	desc = "This sign warns of hostile life forms in the area."
-	icon_state = "xenolab" //was "h_fauna", but this icon was either never included or deleted
+	icon_state = "h_fauna"
 
 /obj/structure/sign/graffiti/pisoff
 	icon = 'icons/obj/decals_vr.dmi'
diff --git a/maps/tether/submaps/tether_plains.dmm b/maps/tether/submaps/tether_plains.dmm
index 720f23f9e46..784fcc9e915 100644
--- a/maps/tether/submaps/tether_plains.dmm
+++ b/maps/tether/submaps/tether_plains.dmm
@@ -37,6 +37,7 @@
 	dir = 1;
 	id = "wilderness";
 	name = "Anti-Fauna shutters";
+	pixel_x = 0;
 	pixel_y = -25
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
@@ -44,7 +45,8 @@
 "aj" = (
 /obj/effect/floor_decal/rust,
 /obj/machinery/light/small{
-	dir = 8
+	dir = 8;
+	pixel_x = 0
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
 /area/tether/outpost/exploration_shed)
@@ -97,6 +99,7 @@
 /area/tether/outpost/exploration_shed)
 "aq" = (
 /obj/machinery/button/remote/blast_door{
+	dir = 2;
 	id = "wilderness";
 	name = "Anti-Fauna shutters";
 	pixel_x = -1;
@@ -128,9 +131,6 @@
 /mob/living/simple_mob/animal/passive/gaslamp,
 /turf/simulated/floor/outdoors/grass/sif/virgo3b,
 /area/tether/outpost/exploration_plains)
-"TI" = (
-/turf/simulated/mineral/virgo3b,
-/area/tether/outpost/exploration_shed)
 
 (1,1,1) = {"
 as
@@ -987,7 +987,7 @@ ac
 (7,1,1) = {"
 as
 bF
-bF
+ad
 ad
 bF
 bF
@@ -1128,7 +1128,7 @@ ac
 "}
 (8,1,1) = {"
 as
-bF
+ad
 ad
 ad
 ad
@@ -1270,7 +1270,7 @@ ac
 "}
 (9,1,1) = {"
 as
-bF
+ad
 ad
 ad
 ad
@@ -1412,7 +1412,7 @@ ac
 "}
 (10,1,1) = {"
 as
-bF
+ab
 ad
 ad
 ab
@@ -1554,9 +1554,9 @@ ac
 "}
 (11,1,1) = {"
 as
-bF
-ad
-ad
+ab
+ab
+ab
 ab
 ab
 ab
@@ -1696,8 +1696,8 @@ ac
 "}
 (12,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -1838,8 +1838,8 @@ ac
 "}
 (13,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -1980,8 +1980,8 @@ ac
 "}
 (14,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -2122,8 +2122,8 @@ ac
 "}
 (15,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -2264,8 +2264,8 @@ ac
 "}
 (16,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -2406,8 +2406,8 @@ ac
 "}
 (17,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -2548,8 +2548,8 @@ ac
 "}
 (18,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -2690,8 +2690,8 @@ ac
 "}
 (19,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -2832,8 +2832,8 @@ ac
 "}
 (20,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -2974,8 +2974,8 @@ ac
 "}
 (21,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -3116,8 +3116,8 @@ ac
 "}
 (22,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -3258,8 +3258,8 @@ ac
 "}
 (23,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -3400,8 +3400,8 @@ ac
 "}
 (24,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -3542,8 +3542,8 @@ ac
 "}
 (25,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -3684,8 +3684,8 @@ ac
 "}
 (26,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -3826,8 +3826,8 @@ ac
 "}
 (27,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -3968,8 +3968,8 @@ ac
 "}
 (28,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -4110,8 +4110,8 @@ ac
 "}
 (29,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -4252,8 +4252,8 @@ ac
 "}
 (30,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -4394,8 +4394,8 @@ ac
 "}
 (31,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -4536,8 +4536,8 @@ ac
 "}
 (32,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -4678,8 +4678,8 @@ ac
 "}
 (33,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -4820,8 +4820,8 @@ ac
 "}
 (34,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -4962,8 +4962,8 @@ ac
 "}
 (35,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -5104,8 +5104,8 @@ ac
 "}
 (36,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -5246,8 +5246,8 @@ ac
 "}
 (37,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 Em
@@ -5388,8 +5388,8 @@ ac
 "}
 (38,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -5530,8 +5530,8 @@ ac
 "}
 (39,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -5672,8 +5672,8 @@ ac
 "}
 (40,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -5814,8 +5814,8 @@ ac
 "}
 (41,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -5956,8 +5956,8 @@ ac
 "}
 (42,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -6098,8 +6098,8 @@ ac
 "}
 (43,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -6240,8 +6240,8 @@ ac
 "}
 (44,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -6382,8 +6382,8 @@ ac
 "}
 (45,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -6524,8 +6524,8 @@ ac
 "}
 (46,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -6666,8 +6666,8 @@ ac
 "}
 (47,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -6808,8 +6808,8 @@ ac
 "}
 (48,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -6950,8 +6950,8 @@ ac
 "}
 (49,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -7092,8 +7092,8 @@ ac
 "}
 (50,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -7234,8 +7234,8 @@ ac
 "}
 (51,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -7376,8 +7376,8 @@ ac
 "}
 (52,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -7518,8 +7518,8 @@ ac
 "}
 (53,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -7660,8 +7660,8 @@ ac
 "}
 (54,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -7802,8 +7802,8 @@ ac
 "}
 (55,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -7944,8 +7944,8 @@ ac
 "}
 (56,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -8086,8 +8086,8 @@ ac
 "}
 (57,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -8228,8 +8228,8 @@ ac
 "}
 (58,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -8370,8 +8370,8 @@ ac
 "}
 (59,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -8512,8 +8512,8 @@ ac
 "}
 (60,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -8654,8 +8654,8 @@ ac
 "}
 (61,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -8796,8 +8796,8 @@ ac
 "}
 (62,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -8938,7 +8938,7 @@ ac
 "}
 (63,1,1) = {"
 as
-bF
+ab
 ad
 ad
 ab
@@ -9080,7 +9080,7 @@ ac
 "}
 (64,1,1) = {"
 at
-TI
+an
 an
 an
 an
@@ -10784,7 +10784,7 @@ ac
 "}
 (76,1,1) = {"
 at
-TI
+an
 an
 an
 an
@@ -10926,7 +10926,7 @@ ac
 "}
 (77,1,1) = {"
 as
-bF
+ad
 ad
 ad
 ab
@@ -11068,8 +11068,8 @@ ac
 "}
 (78,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -11210,8 +11210,8 @@ ac
 "}
 (79,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -11352,8 +11352,8 @@ ac
 "}
 (80,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -11494,8 +11494,8 @@ ac
 "}
 (81,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -11636,8 +11636,8 @@ ac
 "}
 (82,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -11778,8 +11778,8 @@ ac
 "}
 (83,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -11920,8 +11920,8 @@ ac
 "}
 (84,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -12062,8 +12062,8 @@ ac
 "}
 (85,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -12204,8 +12204,8 @@ ac
 "}
 (86,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -12346,8 +12346,8 @@ ac
 "}
 (87,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -12488,8 +12488,8 @@ ac
 "}
 (88,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -12630,8 +12630,8 @@ ac
 "}
 (89,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -12772,8 +12772,8 @@ ac
 "}
 (90,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -12914,8 +12914,8 @@ ac
 "}
 (91,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -13056,8 +13056,8 @@ ac
 "}
 (92,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -13198,8 +13198,8 @@ ac
 "}
 (93,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -13340,8 +13340,8 @@ ac
 "}
 (94,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -13482,8 +13482,8 @@ ac
 "}
 (95,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -13624,8 +13624,8 @@ ac
 "}
 (96,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -13766,8 +13766,8 @@ ac
 "}
 (97,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -13908,8 +13908,8 @@ ac
 "}
 (98,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -14050,8 +14050,8 @@ ac
 "}
 (99,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -14192,8 +14192,8 @@ ac
 "}
 (100,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -14334,8 +14334,8 @@ ac
 "}
 (101,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -14476,8 +14476,8 @@ ac
 "}
 (102,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -14618,8 +14618,8 @@ ac
 "}
 (103,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -14760,8 +14760,8 @@ ac
 "}
 (104,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -14902,8 +14902,8 @@ ac
 "}
 (105,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -15044,8 +15044,8 @@ ac
 "}
 (106,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -15186,8 +15186,8 @@ ac
 "}
 (107,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -15328,8 +15328,8 @@ ac
 "}
 (108,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -15470,8 +15470,8 @@ ac
 "}
 (109,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -15612,8 +15612,8 @@ ac
 "}
 (110,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -15754,8 +15754,8 @@ ac
 "}
 (111,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -15896,8 +15896,8 @@ ac
 "}
 (112,1,1) = {"
 as
-bF
-ad
+ab
+ab
 BE
 ab
 ab
@@ -16038,8 +16038,8 @@ ac
 "}
 (113,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -16180,8 +16180,8 @@ ac
 "}
 (114,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -16322,8 +16322,8 @@ ac
 "}
 (115,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -16464,8 +16464,8 @@ ac
 "}
 (116,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -16606,8 +16606,8 @@ ac
 "}
 (117,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -16748,8 +16748,8 @@ ac
 "}
 (118,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -16890,8 +16890,8 @@ ac
 "}
 (119,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -17032,8 +17032,8 @@ ac
 "}
 (120,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -17174,8 +17174,8 @@ ac
 "}
 (121,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -17316,8 +17316,8 @@ ac
 "}
 (122,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -17458,8 +17458,8 @@ ac
 "}
 (123,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -17600,8 +17600,8 @@ ac
 "}
 (124,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 Em
 ab
@@ -17742,8 +17742,8 @@ ac
 "}
 (125,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -17884,8 +17884,8 @@ ac
 "}
 (126,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -18026,8 +18026,8 @@ ac
 "}
 (127,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -18168,8 +18168,8 @@ ac
 "}
 (128,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -18310,8 +18310,8 @@ ac
 "}
 (129,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -18452,8 +18452,8 @@ ac
 "}
 (130,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -18594,8 +18594,8 @@ ac
 "}
 (131,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ab
 ab
@@ -18736,8 +18736,8 @@ ac
 "}
 (132,1,1) = {"
 as
-bF
-ad
+ab
+ab
 ab
 ad
 ab
@@ -18878,8 +18878,8 @@ ac
 "}
 (133,1,1) = {"
 as
-bF
 ad
+ab
 ad
 ad
 ad
@@ -19020,8 +19020,8 @@ ac
 "}
 (134,1,1) = {"
 as
-bF
-bF
+ad
+ad
 ad
 ad
 ad

From 880f014d7c2e277d1e05a559f83b8c73db61e326 Mon Sep 17 00:00:00 2001
From: KasparoVy <12377767+KasparoVy@users.noreply.github.com>
Date: Thu, 8 Oct 2020 18:15:17 -0400
Subject: [PATCH 09/11] Fixes Only One Accessory Equipped at Spawn & in
 Character Preview

Ported from Aurora PR#10205, credit to fernerr

Now you can see all the accessories (within standard equipping logic) you've selected in the character preview.

Addditionally, these accessories will now all be equipped when you spawn instead of filling your backpack unless it's actually necessary.
---
 code/game/jobs/job_controller.dm                 | 7 ++++---
 code/modules/mob/new_player/preferences_setup.dm | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 3aec6c8c376..4e53589c2ff 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -387,7 +387,7 @@ var/global/datum/controller/occupations/job_master
 		if(job)
 
 			//Equip custom gear loadout.
-			var/list/custom_equip_slots = list() //If more than one item takes the same slot, all after the first one spawn in storage.
+			var/list/custom_equip_slots = list()
 			var/list/custom_equip_leftovers = list()
 			if(H.client.prefs.gear && H.client.prefs.gear.len && !(job.mob_type & JOB_SILICON))
 				for(var/thing in H.client.prefs.gear)
@@ -420,14 +420,15 @@ var/global/datum/controller/occupations/job_master
 						I.implant_loadout(H)
 						continue
 
-					// Try desperately (and sorta poorly) to equip the item
+					// Try desperately (and sorta poorly) to equip the item. Now with increased desperation!
 					if(G.slot && !(G.slot in custom_equip_slots))
 						var/metadata = H.client.prefs.gear[G.display_name]
 						if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head)
 							custom_equip_leftovers += thing
 						else if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot))
 							to_chat(H, "<span class='notice'>Equipping you with \the [thing]!</span>")
-							custom_equip_slots.Add(G.slot)
+							if(G.slot != slot_tie)
+								custom_equip_slots.Add(G.slot)
 						else
 							custom_equip_leftovers.Add(thing)
 					else
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index ff68a02eacf..953f4d01acf 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -220,7 +220,7 @@
 				break
 
 	if((equip_preview_mob & EQUIP_PREVIEW_LOADOUT) && !(previewJob && (equip_preview_mob & EQUIP_PREVIEW_JOB) && (previewJob.type == /datum/job/ai || previewJob.type == /datum/job/cyborg)))
-		var/list/equipped_slots = list() //If more than one item takes the same slot only spawn the first
+		var/list/equipped_slots = list()
 		for(var/thing in gear)
 			var/datum/gear/G = gear_datums[thing]
 			if(G)
@@ -243,7 +243,8 @@
 				if(G.slot && !(G.slot in equipped_slots))
 					var/metadata = gear[G.display_name]
 					if(mannequin.equip_to_slot_or_del(G.spawn_item(mannequin, metadata), G.slot))
-						equipped_slots += G.slot
+						if(G.slot != slot_tie)
+							equipped_slots += G.slot
 
 	if((equip_preview_mob & EQUIP_PREVIEW_JOB) && previewJob)
 		mannequin.job = previewJob.title

From 845e14a0cb382bd387b4b051dfc3b07ff8bf8574 Mon Sep 17 00:00:00 2001
From: Cyantime <Cyantime@users.noreply.github.com>
Date: Mon, 12 Oct 2020 00:00:13 -0400
Subject: [PATCH 10/11] Fix lighting with view rotation (#7692)

---
 icons/effects/lighting_overlay.dmi | Bin 2789 -> 7224 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/effects/lighting_overlay.dmi b/icons/effects/lighting_overlay.dmi
index bc3d25204ce01ad8af9c3f6449dd527527ff28ca..80807db1e62723beacaba12c1e663556ceb182b5 100644
GIT binary patch
literal 7224
zcmX9@bzD>58{Wo%Au&QqU?5CTsnJpc1f)y4>kCLDB{5(ll@JAK7$_;-EsRh)6lsMa
z0xC6;82v+kf82Y{d++l+?>Xl=pZnhXxzF@<)u^xCxCQ_Ks5R789$vNRzXycu>fDF4
zAGvB?g&3Lnt2p^N`nvk~yLx*8071D)!*$ns5!Xp4rH|vaIufR7gv^UnMH{=hped3{
zI`G}s-Me^Nu+jiY>HEiW^Q?XU9rQ6jm+mQ8_Gk)uzy~Bd%`@p4kQihWfWydi3eyr|
z>?hruuD1urDw#%I*F=?mOZ~hU*8O~V&E;F?;Bn1Q?keezX`6DWQKnTnyUfaP;M)y#
z{gDsfuZG8FtD&M~6qLIi=IIM>srKN-m8WwrB_EkQPG4!r?kMeG3uSd-J{m}12}o63
z;^eBZtRKMYC5cb@;HFas$k?*L8UO(XS_~A5n@S1~0$^dbXJ^pv(8Fco;I7R=a7eTr
zloK6ST7kUin^^ueA%_Hl>7hh4xg5vI(^8l2P`Qiwfrz7^Kf4iIPbMP5dwH-borsGK
z1>#1;Z_D#6wMKFjngADAOO0+oYk@Mr!guynT+#B;FdW2=>aoAwJzAPrN`rhlvJwhc
zGfe|pAdprOz)2|JQ`b|x^U~$Eu;Lv$j(D0^GZT)0;?FFKP+SxNEeC+&Qfs3HfV?=-
zDyJ?oH1q|QOHS#Y;XR&!2j3$5W1dmoX9f#F{K;hQbC7V5<SCPoV4fH7;IG}Ie_q66
zugO9mtqz&27jn?0Nc;U(&i#h4lWD=Kejw?G6RoHL0G>)3R7~MA>_Y`8ir$<hpM#Z{
z6R1`M2m&kIgxp@~&0q=w{lS*<k3wwUdl8&S^bc|%3n_{YO-`_K_CB*Ux;_pbe=!~{
zbTBIR%7t54-|A_rA~{f|2{JhV!q%b%t_AV-M4OdtQWRWtu{_m~%>~LE1V#GOVxCbx
zWF`}WaDeeEVbp<Ctz;Y|B?UL_uF+H6-DrU5s{jg4PM{J8<A4d!IIS@Kcq+sNF05%q
z+xbHi{oLTo6kbtn&>V~adw}#xm<R`zyH-XhT|n-wbn|H!OvdMj``2B-cF@OEuUohk
z{U5ioSVNena0n5d>k=*sx6ub|om^-pqKhVJr~l2p`|o3hX;e$!Fccbk>K7`9>BIU_
z!=Sw)0SK?t8zzeQD6q;;762BIcT>(_q<vi5`nFYOJHlV7+>aiu9Hqmd9A&LEfGS5n
zxkasU*Hs3`cMWylV!wmlE;#Jwi%!MP+rb94{2v(wKvXmmfz(t1WVy<DuelY6&EZ_P
zI#K}mc#s%C2SlJCCl)gh|D*vrweg`(!=8Rkb$r_A#DJn<=<6@Y6aalcp&GksBo0z3
zgD9?ae$iXY8Xg(*OW~4{keU9Kg}lva#L1g*;$aXX5o$cDSR{eIrlA)-9!&#6K;N<7
zFpQJQi3ek&s_m_#N|a0|OCBEc#qge2du4+0iSG<knb&@IrWD|INs($YaZE(#LJ02m
z<Ymz(aoIKqW}A-lMOm$FX9sJnwGqyiy9(=&+(`Eg@;I^4p7gA?(F|PMm`lg?vbn3S
zAZG#rx!TuaM)sT|=c>^OYiWRVa*9|E{OQ;RES*aC!W@Pl@eOksj0barD<B1OoHP7~
zxp(pe{azMWeoqAalB}Pa{`t!U4r%WVA$!Zk_+j-=Zq(FC8dwy_3B&ja?NV-Z>h@`s
zaDWGERU=>aT?^V!S3s%-Qog(?ni>em?+mfd%y(zm2I{F>abfH3nd0*e1BbplAwx?J
zUL2?&-rU5pV<ojE<yf7W(n*o7J>Tm{R=I&y===*kxfMEQI1?cwWPM&#xTF)Y>X4Ne
z@5TD{dY<$NXvq!I(}-|H2nw=3SQpO)^HRVI?eve|NMZ)H1d;qZWtF8uqjHu%dPft|
z;$(R`#vpdsKJBRVzR}20#E7`)kal5;;tk(V$$m7~>GhyZUy-xb72m4+{V=wW+m$Z$
zE@t_1n>QqV>2NHrOwLSB(~;y90>Ha`gje=5pcfoq_1s%F@nFd|mkn(j(W=rddRO_q
zpyw~QQUUg^jKCn$h@HU{1TbBb;n9n-Xbx}?&S|@YpRoSED8UIUxY|4Fl?pCtodYlX
z`U^F<_9fa6iNo-5Kv#;ao75@AcCW6TS<wN4-)@%(iS6WizRxc!jcFI8Ph?-8m-fwM
z1dfU(vQC9uC#pw%0<gX)dG)NI$ajbuxHlIvJF2I%8+V|c1Ft=4!_}0U5B|y;IVBB8
zr}v6FY0|xNjf8%OD*}@j8To>TGL<!K3y#z`d8$G!l4~tMpW;6DJ~CK$XF=ckM8AK%
z%2`3@jgq)JInay_@BDs@vf;C+kPW=`<3~Xc?ImM?<^yWSm-rCS!K*|qh6g=nsUSU-
z@$K~_XROOs8&N58EABbFv&g7#D+i95nvY^Qq@*ygFOJuqTc8Po^FuEB{z);X^v3MS
zPlbF)qG2<@C1?M(S!z)QY2idg#)eedZj($Yvc8&u{RU#H`&A!ztkq^8ucU$lhcZ<l
z!uYXR)%SKK)F0SEo#XbkU^yVecaY~!ymbIF5RSwvalEDccAP#UdOCgnxbA5JGqKMx
zTd!imwJ&mo6m`!F7x&)_D^vQ<yCCEd;Bimg^eAPMgN_X<1;^c?=AW>Ie3RoO)o_)~
zSvr^QL09c_@tfA47-JTm1$~AU#QA8f&`&gfkyz#71KDRlc3CAI=G6b#JM)Y}>HFb5
zNgE8e{o3j6vdG_XE9MCamqmR5=bvjvigN6H?F-2~Qs3qAU<pIWvoJ+NePJI~B%(#r
zM74&}e4d#+qbDW;IG#}!KE>UBBG$D2<-KUTnt$>~!Kx0`BNkPFs2uA9DqDDF^%Hg8
zVl7t_xDPy0I`vi)xKcp*u<h$s6Rm2@d42eAf)`JFPCzpIK~`T@A4?jL$M0e7Q~epI
zdjGdLz4XvG>1bFP)d;sz(ZQ%Cy;(A0XGK0XKx~&4=`dFi3>S<<qBQ^~A_s82p{f6-
zI-?SDTEMu20y_7_x@Pw9Ap&egezYU&fDW0sL>`7fvE$=}2_(0t9%6*sQ-pe&Ahbcf
zJRxffGa8o6OJs{bLymsHOyCGMuPqq6E)CQs^(E<92orG_l>c@({VOe=#JRd|oF!nU
zEM`461gT*+<2mP(u#-E(y3+51K+!3sMrL2v9#Rc{2%F5O;Hp$UlyRSKmaUl*euHaS
z;Te_v8MRNh4>aKxzjrxRej7o-Rcs0#%&O8M?@a)t*(ladBt9_RmJ*iY*VVHG-{zQ-
zoA>Iev8r4U4a?MPPodVZbv0B`MQhgJ?>!PR66-cu^rHLP>$Z~>(DHaS{P}}u;h5gn
z9!~z_9n!SCHyFmF{Zs+tV6i$;>VTP`=FO*%9ly3iJL<+koRnuy)<54$N4`pM(;$B0
z2L}DPS1)*o+GxVH1inC%gJ3ENWv<LpSUsl>kzG3>Pg76<zfY<|?aLmJeC5XX9BNry
zet|H7e6kuJO4*~F0G<~e6Ki0km~8Z2$MDHLa-QWQ^2DhIK4%5W#X>h>GoIQ<!Y!P7
zDmk|xvu7w0<q_=`{gL5xiOSsLFC?Q71le>*p0Hbs0bK!3ip`O(;N^tc<LfHdsbMtz
z_SRY0bis!(qa45Qnt(K#I^POu=;CIlL=WfePpN7Mk*oB`0DE+whZ%H7Z={5Zx$x%)
zjjQrgUWThSdA99OL%sP^($_3`Ve0_FDak~v0?{rgW(m`m#UL;(=?_Q5O)<7N{5>8)
z#KB1XYd6-)(U4Mi#NGD~8x-Qq133+LIN6i7ww(`!k6L~n#%7;a;W8}CoytU}@47sX
z#Yi3j3K>YlU*bB9+g(#|?JiW%O|R9N5byp+_<H0GarsIQSJlWyk1V$yk0Di1qd^W%
z1dYUfygMLcwN+TpABJrRDS}e&7UFi@PcVY5oymJhBfMqvE30&!EFCK52F%)RJ0tMD
zyIMc^yW#o&nUN>i^Zb+#VhEa)`A9ZN_8C-O`uYCM!<qZ@qVx4=Z}W!kJCl=>>+}eO
zIR4io^R={>QP@0KU+fqOb4RlK+!Kd(&cd$b2dNHjk|U4O=LJU26FsOTJnkMgv4IpF
z6&**xez&sys4O><g1Ua(n=f7KZWbE3&(&~iI>pWJu*LJu^j(mVfmYd`g>UOs0im&r
z4p<7wuW}6TMsr#$nQ9p(^r0k0EN8a7dnJz-Ea>o=C<YYU&jAX*qGL#?bNfD`n*)CP
zkEMKrlf_756;=&ACqDOi5<!SoOEO<(;qU9BF)0>tt2y@=<CNOrT=Y8{C`l}--1W}N
zQI({WNcZw^%LNnl8^Wo|2Q-B;Y@pfW8}8vG-j$B8TrvVwwN!(beYHlI(p3R&l;sk?
zGy%rOPU)XxOO2lgxO%pc=j(N2EUj&9vlqn`B(hm@SgIN&3Ov=oKiGZ9PDTZCsIye7
z4SD5LkPcOHW+EQ^7aZ#?FD#tBvX(^s49zgG8S&QFa^0`r5H9hT_BfGy<&#b}#f*OM
zwHv4$W5uwZZC+m@0z$7Qw{Fs4n<F@>oP<dtkwE7_^bb^swdS_sRqRjJSmmYVShl4}
z9W4u6No_|?Z6<0#@34=e<}6gvm&e^=pnaKsc6eF&uu^1ZR{CbPt!xeJNq(rU%qV}u
z5HEp=jfI-s(%joJv_H=6RvC9oq5;^hXdYovG!L=x$rJy5wRBS+@_q@Uf(zLP&BcBr
z_!7HRKSR4ITx=}$b7)Ye=k>6esdh5K!un0B1{o(d1D6ZOvDvy`UgeP5J6ai=^1dVK
zIXa-Z$qyw-By8-9a7E~-FTIno8Paz#k!LL0vBTWGi)Qm<QJqGeQ+m6q)`+0CrK6Yo
zA=J%%QW8Dp4yEOQ)Iew@-7Clm`yn&-vNl_-u|BI|X-8s~+1`vO2d!p_Q>n)u_jAMs
z_(7v4k-zv>^jq!<PI619CKBpsSaVOuK$pB*8<He?)O~&<wSqa@zWns}q^P}ogg|mD
zuW4dh@Hyt0PDTy^*!p0<VVepeY}~m{7O7H#pjgZP7lFo{jX+A|JAW9-CgsfGXkWc8
zzh#<JrUoo}p#C{?!Z<ZCtFB4Fv~>+uGA2lga%1aX?_X~MkM5K9nVPDa*vCnyZW<Uu
z_Z78wS7VMS&-za1hk@%k0>6gpo_UfCkeyHiY3qxvNZ;QToEzQ^eW6xk43VlB6C)g%
zu|#i6WArw7H-rWx17^*@W^uir%FA3PpZDtCGJ_I~<Eoh5!^4&n!;W!sltCj&)k)QP
z%4}9_R;Lo6L6YouD$_c&qfYZB2bw`J@-b%j3sCrkM9Sb-L8+E6iEYwNvQ5;F{2o2|
zp$WLTrC$w%=bM_@I9p(=j-~J}>sSMP>2Z3a^}f!&4oe3<hmZ?EJP3H91Il!&?xm5#
zWi3sMoH9(zo|&!l9QrKxI!@FIem(T}65UY+c_Ch1QtJg(GCnf7RvvFdI&D7pw#`K?
zcA}7C9$Rx<*VK1V*D=6^4aMYl%)`;{rS^rZT)4P-c^0d8DiyEo4Qg)OsL_C_jn1V?
zxnFQA?a<Y=4eY$kF{kT^2Xq+b&~>azf{e(Emm8;yh#Pk+-VehnL<ObA1l`AyM^z)`
zxto2K#ZX!e@0>4{A~_nV2^@rTO+Znif%SisXLs-VrZJhs?hZ;cHCCRN9H-C61J*57
zwthC3KGti|G09*1Vm}w4g(mO!$P=JPG~AEiP0n5zwYuM?J0H+#EbcVpn^711oe7pR
zd$za=P<SG?ExzTyO-|wt#ka{&xbP1(<=`#MTi2PH>9prfwnUNzEysXIb3DFMBVV&}
zvI1MaBrQ;)whwawu6OD6wS@?N#s|E_+E-`U-|Lv#BvH+({CwAm2KcF?y{_Fio(0>H
zyJ$w>)obB6SlSX&ldWd`lco2igMPD-jb3(hb7xoSG1fUWc3T9aw;HYjSfyFL`sRs+
z1}O$ij#=2d@?vV410)oD-P3g>lS9IDTU%<s$ooP^z6u03eAxy>+zGs)E579pebL`Q
zR&Q6|ZsA=uK_@pN`k(Wk;JHx&cd<iu9v>k>#<&0ay_zVr$!%#0a0;Cfs`fhX8kt<z
z&iAWm7Tby!({1n>M|>2IO5;Jzj&~}#6$2`Y65Hu<4;!*O%R|y;-m&&R9<KC!FwQvO
zp`}Zoxh*Q|N{5zv%Z<}eMf1sxenS-J?6kQR+byO0LqV1MJ762j(dlOM85a{UV#=#z
ziW;a}6qp&0X(G>*@2_`f$a2;Ttxnl_In|xQRfF?pS{U`q>3E(;PO<l2AUZ<SjnBV6
z9;63tu(6VNXn|*PY@6TunzlHRb63lxL^aD(sJYlVRK~m07RLz(Jn7MG0R!&PQlf5U
zqKEKV6-6E8A#PcW825Zu9S=*3t@g<7w^%;bqoTY|LG*PaL7+Nr90TkH;^}nrtN(`4
z@YfbBkI~)?k?Fj8)#3>jh!({5_`;J8S21VI#243K(O)W4G=0z90Zrh!CQN5Kz?hBs
zdqc%W*{`>t0!wGd@_OpmNrF!(JsX=2KI;k-hUBu=o_+S39D2%t;Rlx6OW*l^qjxJ?
zds19E0%lz0Kla(8L?Xs>-fUt~b=G_(U#{3(M`7-*vqBBn&YF$(&I|K*g(a1ij1C76
zi>yl(Z5l=dJ@XJ@Fi9E$bcvB@NX<tl`;_4+pB%S+Hpib~xBSt0mG^GzXhFi7t2qNk
zY|*@}Nl>7rK(bV_A*Y}NCk)C}&r{q&<gW7)S|zyR)yQ81U3078B?6l%oI`6y4TGK~
zS(1N(mk`_Q!Tq@u7ta`hy3v84QdRWyEtw3=FYKt>D!oohvByl~)NG|`y;JdgcBEzd
zv{Hw9?TFcwH%1SuB1<8s1Ik_CL4Mxa&{_V`6eZ=oVCJl3c~!Ne9bnJiKdP^L)|Ii4
zw1n2f`rL*oqHrYD)_*Eo4!M9@hQ=CtzW@r-4O=CWW$UCD7Y{QwwH{YM{h+uUHWI1x
zKB=Vtrgii!oQloO?aDaXK8Q@PhIg#CHeGmtp_TIJ82}Rl6rMs~k?Ig&^t4*tbkYx0
zQ|rk)mjF<W^c3pk{Eg%UU>8WRXy4N`a0O-%w}>pUYJxMnA5x~-f6x{&!VV=@eF&JY
zbGlIK*ZBXQF3aApds;v$S8eTYwxyh-Quc{wI&y9y5k!&zZmn)Ns}R;Lf~n^L7_S~3
zXt&HNS><W5_wx#<DV23?W2v4>{%`7{j;q>Y_Uv(Epk=oK0~H(zKPVR<U(1bazvZhO
zS?KpLt~bpeZe3S?_t7;;a1NQ2gx8Hsm#Vf+(Qyt_pzxj&UIQlvLI>zMh$@w>+uxxk
z?V5gH<3AcN+A48V^09aUjy#OPgCvaEgM1?}suE{7K~BqOM`!nyq2mT$d`xA!LzQKC
zL(+Xg$Z~B;#UpC5ZZc0@4^o-KV>vp%9UVNy7uo_;@@5m=Bgy9#*#k3T<;CEN3Oi+E
z7BWe83TIF8txPx|;LS?3^r@1(PxyHhAi!3KwpPen`_JG4372cY=8J~ZNF6q-p4gr$
zP4_R~=j^_GzfDgF(goR#hvx#2>|k7bQ&3V=MR2C**W9ReYFzWRc!xz3=Qgx$skZD&
z`?t@{j^p6~=mZ5qIKf^gritzj$ZF#C>}I~PepU7Y6K>{dmC`97kUWr2mn^T+WHF2m
zeQ)l`Eu4Q(r&!~SftcU~#fq4Zd~_zV%8rIkO#_<3u5q(8QLzjjJNKM_ko%*~EkW9Z
zjhL9dE<_>jqteezv52gE)v;I%HIhPq-Q_yYb*K66Mfy)^FtSliZtOHNZplB1#C6){
z=;1)6vtU*KH@~Ly2YLWbEI$k=xAHsdH^rIE$uCI?jJr_Cfr1tPo1Epcv>mAshqf~l
z&J7se8T_aBQ+u=i*vN0bs=$;@TVsomYKEA$uZ<dQ705S2V+wyR4t5qgXDnOfOKsv1
z__&`6Im@=0H8<H+?#*4QYs?NEkwga=AF2&sUcUSgb9tc<aduI|`7L_+;+%6n8G*{E
zIQxCtO<e50{PQc7&=PT}b_Eb#q9BlcZ_=p6k)vgSOHVtQD7<>ecfdi0d+#&|^eDV8
zT8eKu0USY!^x?zhyz<tGOvXUJP!OEgEMMYxaetvxdrfd69|3d4??m09K$8AtJ-L~$
z6{$zc*~)<bI#`;5_xlGm-P3~;t^PstP>En$&|lS#R~c~PLjv&g!CXhDLffsL*;lE%
zba>{BE5WywwU<ppZ?1Z;JFWh7$AX`LI>nCXVt2JPu9&hZ5ewT96cks3;M;qv_HN=<
zPaa@b5qXq*DGk5MoHUZb8;nf*OR_)Crs5>H{<}In8`=FmU;Rpe?Ugs_MM^i%70p|_
zOM<9{d=Pn+>jg@fka5QNSC?n+U61Wv%3ld!uplAhOA0<*{*1XBrn}N@n-(Ta4nSEe
z_jR<?T%ORCK<hZe6wXasE*Ap5*OC=3%8p3R22X!JIaPRYL0nDV*d-?#98K*W+S)P^
zaS4XF<ktM~mdkcuN+f}K05{w9HwxLiT6Laa^lazfNM_FzPZE&|390%kvuukbLlU4_
zxY>Wiu(c}#kT)66-tCqyZ$~H`Uzwm+Ns5~IhgJJ)gjl@N@@DwS*Nc{nD>I0rZup~r
zRL`|5L%Iss&#L}WWsk2+5#AyvrvDvY_s7gG01ANL?Y_Kt|6o}~`XF!da=T@@OJ<f(
zj3+sIUhqWNmIO&)1PAdS?AuNw2?ux*TXl4ciQeV(7RfRh3Qq|km~8&+jt|2xVxTBq
z;8KYExl0QaWl6wHaN$DVmR?pKV!WY9!ZUD?_rZSt7?KcnH5UwEw+VaEFh}0SNyI78
z;@{0qEq8?BPa~mc)WGockdx3RC@O-0Nv6fSRFrm0o#Hmp&@)nC_{`O<I%p@1h@%9Z
zZ5`~lcyR_<6EJL`v%6P;8)r}$0i%Jot-@Z+Y>_CCp#ZJ6(94g92et}SC_Hs17l`<H
z>+<8?qIdT*1tK-;Aye+9V7tRoPG{P#)h>B!D&BZaFl=`76u1KqVhna){(bznORU~w
z>R!xWhWhaJJbBr2l6P@(4tPS3G7KJBUR(Xg%Nex1q=~o;N6S)lX)g86T^|2KyzI;n
ziCFljArP$Rc)ou`@<oH7u?PDQ#Gilk7ky!}v^R(3&HqQec)0W}6RFy@^_MJ{+9IAl
zktW>5f#T~~WbK<BG=0a3H|6UICFdlP2|pzoYY@cHP*kB*^qCu+Xntk%3co`*BmJ2+
zo@ANGp`;*75iUu<>=IJS^3%WyJVe}+5Ush12a)-VD7<VJ?~cpOo(U=>A#a(1xTHa7
zh=O+ZCU7tFQ-qTeFs31fKSFtWYCuRrd`*0qFr1i%BeyxW?(xn8ci$l5ph4#QmbZFp
zAV@;g64S+uI-w#GidwrA#=EbX2A-vGhRL5r00j-eQ>Pq>)>r@902->gD%JPxBL4?~
C9i%n@

literal 2789
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
a^$H}mkGjOy+%+!RTY;m!i(QQkf$~4Eb5#QX