Merge remote-tracking branch 'origin/master' into TGUI-3.0

2020-06-26 14:03:27 +03:00
parent 940ddaeeb6 a83a543bdf
commit 765ffdb1a1
56 changed files with 1695 additions and 69362 deletions
@@ -12,7 +12,6 @@
 /turf/open/lava/smooth{
 	desc = "Looks hot.";
 	luminosity = 5;
-	name = "lava";
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/caves/BMP_asteroid/level_four)
@@ -37,7 +36,6 @@
 /turf/open/lava/smooth{
 	desc = "Looks hot.";
 	luminosity = 5;
-	name = "lava";
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/caves/BMP_asteroid/level_three)
@@ -116,7 +114,7 @@
 	},
 /obj/item/veilrender/honkrender,
 /obj/item/clothing/mask/gas/clown_hat,
-/obj/item/organ/heart/demon,
+/obj/item/organ/heart/cursed,
 /turf/open/floor/engine/cult{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -188,9 +186,7 @@
 	amount = 25
 	},
 /obj/item/coin/antagtoken,
-/obj/item/book/granter/spell/summonitem{
-	name = "an extremely flamboyant book"
-	},
+/obj/item/book/granter/spell/smoke,
 /turf/open/floor/engine/cult{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -239,7 +235,6 @@
 /area/awaymission/caves/BMP_asteroid/level_three)
 "aM" = (
 /obj/structure/ladder/unbreakable{
-	anchored = 1;
 	height = 1;
 	id = "minedeep"
 	},
@@ -266,7 +261,6 @@
 /area/awaymission/caves/BMP_asteroid/level_three)
 "aP" = (
 /obj/structure/ladder/unbreakable{
-	anchored = 1;
 	height = 1;
 	id = "dungeon";
 	name = "rusty ladder"
@@ -317,7 +311,6 @@
 /turf/open/lava/smooth{
 	desc = "Looks hot.";
 	luminosity = 5;
-	name = "lava";
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/caves/BMP_asteroid/level_four)
@@ -356,7 +349,11 @@
 /area/awaymission/caves/BMP_asteroid/level_four)
 "ba" = (
 /obj/structure/destructible/cult/talisman,
-/obj/item/book/granter/martial/plasma_fist,
+/obj/item/storage/belt/champion,
+/obj/item/melee/sabre{
+	icon_state = "cultblade";
+	name = "blood-red sabre"
+	},
 /turf/open/floor/engine/cult{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -404,12 +401,26 @@
 	},
 /area/awaymission/caves/BMP_asteroid/level_four)
 "bo" = (
-/obj/structure/flora/rock,
-/obj/item/soulstone/anybody,
-/turf/open/floor/plating/asteroid/basalt{
+/obj/structure/trap/chill,
+/turf/open/floor/plating/asteroid/basalt/lava{
 	initial_gas_mix = "n2=23;o2=14"
 	},
-/area/awaymission/caves/BMP_asteroid/level_three)
+/area/awaymission/caves/BMP_asteroid/level_four)
+"bp" = (
+/turf/open/floor/engine/cult{
+	initial_gas_mix = "n2=23;o2=14"
+	},
+/area/awaymission/caves/BMP_asteroid/level_four)
+"bq" = (
+/turf/open/floor/engine/cult{
+	initial_gas_mix = "n2=23;o2=14"
+	},
+/area/awaymission/caves/BMP_asteroid/level_four)
+"br" = (
+/turf/open/floor/engine/cult{
+	initial_gas_mix = "n2=23;o2=14"
+	},
+/area/awaymission/caves/BMP_asteroid/level_four)
 "bs" = (
 /obj/structure/trap/stun{
 	desc = "A rune inscribed in the floor, the air feeling electrified around it.";
@@ -452,8 +463,8 @@
 	},
 /area/awaymission/caves/BMP_asteroid/level_three)
 "by" = (
-/obj/item/twohanded/mjollnir,
 /mob/living/simple_animal/hostile/poison/giant_spider/nurse,
+/obj/item/nullrod/hammmer,
 /turf/open/floor/plating/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -467,8 +478,8 @@
 /area/awaymission/caves/BMP_asteroid/level_four)
 "bA" = (
 /obj/structure/destructible/cult/tome,
-/obj/item/necromantic_stone,
 /obj/effect/decal/cleanable/blood,
+/obj/item/immortality_talisman,
 /turf/open/floor/engine/cult{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -499,7 +510,6 @@
 /area/awaymission/caves/BMP_asteroid/level_four)
 "bF" = (
 /obj/structure/ladder/unbreakable{
-	anchored = 1;
 	height = 2;
 	id = "dungeon";
 	name = "rusty ladder"
@@ -509,7 +519,9 @@
 	},
 /area/awaymission/caves/BMP_asteroid/level_three)
 "bG" = (
-/obj/item/gun/ballistic/automatic/pistol/deagle/gold,
+/obj/item/gun/ballistic/revolver/reverse{
+	name = "suspicious .357 revovler"
+	},
 /turf/open/floor/plating/asteroid/basalt/lava{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -517,12 +529,14 @@
 "bH" = (
 /obj/effect/decal/remains/human,
 /obj/item/clothing/under/misc/patriotsuit,
+/obj/structure/trap/chill,
 /turf/open/floor/plating/asteroid/basalt/lava{
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/caves/BMP_asteroid/level_four)
 "bI" = (
 /obj/item/bedsheet/patriot,
+/obj/structure/trap/chill,
 /turf/open/floor/plating/asteroid/basalt/lava{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -542,7 +556,6 @@
 /turf/open/lava/smooth{
 	desc = "Looks hot.";
 	luminosity = 5;
-	name = "lava";
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/caves/BMP_asteroid)
@@ -553,7 +566,6 @@
 /turf/open/lava/smooth{
 	desc = "Looks hot.";
 	luminosity = 5;
-	name = "lava";
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/caves/BMP_asteroid/level_two)
@@ -670,7 +682,6 @@
 /area/awaymission/caves/BMP_asteroid/level_two)
 "ce" = (
 /obj/structure/ladder/unbreakable{
-	anchored = 1;
 	height = 1;
 	id = "mineintro"
 	},
@@ -966,7 +977,7 @@
 /area/awaymission/caves/research)
 "cX" = (
 /obj/structure/table,
-/obj/item/melee/baton,
+/obj/item/gun/energy/temperature,
 /turf/open/floor/plasteel{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -1029,9 +1040,6 @@
 /obj/structure/closet/secure_closet/miner{
 	name = "weapon equipment"
 	},
-/obj/item/grenade/syndieminibomb/concussion,
-/obj/item/grenade/syndieminibomb/concussion,
-/obj/item/grenade/syndieminibomb/concussion,
 /turf/open/floor/plasteel{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -1058,7 +1066,6 @@
 /area/awaymission/caves/BMP_asteroid/level_two)
 "dj" = (
 /obj/structure/ladder/unbreakable{
-	anchored = 1;
 	height = 2;
 	id = "minedeep"
 	},
@@ -1131,7 +1138,6 @@
 "dw" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
-/obj/effect/landmark/awaystart,
 /turf/open/floor/plasteel,
 /area/awaymission/caves/BMP_asteroid/level_two)
 "dx" = (
@@ -1312,35 +1318,35 @@
 "eg" = (
 /obj/effect/decal/cleanable/robot_debris/old,
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eh" = (
 /obj/structure/table,
 /obj/item/radio,
 /obj/item/radio,
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "ei" = (
 /obj/structure/table,
 /obj/item/paper_bin,
 /obj/item/pen,
 /turf/open/floor/plating,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "ej" = (
 /turf/open/floor/plating,
 /area/awaymission/caves/BMP_asteroid)
 "ek" = (
 /obj/structure/window{
-	icon_state = "window";
 	dir = 8
 	},
 /mob/living/simple_animal/hostile/mining_drone,
 /turf/open/floor/plating,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "el" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/gun/energy/laser/captain/scattershot,
-/turf/open/floor/wood,
-/area/awaymission/caves/northblock)
+/obj/machinery/gateway{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
 "em" = (
 /obj/structure/closet/secure_closet/personal,
 /turf/open/floor/wood{
@@ -1369,20 +1375,19 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "er" = (
 /obj/structure/chair/stool,
 /turf/open/floor/plating,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "es" = (
 /obj/structure/window{
-	icon_state = "window";
 	dir = 8
 	},
 /obj/structure/window,
 /mob/living/simple_animal/hostile/mining_drone,
 /turf/open/floor/plating,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "et" = (
 /obj/effect/decal/cleanable/shreds,
 /turf/open/floor/plating{
@@ -1403,37 +1408,47 @@
 /obj/item/mining_scanner,
 /obj/item/mining_scanner,
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "ex" = (
-/obj/structure/closet/secure_closet/miner,
 /obj/effect/decal/cleanable/cobweb,
-/obj/item/survivalcapsule,
-/obj/item/extinguisher/mini,
-/turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
-"ey" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
-"ez" = (
-/obj/machinery/light/small/built{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
+/obj/machinery/power/port_gen/pacman,
+/obj/item/wrench,
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
+"ey" = (
 /obj/machinery/suit_storage_unit/mining{
 	desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
 	name = "rusted suit storage unit"
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
+"ez" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
 "eA" = (
 /obj/structure/table,
 /obj/item/paper/fluff/awaymissions/caves/work_notice,
+/obj/machinery/light/small/built{
+	dir = 1
+	},
+/obj/item/stack/sheet/mineral/plasma,
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eB" = (
-/obj/structure/barricade/wooden,
+/obj/machinery/gateway{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eC" = (
 /obj/structure/table,
 /obj/item/gps/mining,
@@ -1442,17 +1457,19 @@
 /obj/item/clothing/glasses/meson,
 /obj/item/clothing/glasses/meson,
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eD" = (
 /obj/structure/closet/secure_closet/miner,
 /obj/item/survivalcapsule,
 /obj/item/extinguisher/mini,
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eE" = (
-/obj/effect/landmark/awaystart,
+/obj/machinery/gateway{
+	dir = 5
+	},
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eF" = (
 /turf/closed/wall,
 /area/awaymission/caves/listeningpost)
@@ -1462,7 +1479,7 @@
 "eH" = (
 /obj/machinery/vending/sustenance,
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eI" = (
 /obj/structure/closet/crate/trashcart,
 /obj/item/switchblade,
@@ -1482,7 +1499,7 @@
 "eL" = (
 /obj/machinery/vending/sovietsoda,
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eM" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -1529,7 +1546,7 @@
 "eR" = (
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eS" = (
 /obj/machinery/light/small/built,
 /obj/machinery/suit_storage_unit/mining{
@@ -1537,11 +1554,11 @@
 	name = "rusted suit storage unit"
 	},
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eT" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/plasteel,
-/area/awaymission/caves/BMP_asteroid)
+/area/awaymission/caves/listeningpost)
 "eU" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/mechanical,
@@ -1587,16 +1604,11 @@
 /area/awaymission/caves/BMP_asteroid/level_two)
 "fc" = (
 /obj/structure/closet/crate,
-/obj/item/paper/fluff/awaymissions/caves/shipment_receipt,
-/obj/item/gun/energy/laser/captain/scattershot,
-/obj/item/gun/energy/laser/captain/scattershot,
 /obj/item/gun/energy/laser,
-/obj/item/grenade/syndieminibomb/concussion,
-/obj/item/grenade/syndieminibomb/concussion,
-/obj/item/grenade/syndieminibomb/concussion,
-/obj/item/slimepotion/fireproof,
-/obj/item/slimepotion/fireproof,
-/obj/item/clothing/glasses/thermal,
+/obj/item/gun/energy/laser,
+/obj/item/survivalcapsule,
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/kitchen/knife/combat/survival,
 /turf/open/floor/plating/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -1644,11 +1656,14 @@
 	},
 /area/awaymission/caves/BMP_asteroid/level_two)
 "fk" = (
-/obj/item/grenade/syndieminibomb/concussion,
-/turf/open/floor/plating/asteroid/basalt{
-	initial_gas_mix = "n2=23;o2=14"
+/obj/machinery/gateway{
+	dir = 8
 	},
-/area/awaymission/caves/BMP_asteroid/level_two)
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
 "fl" = (
 /obj/effect/decal/remains/human,
 /turf/open/floor/plating/asteroid/basalt{
@@ -1662,10 +1677,11 @@
 /obj/structure/closet/crate{
 	icon_state = "crateopen"
 	},
-/obj/item/paper/fluff/awaymissions/caves/shipment_receipt,
-/obj/item/organ/eyes/robotic/thermals,
-/obj/item/gun/energy/laser/captain/scattershot,
-/obj/item/slimepotion/fireproof,
+/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser,
+/obj/item/survivalcapsule,
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/kitchen/knife/combat/survival,
 /turf/open/floor/plating/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14"
 	},
@@ -1727,11 +1743,14 @@
 	},
 /area/awaymission/caves/BMP_asteroid/level_two)
 "fw" = (
-/obj/item/gun/energy/laser/captain/scattershot,
-/turf/open/floor/plating/asteroid/basalt{
-	initial_gas_mix = "n2=23;o2=14"
+/obj/machinery/gateway/centeraway{
+	calibrated = 0
 	},
-/area/awaymission/caves/BMP_asteroid/level_two)
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
 "fx" = (
 /obj/effect/bump_teleporter{
 	id = "mineintroup";
@@ -1904,7 +1923,6 @@
 /area/awaymission/caves/BMP_asteroid)
 "ga" = (
 /obj/structure/ladder/unbreakable{
-	anchored = 1;
 	height = 2;
 	id = "mineintro"
 	},
@@ -1971,11 +1989,14 @@
 /turf/open/floor/plasteel,
 /area/awaymission/caves/BMP_asteroid)
 "gk" = (
-/obj/effect/landmark/awaystart,
-/turf/open/floor/plating/asteroid/basalt{
-	initial_gas_mix = "n2=23;o2=14"
+/obj/machinery/gateway{
+	dir = 4
 	},
-/area/awaymission/caves/BMP_asteroid/level_two)
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
 "gl" = (
 /obj/item/trash/plate,
 /turf/open/floor/plasteel,
@@ -2196,7 +2217,6 @@
 /turf/open/lava/smooth{
 	desc = "Looks hot.";
 	luminosity = 5;
-	name = "lava";
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/caves/BMP_asteroid/level_four)
@@ -2212,6 +2232,41 @@
 /obj/effect/baseturf_helper/asteroid/basalt,
 /turf/closed/wall,
 /area/awaymission/caves/northblock)
+"tk" = (
+/obj/machinery/gateway{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
+"CY" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
+"GV" = (
+/obj/structure/barricade/wooden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
+"Hp" = (
+/obj/machinery/gateway,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
+"If" = (
+/obj/machinery/gateway{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)

 (1,1,1) = {"
 aa
@@ -6517,7 +6572,7 @@ dO
 dP
 dI
 dZ
-el
+dA
 dt
 bL
 bL
@@ -10116,13 +10171,13 @@ bL
 bL
 bL
 bL
-dX
-dX
-dW
-dW
-dW
-dW
-dW
+eG
+eG
+eF
+eF
+eF
+eF
+eF
 bL
 bL
 bL
@@ -10368,18 +10423,18 @@ bL
 bL
 bM
 bL
-bL
-bL
-bL
-bL
-bL
-dX
+eG
+eG
+eF
+eF
+eG
+eG
 ex
 eD
 eD
 eD
 eD
-dX
+eG
 bL
 bL
 bL
@@ -10625,18 +10680,18 @@ bL
 bL
 bM
 bM
-bL
-bL
-bL
-bL
-bL
-dW
+eF
+el
+fk
+If
+eJ
+eF
 ey
-ev
-ev
-ev
+eJ
+eJ
+eJ
 eR
-dX
+eG
 bL
 bL
 bL
@@ -10882,18 +10937,18 @@ bL
 bL
 bL
 bM
-bL
-bL
-bL
-bL
-bL
-dX
+eG
+eB
+fw
+Hp
+CY
+GV
 ez
-eE
-ev
-ev
+eO
+eJ
+eJ
 eS
-dX
+eG
 bL
 bL
 bL
@@ -11139,18 +11194,18 @@ bL
 bL
 bL
 bM
-bL
-bL
-bL
-bL
-bL
-dX
+eG
+eE
+gk
+tk
+eJ
+eG
 eA
-ev
-ev
-ev
+eJ
+eJ
+eJ
 eT
-dW
+eF
 bL
 bV
 bV
@@ -11396,17 +11451,17 @@ bL
 bL
 bL
 bM
-bL
-bL
-bL
-bL
-bL
-dX
-ev
-ev
-ev
-ev
-ev
+eF
+eF
+eG
+eG
+eG
+eG
+eJ
+eJ
+eJ
+eJ
+eJ
 eF
 eG
 eG
@@ -11655,15 +11710,15 @@ bL
 bV
 bV
 bL
-dW
-dX
-dX
-dX
-eB
-dW
+eF
+eG
+eG
+eG
+eW
+eF
 eH
 eL
-ev
+eJ
 eW
 eN
 eJ
@@ -11912,11 +11967,11 @@ bL
 bV
 bV
 bL
-dW
+eF
 eg
 eq
-ev
-ev
+eJ
+eJ
 eF
 eF
 eF
@@ -12169,11 +12224,11 @@ bL
 bV
 bV
 bL
-dX
+eG
 eh
-ej
+fm
 eg
-ev
+eJ
 eF
 eI
 eM
@@ -12426,11 +12481,11 @@ bL
 bV
 bV
 bL
-dX
+eG
 ei
 er
-ej
-ev
+fm
+eJ
 eG
 eJ
 eN
@@ -12560,7 +12615,7 @@ ae
 ac
 ac
 ac
-bo
+aj
 bv
 ac
 ag
@@ -12683,11 +12738,11 @@ bL
 bV
 bV
 bL
-dX
-ej
-ej
-ev
-ev
+eG
+fm
+fm
+eJ
+eJ
 eG
 eJ
 eO
@@ -12940,7 +12995,7 @@ bL
 bV
 bV
 bL
-dW
+eF
 ek
 es
 ew
@@ -13197,11 +13252,11 @@ bL
 bV
 bV
 bV
-dW
-dW
-dX
-dX
-dW
+eF
+eF
+eG
+eG
+eF
 eF
 eK
 eP
@@ -50861,7 +50916,7 @@ ad
 ai
 ai
 ai
-ai
+bo
 ai
 ai
 ad
@@ -51117,7 +51172,7 @@ ad
 ad
 ad
 ai
-ai
+bo
 bG
 bI
 ai
@@ -54083,7 +54138,7 @@ bJ
 bJ
 bJ
 cQ
-gk
+bJ
 bJ
 gs
 bJ
@@ -64612,7 +64667,7 @@ bJ
 bK
 bK
 bK
-fw
+bJ
 bJ
 bJ
 cq
@@ -64867,7 +64922,7 @@ bJ
 bJ
 bJ
 fe
-fk
+bJ
 fn
 fd
 bJ
@@ -7,125 +7,81 @@
 	icon_state = "iron0"
 	},
 /area/awaymission/challenge/start)
-"ac" = (
-/obj/structure/girder,
-/turf/open/floor/plating/airless,
-/area/awaymission/challenge/start)
-"ad" = (
-/turf/open/floor/plating,
-/area/awaymission/challenge/start)
-"ae" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged5"
-	},
-/area/awaymission/challenge/start)
-"af" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
-/area/awaymission/challenge/start)
 "ag" = (
 /obj/item/clothing/suit/space/syndicate/blue,
 /obj/item/clothing/head/helmet/space/syndicate/blue,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
-/area/awaymission/challenge/start)
-"ah" = (
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ai" = (
 /obj/item/flashlight{
 	icon_state = "flashlight-on";
 	on = 1
 	},
-/turf/open/floor/plasteel/airless,
-/area/awaymission/challenge/start)
-"aj" = (
-/obj/effect/landmark/awaystart,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged3"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ak" = (
 /obj/effect/decal/remains/human,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged4"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "al" = (
 /obj/effect/landmark/awaystart,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "am" = (
 /obj/item/clothing/suit/space/syndicate/green,
 /obj/item/clothing/head/helmet/space/syndicate/green,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
-/area/awaymission/challenge/start)
-"an" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged3"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ao" = (
 /obj/item/clothing/suit/space/syndicate/orange,
 /obj/item/clothing/head/helmet/space/syndicate/orange,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ap" = (
 /obj/item/gun/energy/laser/retro,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "aq" = (
 /obj/item/stack/rods,
-/turf/open/floor/plasteel,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ar" = (
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "as" = (
 /obj/effect/decal/remains/robot,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "at" = (
 /obj/structure/girder,
-/turf/open/floor/plating,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "au" = (
-/turf/closed/wall,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "av" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged4"
-	},
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "aw" = (
 /obj/item/stack/rods,
 /obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ax" = (
 /obj/effect/decal/cleanable/oil,
 /mob/living/simple_animal/hostile/syndicate,
-/turf/open/floor/plating,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ay" = (
 /obj/effect/decal/cleanable/blood,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "az" = (
 /obj/item/clothing/suit/space/syndicate/black,
 /obj/item/clothing/head/helmet/space/syndicate/black,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "aA" = (
 /turf/closed/indestructible{
@@ -133,16 +89,18 @@
 	},
 /area/awaymission/challenge/main)
 "aB" = (
-/obj/structure/girder,
-/turf/open/floor/plating,
-/area/awaymission/challenge/main)
+/obj/machinery/power/smes/magical,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/airless,
+/area/awaymission/challenge/start)
 "aC" = (
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "aD" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged3"
-	},
+/obj/structure/fans/tiny,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/main)
 "aE" = (
 /turf/closed/wall,
@@ -151,16 +109,23 @@
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "aG" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
+/obj/machinery/power/terminal{
+	dir = 8
 	},
-/area/awaymission/challenge/main)
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/airless,
+/area/awaymission/challenge/start)
 "aH" = (
 /turf/open/floor/plasteel/airless,
 /area/awaymission/challenge/main)
 "aI" = (
 /obj/machinery/power/emitter/ctf{
-	dir = 2
+	active = 0
 	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
@@ -191,7 +156,7 @@
 "aO" = (
 /obj/structure/window/reinforced,
 /obj/machinery/power/emitter/ctf{
-	dir = 2
+	active = 0
 	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
@@ -210,6 +175,7 @@
 /area/awaymission/challenge/main)
 "aS" = (
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 4
 	},
 /turf/open/floor/plating/airless,
@@ -234,6 +200,7 @@
 /area/awaymission/challenge/main)
 "aW" = (
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 8
 	},
 /turf/open/floor/plating/airless,
@@ -294,15 +261,16 @@
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bf" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0;
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bg" = (
@@ -321,15 +289,16 @@
 /turf/open/floor/plasteel,
 /area/awaymission/challenge/main)
 "bi" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0;
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bj" = (
@@ -337,22 +306,24 @@
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bk" = (
+/obj/machinery/light,
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 1
 	},
-/obj/machinery/light,
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bl" = (
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/machinery/power/emitter/ctf{
-	dir = 1
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0;
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bm" = (
@@ -363,15 +334,15 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/awaymission/challenge/main)
 "bo" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 2
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0
+	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bp" = (
@@ -420,9 +391,7 @@
 /area/awaymission/challenge/main)
 "bv" = (
 /obj/structure/window/reinforced,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bw" = (
@@ -435,15 +404,6 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
-"bx" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/awaymission/challenge/main)
 "by" = (
 /obj/machinery/light{
 	dir = 8
@@ -474,6 +434,7 @@
 	dir = 8
 	},
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 8
 	},
 /turf/open/floor/plating/airless,
@@ -483,6 +444,7 @@
 	dir = 4
 	},
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 4
 	},
 /turf/open/floor/plating/airless,
@@ -492,14 +454,10 @@
 /turf/open/floor/plasteel/airless,
 /area/awaymission/challenge/main)
 "bF" = (
-/turf/open/floor/plasteel/white/corner{
-	dir = 2
-	},
+/turf/open/floor/plasteel/white/corner,
 /area/awaymission/challenge/main)
 "bG" = (
-/turf/open/floor/plasteel/white/side{
-	dir = 2
-	},
+/turf/open/floor/plasteel/white/side,
 /area/awaymission/challenge/main)
 "bH" = (
 /turf/open/floor/plasteel/white/corner{
@@ -531,36 +489,40 @@
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bL" = (
-/obj/machinery/power/emitter/ctf{
+/obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/structure/window/reinforced{
+/obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 1
 	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bM" = (
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 1
 	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bN" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0;
+	dir = 1
+	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bO" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0;
+	dir = 1
+	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bP" = (
@@ -570,9 +532,7 @@
 /area/awaymission/challenge/end)
 "bQ" = (
 /obj/item/gun/ballistic/revolver/russian,
-/turf/open/floor/plasteel/white/side{
-	dir = 2
-	},
+/turf/open/floor/plasteel/white/side,
 /area/awaymission/challenge/main)
 "bR" = (
 /obj/structure/table/reinforced,
@@ -602,9 +562,7 @@
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bU" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel/white,
 /area/awaymission/challenge/main)
 "bV" = (
@@ -644,7 +602,7 @@
 	dir = 1
 	},
 /obj/structure/rack,
-/obj/item/clothing/suit/armor/heavy,
+/obj/item/clothing/suit/armor/vest/russian,
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cb" = (
@@ -670,7 +628,6 @@
 "cf" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Airlock";
-	opacity = 1;
 	req_access_txt = "109"
 	},
 /turf/open/floor/plating,
@@ -701,7 +658,7 @@
 /area/awaymission/challenge/end)
 "ck" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/revolver/mateba,
+/obj/item/gun/ballistic/revolver/doublebarrel/improvised,
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cl" = (
@@ -758,7 +715,7 @@
 /area/awaymission/challenge/end)
 "ct" = (
 /obj/structure/rack,
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced,
+/obj/item/gun/ballistic/revolver/detective,
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cu" = (
@@ -773,13 +730,12 @@
 /area/awaymission/challenge/end)
 "cw" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/l6_saw,
+/obj/item/gun/ballistic/revolver/doublebarrel,
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cx" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Security";
-	opacity = 1;
 	req_access_txt = "109"
 	},
 /turf/open/floor/plasteel/dark,
@@ -807,7 +763,6 @@
 "cB" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Administrator";
-	opacity = 1;
 	req_access_txt = "109"
 	},
 /turf/open/floor/plasteel/dark,
@@ -902,36 +857,68 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/end)
+"cR" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/closed/indestructible{
+	icon_state = "iron0"
+	},
+/area/awaymission/challenge/start)
+"cS" = (
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
+"cT" = (
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
+"cV" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
 "cW" = (
-/obj/machinery/gateway/away,
+/obj/item/clothing/suit/space/hardsuit/shielded/syndi,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/documents/syndicate,
+/obj/structure/safe,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/challenge/end)
-"cZ" = (
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
+"cX" = (
+/obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
+"cY" = (
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
+"cZ" = (
+/obj/machinery/gateway{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
+"da" = (
+/area/awaymission/challenge/start)
+/turf/open/floor/bluespace,
 "db" = (
 /obj/structure/window/reinforced,
 /turf/open/floor/circuit,
 /area/awaymission/challenge/end)
 "dc" = (
+/obj/machinery/gateway,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
 "dd" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -962,16 +949,6 @@
 /area/awaymission/challenge/end)
 "di" = (
 /obj/structure/table,
-/obj/item/implanter/explosive,
-/obj/item/implanter/explosive{
-	pixel_y = 4
-	},
-/obj/item/implanter/explosive{
-	pixel_y = 8
-	},
-/obj/item/implanter/explosive{
-	pixel_y = 12
-	},
 /turf/open/floor/plasteel/dark,
 /area/awaymission/challenge/end)
 "dj" = (
@@ -984,7 +961,6 @@
 "dk" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Gateway Access";
-	opacity = 1;
 	req_access_txt = "109"
 	},
 /turf/open/floor/plasteel/dark,
@@ -996,23 +972,20 @@
 /turf/open/floor/plating,
 /area/awaymission/challenge/end)
 "dm" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /mob/living/simple_animal/hostile/syndicate{
 	name = "Syndicate Technician"
 	},
 /turf/open/floor/plasteel/dark,
 /area/awaymission/challenge/end)
 "dn" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/gateway{
+	dir = 6
 	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
 "do" = (
 /obj/machinery/light,
 /turf/open/floor/circuit,
@@ -1022,17 +995,8 @@
 /turf/open/floor/circuit,
 /area/awaymission/challenge/end)
 "dq" = (
-/obj/structure/cable,
-/obj/machinery/power/smes/magical,
-/turf/open/floor/circuit,
-/area/awaymission/challenge/end)
-"dr" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable,
-/turf/open/floor/circuit,
-/area/awaymission/challenge/end)
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
 "ds" = (
 /obj/structure/closet/l3closet,
 /turf/open/floor/circuit,
@@ -27869,11 +27833,11 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
+ab
+ab
+ab
+ab
+ab
 ab
 ab
 ab
@@ -28124,20 +28088,20 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 ab
-ac
-af
-an
-ah
-ad
-an
+ab
+ab
+cS
+cX
+da
+ab
+ab
+at
+au
+au
+au
+au
+au
 ax
 aA
 aF
@@ -28381,21 +28345,21 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 ab
-ad
-aj
-an
+aB
+ab
+cT
+cY
+dc
+dq
+dq
+au
+al
+au
 ao
-af
-an
-av
+au
+au
+au
 aA
 aA
 aA
@@ -28638,23 +28602,23 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 ab
-ae
+aG
+cR
+cV
+cZ
+dn
+ab
+ab
+au
 ak
 al
-af
-ad
+au
+au
 aw
-av
-aB
-aC
+au
+aE
+aH
 aJ
 aR
 aH
@@ -28895,23 +28859,23 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 ab
-af
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+au
 al
-ah
-af
+au
+au
 at
-af
-an
-aC
-aG
+au
+au
+aD
+aH
 aK
 aR
 aH
@@ -29161,14 +29125,14 @@ aa
 aa
 ab
 ag
-ah
+au
 al
 ap
 au
-af
+au
 ay
 aD
-aC
+aH
 aL
 aR
 aH
@@ -29216,12 +29180,12 @@ cH
 cN
 co
 cW
-cZ
-dc
-dc
-dc
+co
+cd
+cd
+cd
 dm
-dq
+cn
 bP
 aa
 aa
@@ -29417,12 +29381,12 @@ aa
 aa
 aa
 ab
-ah
+au
 al
-ah
+au
 aq
 at
-an
+au
 az
 aE
 aH
@@ -29477,8 +29441,8 @@ co
 db
 dh
 cd
-dn
-dr
+cd
+cn
 bP
 aa
 aa
@@ -29675,12 +29639,12 @@ aa
 aa
 ab
 ai
-ah
+au
 al
 ar
-af
-av
-ad
+au
+au
+au
 aA
 aA
 aA
@@ -29931,13 +29895,13 @@ aa
 aa
 aa
 ab
-ah
+au
 am
-ad
+au
 as
 av
-ae
-av
+au
+au
 aA
 aF
 aN
@@ -30987,7 +30951,7 @@ aV
 aV
 aV
 aV
-bx
+bC
 aV
 aV
 aV
@@ -895,7 +895,6 @@
 /area/awaymission/research/interior/gateway)
 "ck" = (
 /obj/machinery/door/window/eastright{
-	icon_state = "right";
 	dir = 2
 	},
 /obj/effect/landmark/awaystart,
@@ -1339,16 +1338,6 @@
 "dc" = (
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
-"dd" = (
-/obj/structure/closet/crate,
-/obj/item/disk/data{
-	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
-	name = "encrypted genetic data disk";
-	read_only = 1
-	},
-/obj/item/firing_pin/dna,
-/turf/open/floor/plasteel/dark,
-/area/awaymission/research/interior/secure)
 "de" = (
 /obj/structure/filingcabinet,
 /obj/structure/filingcabinet,
@@ -1367,8 +1356,8 @@
 	name = "encrypted genetic data disk";
 	read_only = 1
 	},
-/obj/item/dnainjector/xraymut,
-/obj/item/dnainjector/xraymut,
+/obj/item/dnainjector/glow,
+/obj/item/storage/toolbox/syndicate,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "dg" = (
@@ -1457,18 +1446,6 @@
 "do" = (
 /turf/closed/wall/r_wall,
 /area/awaymission/research/interior/security)
-"dp" = (
-/obj/structure/closet/crate,
-/obj/item/disk/data{
-	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
-	name = "encrypted genetic data disk";
-	read_only = 1
-	},
-/obj/item/dnainjector/telemut,
-/obj/item/dnainjector/telemut,
-/obj/item/dnainjector/chavmut,
-/turf/open/floor/plasteel/dark,
-/area/awaymission/research/interior/secure)
 "dq" = (
 /obj/machinery/light{
 	dir = 8
@@ -1719,8 +1696,6 @@
 "dJ" = (
 /obj/structure/rack,
 /obj/item/clothing/suit/armor/bulletproof,
-/obj/item/clothing/suit/armor/bulletproof,
-/obj/item/clothing/head/helmet/alt,
 /obj/item/clothing/head/helmet/alt,
 /obj/machinery/light/small{
 	dir = 4
@@ -1745,19 +1720,19 @@
 /area/awaymission/research/interior/secure)
 "dL" = (
 /obj/structure/closet/crate,
-/obj/item/disk/data{
-	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off with the words 'DO NOT CLONE' hastily written over it.";
-	fields = list("label" = "Buffer1:George Melons", "UI" = "3c300f11b5421ca7014d8", "SE" = "430431205660551642142504334461413202111310233445620533134255", "UE" = "6893e6a0b0076a41897776b10cc2b324", "name" = "George Melons", "blood_type" = "B+");
-	name = "old genetics data disk"
-	},
 /obj/item/disk/data{
 	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
 	name = "encrypted genetic data disk";
 	read_only = 1
 	},
-/obj/item/firing_pin/dna,
-/obj/item/dnainjector/dwarf,
-/obj/item/dnainjector/dwarf,
+/obj/item/disk/data{
+	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
+	fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+	name = "dusty genetics data disk";
+	read_only = 1
+	},
+/obj/item/dnainjector/insulated,
+/obj/item/gun/energy/disabler,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "dM" = (
@@ -1768,11 +1743,13 @@
 	read_only = 1
 	},
 /obj/item/disk/data{
-	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
-	name = "encrypted genetic data disk";
+	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
+	fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+	name = "dusty genetics data disk";
 	read_only = 1
 	},
-/obj/item/dnainjector/chameleonmut,
+/obj/item/dnainjector/glow,
+/obj/item/storage/toolbox/syndicate,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "dN" = (
@@ -1866,7 +1843,6 @@
 "dU" = (
 /obj/structure/rack,
 /obj/item/gun/ballistic/automatic/wt550,
-/obj/item/gun/ballistic/automatic/wt550,
 /obj/item/ammo_box/magazine/wt550m9,
 /obj/item/ammo_box/magazine/wt550m9,
 /obj/effect/turf_decal/tile/red{
@@ -2046,7 +2022,6 @@
 "ep" = (
 /obj/structure/rack,
 /obj/item/gun/ballistic/automatic/pistol/m1911,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
 /obj/item/ammo_box/magazine/m45,
 /obj/item/ammo_box/magazine/m45,
 /obj/effect/turf_decal/tile/red{
@@ -3047,7 +3022,6 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/highsecurity{
-	aiDisabledIdScanner = 0;
 	name = "Vault Storage";
 	req_access_txt = "36"
 	},
@@ -3507,7 +3481,6 @@
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/cryo)
 "gR" = (
-/obj/item/melee/classic_baton/telescopic,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
@@ -3518,6 +3491,7 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
+/obj/item/melee/baton/cattleprod,
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/cryo)
 "gS" = (
@@ -3890,7 +3864,6 @@
 /area/awaymission/research/interior/cryo)
 "hw" = (
 /obj/machinery/computer/arcade{
-	icon_state = "arcade";
 	dir = 8
 	},
 /turf/open/floor/plasteel/yellowsiding{
@@ -4102,20 +4075,22 @@
 /area/awaymission/research/interior/security)
 "hS" = (
 /obj/structure/closet/crate,
+/obj/item/clothing/head/collectable/petehat{
+	name = "dusty hat"
+	},
 /obj/item/disk/data{
 	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
 	name = "encrypted genetic data disk";
 	read_only = 1
 	},
 /obj/item/disk/data{
-	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines. This one has the initials 'C.P' marked on the front. ";
-	name = "encrypted genetic data disk";
+	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
+	fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+	name = "dusty genetics data disk";
 	read_only = 1
 	},
-/obj/item/clothing/head/collectable/petehat{
-	name = "dusty hat"
-	},
-/obj/item/firing_pin/dna,
+/obj/item/dnainjector/gigantism,
+/obj/item/kitchen/knife/combat/survival,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "hT" = (
@@ -4126,12 +4101,13 @@
 	read_only = 1
 	},
 /obj/item/disk/data{
-	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
-	name = "encrypted genetic data disk";
+	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
+	fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+	name = "dusty genetics data disk";
 	read_only = 1
 	},
-/obj/item/firing_pin/dna,
-/obj/item/dnainjector/hulkmut,
+/obj/item/dnainjector/antenna,
+/obj/item/clothing/suit/armor/vest,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "hU" = (
@@ -4272,10 +4248,14 @@
 	name = "encrypted genetic data disk";
 	read_only = 1
 	},
-/obj/item/firing_pin/dna/dredd,
-/obj/item/firing_pin/dna/dredd,
-/obj/item/dnainjector/lasereyesmut,
-/obj/item/dnainjector/lasereyesmut,
+/obj/item/disk/data{
+	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
+	fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+	name = "dusty genetics data disk";
+	read_only = 1
+	},
+/obj/item/dnainjector/gigantism,
+/obj/item/kitchen/knife/combat/survival,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "im" = (
@@ -4579,7 +4559,6 @@
 /area/awaymission/research/interior/bathroom)
 "iN" = (
 /obj/machinery/shower{
-	icon_state = "shower";
 	dir = 8
 	},
 /turf/open/floor/plasteel/freezer,
@@ -6311,7 +6290,7 @@
 /area/space/nearstation)
 "nb" = (
 /obj/structure/table/wood,
-/obj/item/book/granter/spell/random,
+/obj/item/book/granter/spell/smoke,
 /turf/open/floor/mineral/plasma,
 /area/space/nearstation)
 "nc" = (
@@ -6436,6 +6415,11 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
+"Hs" = (
+/obj/structure/table/wood,
+/obj/item/book/granter/crafting_recipe/bone_bow,
+/turf/open/floor/mineral/plasma,
+/area/space/nearstation)
 "Km" = (
 /obj/machinery/door/airlock/security/glass{
 	id_tag = "outerbrig";
@@ -6558,6 +6542,11 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/research/interior/escapepods)
+"ZZ" = (
+/obj/structure/table/wood,
+/obj/item/book/granter/action/origami,
+/turf/open/floor/mineral/plasma,
+/area/space/nearstation)

 (1,1,1) = {"
 aa
@@ -11097,8 +11086,8 @@ ab
 ab
 na
 nb
-nb
-nb
+Hs
+ZZ
 na
 ab
 ab
@@ -31089,8 +31078,8 @@ ad
 ad
 ad
 cQ
-dd
-dp
+dL
+dL
 dL
 cQ
 dc
@@ -31102,7 +31091,7 @@ cQ
 dc
 cQ
 hS
-dM
+il
 il
 cQ
 ad
@@ -32375,7 +32364,7 @@ ad
 ad
 cQ
 df
-dd
+dM
 dM
 cQ
 dc
@@ -32388,7 +32377,7 @@ dc
 cQ
 hT
 hT
-dd
+hT
 cQ
 ad
 ad
@@ -417,7 +417,6 @@
 	dir = 1
 	},
 /obj/machinery/firealarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/effect/turf_decal/tile/neutral{
@@ -1035,7 +1034,6 @@
 /area/awaymission/snowdin/post/research)
 "cE" = (
 /obj/machinery/firealarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -1281,7 +1279,6 @@
 "cY" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 2;
 	piping_layer = 3;
 	pixel_x = 5;
 	pixel_y = 5
@@ -1329,7 +1326,6 @@
 "db" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 2;
 	piping_layer = 3;
 	pixel_x = 5;
 	pixel_y = 5
@@ -1389,7 +1385,6 @@
 "df" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 2;
 	piping_layer = 3;
 	pixel_x = 5;
 	pixel_y = 5
@@ -1861,7 +1856,6 @@
 /area/awaymission/snowdin/post)
 "em" = (
 /obj/machinery/power/apc{
-	dir = 2;
 	name = "Gateway APC";
 	pixel_y = -24;
 	req_access = 150
@@ -1936,9 +1930,7 @@
 /turf/open/floor/plasteel,
 /area/awaymission/snowdin/post/messhall)
 "et" = (
-/obj/machinery/vending/boozeomat{
-	req_access_txt = "0"
-	},
+/obj/machinery/vending/boozeomat,
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
@@ -1968,7 +1960,6 @@
 /area/awaymission/snowdin/post/messhall)
 "ew" = (
 /obj/machinery/firealarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/effect/turf_decal/tile/bar,
@@ -2210,7 +2201,6 @@
 	dir = 1
 	},
 /obj/machinery/firealarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/effect/turf_decal/tile/blue{
@@ -2411,7 +2401,6 @@
 /area/awaymission/snowdin/post/dorm)
 "fw" = (
 /obj/machinery/sleeper{
-	icon_state = "sleeper";
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/blue{
@@ -2610,7 +2599,6 @@
 /area/awaymission/snowdin/post/hydro)
 "fT" = (
 /obj/machinery/firealarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/effect/turf_decal/tile/green{
@@ -3767,7 +3755,6 @@
 /area/awaymission/snowdin/post)
 "iu" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 2;
 	piping_layer = 3;
 	pixel_x = 5;
 	pixel_y = 5
@@ -4442,7 +4429,8 @@
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/garage)
 "jL" = (
-/obj/vehicle/ridden/atv,
+/obj/vehicle/ridden/atv/snowmobile,
+/obj/item/key,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/garage)
 "jM" = (
@@ -5019,8 +5007,9 @@
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/garage)
 "lc" = (
-/obj/vehicle/ridden/atv,
 /obj/effect/decal/cleanable/oil,
+/obj/vehicle/ridden/atv/snowmobile,
+/obj/item/key,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/garage)
 "ld" = (
@@ -5244,7 +5233,6 @@
 /area/awaymission/snowdin/post)
 "lv" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 2;
 	piping_layer = 3;
 	pixel_x = 5;
 	pixel_y = 5
@@ -5380,7 +5368,6 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 2;
 	piping_layer = 3;
 	pixel_x = 5;
 	pixel_y = 5
@@ -5427,7 +5414,6 @@
 /area/awaymission/snowdin/post/hydro)
 "lG" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 2;
 	piping_layer = 3;
 	pixel_x = 5;
 	pixel_y = 5
@@ -6560,7 +6546,6 @@
 /obj/item/ammo_box/a762,
 /obj/structure/closet/secure_closet{
 	icon_state = "sec";
-	locked = 1;
 	name = "security officer's locker";
 	req_access_txt = "201"
 	},
@@ -6759,7 +6744,6 @@
 /area/awaymission/snowdin/post/hydro)
 "ot" = (
 /obj/machinery/firealarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /turf/open/floor/plasteel,
@@ -8674,7 +8658,6 @@
 /area/awaymission/snowdin/outside)
 "sW" = (
 /obj/machinery/power/turbine{
-	dir = 2;
 	luminosity = 2
 	},
 /obj/structure/cable,
@@ -9822,7 +9805,6 @@
 "wm" = (
 /obj/machinery/porta_turret/centcom_shuttle/weak{
 	desc = "A turret built with substandard parts and run down further with age.";
-	icon_state = "syndie_off";
 	dir = 9;
 	faction = list("pirate")
 	},
@@ -9917,7 +9899,6 @@
 	},
 /obj/effect/light_emitter{
 	light_color = "#FAA019";
-	light_power = 1;
 	light_range = 4;
 	name = "fire light"
 	},
@@ -9949,7 +9930,6 @@
 /area/awaymission/snowdin/outside)
 "wC" = (
 /obj/vehicle/ridden/atv{
-	icon_state = "atv";
 	dir = 4
 	},
 /obj/effect/light_emitter{
@@ -11051,10 +11031,8 @@
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/minipost)
 "zq" = (
-/obj/vehicle/ridden/atv{
-	icon_state = "atv";
-	dir = 8
-	},
+/obj/vehicle/ridden/atv/snowmobile,
+/obj/item/key,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/minipost)
 "zr" = (
@@ -11371,12 +11349,6 @@
 /obj/item/clothing/suit/hooded/wintercoat,
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/outside)
-"Ah" = (
-/obj/structure/window/reinforced/fulltile/ice,
-/obj/structure/grille,
-/obj/item/clothing/suit/hooded/wintercoat,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/minipost)
 "Ai" = (
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
@@ -11547,7 +11519,6 @@
 	},
 /obj/effect/light_emitter{
 	light_color = "#FAA019";
-	light_power = 1;
 	light_range = 4;
 	name = "fire light"
 	},
@@ -12258,7 +12229,6 @@
 	desc = "It's a storage unit for a Syndicate boarding party."
 	},
 /obj/effect/turf_decal/bot_white,
-/obj/item/gun/ballistic/automatic/pistol,
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -12304,7 +12274,6 @@
 /area/awaymission/snowdin/cave)
 "CP" = (
 /obj/structure/shuttle/engine/heater{
-	icon_state = "heater";
 	dir = 4
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -12594,14 +12563,6 @@
 /obj/item/stack/rods,
 /turf/open/floor/mineral/plastitanium/red,
 /area/awaymission/snowdin/cave)
-"Ds" = (
-/obj/item/grenade/plastic/c4,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/snowdin/cave)
 "Dt" = (
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced{
@@ -12839,7 +12800,6 @@
 /area/awaymission/snowdin/cave)
 "DU" = (
 /obj/structure/shuttle/engine/heater{
-	icon_state = "heater";
 	dir = 4
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -13174,26 +13134,14 @@
 /obj/item/toy/plush/nukeplushie,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/snowdin/cave)
-"EE" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/weather/snow,
-/obj/machinery/suit_storage_unit{
-	state_open = 1
-	},
-/turf/open/floor/mineral/plastitanium{
-	initial_gas_mix = "o2=22;n2=82;TEMP=180";
-	planetary_atmos = 1;
-	temperature = 180
-	},
-/area/awaymission/snowdin/cave)
 "EF" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
 /obj/effect/turf_decal/weather/snow,
-/obj/machinery/suit_storage_unit/syndicate,
+/obj/item/clothing/suit/hooded/wintercoat/security,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/structure/rack,
 /turf/open/floor/mineral/plastitanium{
 	initial_gas_mix = "o2=22;n2=82;TEMP=180";
 	planetary_atmos = 1;
@@ -13205,9 +13153,9 @@
 	dir = 5
 	},
 /obj/effect/turf_decal/weather/snow,
-/obj/machinery/suit_storage_unit{
-	state_open = 1
-	},
+/obj/item/clothing/suit/hooded/wintercoat/security,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/structure/rack,
 /turf/open/floor/mineral/plastitanium{
 	initial_gas_mix = "o2=22;n2=82;TEMP=180";
 	planetary_atmos = 1;
@@ -13279,7 +13227,6 @@
 /area/awaymission/snowdin/cave)
 "EN" = (
 /obj/machinery/sleeper/syndie{
-	icon_state = "sleeper_s";
 	dir = 1
 	},
 /obj/effect/turf_decal/bot_white,
@@ -13292,7 +13239,6 @@
 "EP" = (
 /obj/effect/turf_decal/bot_white,
 /obj/machinery/sleeper/syndie{
-	icon_state = "sleeper_s";
 	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
@@ -13716,7 +13662,6 @@
 /area/awaymission/snowdin/cave/cavern)
 "FY" = (
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "snowdin_belt_mine"
 	},
 /obj/machinery/light/small{
@@ -13739,8 +13684,7 @@
 /area/awaymission/snowdin/post/mining_main)
 "Gc" = (
 /obj/structure/statue/snow/snowman{
-	anchored = 1;
-	name = "snowman"
+	anchored = 1
 	},
 /obj/item/pickaxe/mini{
 	pixel_x = 5;
@@ -13827,7 +13771,6 @@
 "Gn" = (
 /obj/structure/plasticflaps,
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "snowdin_belt_mine"
 	},
 /turf/open/floor/plating,
@@ -14013,7 +13956,6 @@
 	output_dir = 2
 	},
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "snowdin_belt_mine"
 	},
 /turf/open/floor/plating,
@@ -14129,7 +14071,6 @@
 /area/awaymission/snowdin/post/mining_main/mechbay)
 "Hk" = (
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "snowdin_belt_mine"
 	},
 /turf/open/floor/plating,
@@ -14245,11 +14186,9 @@
 /area/awaymission/snowdin/post/mining_main/mechbay)
 "HC" = (
 /obj/machinery/mineral/processing_unit{
-	dir = 1;
-	output_dir = 2
+	dir = 1
 	},
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "snowdin_belt_mine"
 	},
 /turf/open/floor/plating,
@@ -14514,7 +14453,6 @@
 /area/awaymission/snowdin/post/mining_main/mechbay)
 "In" = (
 /obj/mecha/working/ripley/mining{
-	icon_state = "ripley";
 	dir = 1
 	},
 /obj/effect/turf_decal/bot,
@@ -14574,11 +14512,9 @@
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_main)
 "Ix" = (
-/obj/vehicle/ridden/atv{
-	icon_state = "atv";
-	dir = 1
-	},
 /obj/effect/decal/cleanable/oil,
+/obj/vehicle/ridden/atv/snowmobile,
+/obj/item/key,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_main)
 "Iy" = (
@@ -27259,7 +27195,7 @@ oa
 dX
 yW
 yW
-Ah
+AX
 Av
 Lw
 yX
@@ -36052,7 +35988,7 @@ CC
 El
 an
 an
-EE
+EF
 CC
 ae
 ae
@@ -36566,7 +36502,7 @@ OF
 En
 Es
 Dp
-EE
+EF
 CC
 zh
 af
@@ -38355,7 +38291,7 @@ CC
 CL
 CW
 Di
-Ds
+Di
 Di
 CC
 CX
@@ -55563,7 +55499,7 @@ eL
 eJ
 tp
 qi
-tt
+tz
 qi
 tp
 eJ
@@ -56331,13 +56267,13 @@ eJ
 eJ
 tp
 qi
-tt
+tz
 tv
 qi
 tt
 qi
 tv
-tt
+tz
 qi
 tp
 eJ
@@ -57105,7 +57041,7 @@ eJ
 eJ
 tp
 qi
-tt
+tz
 qi
 tp
 eJ
@@ -69581,7 +69517,7 @@ tp
 qi
 tz
 qi
-tt
+tz
 qi
 qi
 qi
@@ -70344,7 +70280,7 @@ eJ
 gW
 tp
 qi
-tt
+tz
 tp
 qi
 qi
@@ -71118,7 +71054,7 @@ qi
 qi
 tp
 qi
-tt
+tz
 qi
 tp
 tp
@@ -50,25 +50,64 @@
 /turf/open/floor/circuit/off,
 /area/awaymission/wildwest/vault)
 "an" = (
-/turf/open/floor/plasteel/cult{
-	name = "engraved floor"
-	},
+/turf/open/floor/plasteel/cult,
 /area/awaymission/wildwest/vault)
 "ao" = (
 /turf/open/floor/circuit/green/off,
 /area/awaymission/wildwest/vault)
 "ap" = (
-/obj/machinery/wish_granter_dark,
+/obj/item/nullrod/claymore/glowing,
 /turf/open/floor/circuit/green/off,
 /area/awaymission/wildwest/vault)
 "aq" = (
 /obj/structure/destructible/cult/pylon,
 /turf/open/floor/circuit/green/off,
 /area/awaymission/wildwest/vault)
+"ar" = (
+/turf/open/floor/plating/ironsand{
+	icon_state = "ironsand1"
+	},
+/area/awaymission/wildwest/mines)
+"as" = (
+/turf/open/floor/plating/ironsand{
+	icon_state = "ironsand1"
+	},
+/area/awaymission/wildwest/mines)
+"at" = (
+/turf/open/floor/plating/ironsand{
+	icon_state = "ironsand1"
+	},
+/area/awaymission/wildwest/mines)
+"au" = (
+/turf/open/floor/plating/ironsand{
+	icon_state = "ironsand1"
+	},
+/area/awaymission/wildwest/mines)
 "av" = (
-/obj/machinery/gateway/away,
-/turf/open/floor/circuit/green/off,
-/area/awaymission/wildwest/vault)
+/turf/open/floor/plating/ironsand{
+	icon_state = "ironsand1"
+	},
+/area/awaymission/wildwest/mines)
+"aw" = (
+/turf/open/floor/plating/ironsand{
+	icon_state = "ironsand1"
+	},
+"ax" = (
+/turf/open/floor/plating/ironsand{
+	icon_state = "ironsand1"
+	},
+/area/awaymission/wildwest/mines)
+"ay" = (
+/turf/open/floor/plating/ironsand{
+	icon_state = "ironsand1"
+	},
+/area/awaymission/wildwest/mines)
+"az" = (
+/turf/open/floor/plating/ironsand{
+	icon_state = "ironsand1"
+	},
+/area/awaymission/wildwest/mines)
+/area/awaymission/wildwest/mines)
 "aA" = (
 /obj/effect/meatgrinder,
 /turf/open/floor/circuit/green/off,
@@ -114,9 +153,7 @@
 /area/awaymission/wildwest/vault)
 "aL" = (
 /obj/item/paper/fluff/awaymissions/wildwest/grinder,
-/turf/open/floor/plasteel/cult{
-	name = "engraved floor"
-	},
+/turf/open/floor/plasteel/cult,
 /area/awaymission/wildwest/vault)
 "aM" = (
 /turf/closed/mineral/silver,
@@ -126,9 +163,7 @@
 /area/awaymission/wildwest/mines)
 "aO" = (
 /obj/effect/mob_spawn/human/corpse/syndicatecommando,
-/turf/open/floor/plasteel/cult{
-	name = "engraved floor"
-	},
+/turf/open/floor/plasteel/cult,
 /area/awaymission/wildwest/vault)
 "aP" = (
 /obj/effect/decal/cleanable/blood/splatter,
@@ -301,11 +336,6 @@
 /obj/structure/bed,
 /turf/open/floor/wood,
 /area/awaymission/wildwest/mines)
-"bC" = (
-/obj/structure/table/wood,
-/obj/item/gun/ballistic,
-/turf/open/floor/wood,
-/area/awaymission/wildwest/mines)
 "bD" = (
 /obj/structure/table/wood,
 /turf/open/floor/wood,
@@ -547,17 +577,8 @@
 	dir = 5
 	},
 /area/awaymission/wildwest/mines)
-"ch" = (
-/obj/structure/table/wood,
-/obj/item/gun/ballistic,
-/turf/open/floor/plasteel/cafeteria{
-	dir = 5
-	},
-/area/awaymission/wildwest/mines)
 "ci" = (
-/obj/structure/mineral_door/wood{
-	icon_state = "wood"
-	},
+/obj/structure/mineral_door/wood,
 /turf/open/floor/wood,
 /area/awaymission/wildwest/mines)
 "cj" = (
@@ -707,7 +728,7 @@
 /area/awaymission/wildwest/mines)
 "cL" = (
 /obj/structure/table/wood,
-/obj/item/twohanded/dualsaber,
+/obj/item/nullrod/claymore/saber/red,
 /turf/open/floor/wood,
 /area/awaymission/wildwest/gov)
 "cM" = (
@@ -719,9 +740,7 @@
 /turf/open/floor/wood,
 /area/awaymission/wildwest/gov)
 "cO" = (
-/obj/structure/mineral_door/wood{
-	icon_state = "wood"
-	},
+/obj/structure/mineral_door/wood,
 /turf/open/floor/wood,
 /area/awaymission/wildwest/gov)
 "cP" = (
@@ -898,17 +917,13 @@
 /turf/open/floor/carpet,
 /area/awaymission/wildwest/mines)
 "dm" = (
-/obj/structure/mineral_door/wood{
-	icon_state = "wood"
-	},
+/obj/structure/mineral_door/wood,
 /turf/open/floor/plating/ironsand{
 	icon_state = "ironsand1"
 	},
 /area/awaymission/wildwest/mines)
 "dn" = (
-/obj/structure/mineral_door/wood{
-	icon_state = "wood"
-	},
+/obj/structure/mineral_door/wood,
 /obj/effect/decal/cleanable/blood/tracks,
 /turf/open/floor/plating/ironsand{
 	icon_state = "ironsand1"
@@ -1000,9 +1015,7 @@
 	},
 /area/awaymission/wildwest/gov)
 "dD" = (
-/obj/structure/mineral_door/wood{
-	icon_state = "wood"
-	},
+/obj/structure/mineral_door/wood,
 /turf/open/floor/plating/ironsand{
 	icon_state = "ironsand1"
 	},
@@ -1128,7 +1141,6 @@
 /area/awaymission/wildwest/gov)
 "dV" = (
 /obj/machinery/shower{
-	icon_state = "shower";
 	dir = 4
 	},
 /turf/open/floor/plasteel/cafeteria{
@@ -1137,7 +1149,6 @@
 /area/awaymission/wildwest/mines)
 "dW" = (
 /obj/machinery/shower{
-	icon_state = "shower";
 	dir = 8
 	},
 /turf/open/floor/plasteel/cafeteria{
@@ -1961,10 +1972,6 @@
 /obj/machinery/photocopier,
 /turf/open/floor/wood,
 /area/awaymission/wildwest/mines)
-"gm" = (
-/obj/item/gun/ballistic,
-/turf/open/floor/wood,
-/area/awaymission/wildwest/mines)
 "gn" = (
 /mob/living/simple_animal/hostile/netherworld,
 /turf/open/floor/grass,
@@ -2147,10 +2154,9 @@
 /area/awaymission/wildwest/mines)
 "gW" = (
 /obj/structure/table/reinforced,
-/obj/item/clothing/suit/space/syndicate/black/orange,
-/obj/item/clothing/head/helmet/space/syndicate/black/orange,
-/obj/item/clothing/mask/gas/syndicate,
 /obj/item/tank/internals/oxygen,
+/obj/item/clothing/suit/space/syndicate/blue,
+/obj/item/clothing/head/helmet/space/syndicate/blue,
 /turf/open/floor/mineral/titanium/yellow,
 /area/awaymission/wildwest/refine)
 "gX" = (
@@ -32714,9 +32720,9 @@ aT
 aN
 aN
 aT
-aT
-aT
-aT
+ar
+au
+ax
 aT
 aT
 aT
@@ -32971,9 +32977,9 @@ aT
 aN
 aN
 aT
-aT
-aT
-aT
+as
+av
+ay
 aT
 aT
 aT
@@ -33228,9 +33234,9 @@ aT
 aN
 aN
 aT
-aT
-aT
-aT
+at
+aw
+az
 aT
 aT
 aT
@@ -38069,7 +38075,7 @@ bu
 bz
 bM
 bM
-ch
+bM
 by
 bu
 bj
@@ -39865,7 +39871,7 @@ bj
 bj
 aT
 bu
-bC
+bD
 bj
 bj
 bu
@@ -46292,7 +46298,7 @@ aT
 bu
 bD
 bj
-bC
+bD
 cl
 bj
 bj
@@ -47773,7 +47779,7 @@ ab
 ab
 ab
 ao
-av
+ao
 ao
 ao
 ao
@@ -48802,7 +48808,7 @@ aa
 ab
 ab
 ao
-ao
+ap
 ao
 ab
 ab
@@ -51111,7 +51117,7 @@ aa
 aa
 aa
 ab
-ap
+ao
 ao
 aq
 ab
@@ -52235,7 +52241,7 @@ eX
 dj
 bj
 bu
-gm
+bj
 bj
 eM
 bj
@@ -254,6 +254,9 @@
 #define COMSIG_OBJ_DECONSTRUCT 	"obj_deconstruct"				//from base of obj/deconstruct(): (disassembled)
 #define COMSIG_OBJ_BREAK		"obj_break"						//from base of /obj/obj_break(): (damage_flag)
 #define COMSIG_OBJ_SETANCHORED 	"obj_setanchored"				//called in /obj/structure/setAnchored(): (value)
+#define COMSIG_OBJ_ATTACK_GENERIC "obj_attack_generic"			//from base of atom/animal_attack(): (/mob/user)
+	#define COMPONENT_STOP_GENERIC_ATTACK 1
+

 // /machinery signals
 #define COMSIG_MACHINE_EJECT_OCCUPANT "eject_occupant"			//from base of obj/machinery/dropContents() (occupant)
@@ -3,7 +3,7 @@
 	for(var/file in args)
 		src << browse_rsc(file)

-/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html", "md"))
+/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html", "md", "json"))
 	var/path = root

 	for(var/i=0, i<max_iterations, i++)
@@ -375,6 +375,8 @@ GLOBAL_LIST_EMPTY(species_list)
 			override = TRUE
 		if(HAS_TRAIT(M, TRAIT_SIXTHSENSE))
 			override = TRUE
+		if(SSticker.current_state == GAME_STATE_FINISHED)
+			override = TRUE
 		if(isnewplayer(M) && !override)
 			continue
 		if(M.stat != DEAD && !override)
@@ -233,6 +233,7 @@
 	for(var/antag_name in total_antagonists)
 		var/list/L = total_antagonists[antag_name]
 		log_game("[antag_name]s :[L.Join(", ")].")
+	set_observer_default_invisibility(0, "<span class='warning'>The round is over! You are now visible to the living.</span>")

 	CHECK_TICK
 	SSdbcore.SetRoundEnd()
@@ -8,6 +8,8 @@
 	var/list/faction = list("mining")

 /datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs)
+	if(!isatom(parent))
+		return COMPONENT_INCOMPATIBLE
 	if(_spawn_time)
 		spawn_time=_spawn_time
 	if(_mob_types)
@@ -19,20 +21,25 @@
 	if(_max_mobs)
 		max_mobs=_max_mobs

-	RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), .proc/stop_spawning)
+	RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/stop_spawning)
+	RegisterSignal(parent, COMSIG_OBJ_ATTACK_GENERIC, .proc/on_attack_generic)
 	START_PROCESSING(SSprocessing, src)

 /datum/component/spawner/process()
 	try_spawn_mob()

-
-/datum/component/spawner/proc/stop_spawning(force, hint)
+/datum/component/spawner/proc/stop_spawning(datum/source, force, hint)
 	STOP_PROCESSING(SSprocessing, src)
 	for(var/mob/living/simple_animal/L in spawned_mobs)
 		if(L.nest == src)
 			L.nest = null
 	spawned_mobs = null

+// Stopping clientless simple mobs' from indiscriminately bashing their own spawners due DestroySurroundings() et similars.
+/datum/component/spawner/proc/on_attack_generic(datum/source, mob/user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration)
+	if(!user.client && ((user.faction & faction) || (user in spawned_mobs)))
+		return COMPONENT_STOP_GENERIC_ATTACK
+
 /datum/component/spawner/proc/try_spawn_mob()
 	var/atom/P = parent
 	if(spawned_mobs.len >= max_mobs)
@@ -81,11 +81,11 @@
 		owner.adjustStaminaLoss(-0.5) //reduce stamina loss by 0.5 per tick, 10 per 2 seconds
 	if(human_owner && human_owner.drunkenness)
 		human_owner.drunkenness *= 0.997 //reduce drunkenness by 0.3% per tick, 6% per 2 seconds
-	if(prob(20))
-		if(carbon_owner)
-			carbon_owner.handle_dreams()
-		if(prob(10) && owner.health > owner.crit_threshold)
-			owner.emote("snore")
+	if(carbon_owner && !carbon_owner.dreaming && prob(2))
+		carbon_owner.dream()
+	// 2% per second, tick interval is in deciseconds
+	if(prob((tick_interval+1) * 0.2) && owner.health > owner.crit_threshold)
+		owner.emote("snore")

 /datum/status_effect/staggered
 	id = "staggered"
@@ -6,6 +6,7 @@
 	var/id = "effect" //Used for screen alerts.
 	var/duration = -1 //How long the status effect lasts in DECISECONDS. Enter -1 for an effect that never ends unless removed through some means.
 	var/tick_interval = 10 //How many deciseconds between ticks, approximately. Leave at 10 for every second.
+	var/next_tick //The scheduled time for the next tick.
 	var/mob/living/owner //The mob affected by the status effect.
 	var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
 	var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves
@@ -31,7 +32,7 @@
 		return
 	if(duration != -1)
 		duration = world.time + duration
-	tick_interval = world.time + tick_interval
+	next_tick = world.time + tick_interval
 	if(alert_type)
 		var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
 		A.attached_effect = src //so the alert can reference us, if it needs to
@@ -52,9 +53,9 @@
 	if(!owner)
 		qdel(src)
 		return
-	if(tick_interval < world.time)
+	if(next_tick < world.time)
 		tick()
-		tick_interval = world.time + initial(tick_interval)
+		next_tick = world.time + tick_interval
 	if(duration != -1 && duration < world.time)
 		qdel(src)

@@ -221,7 +222,7 @@
 			threshold_crossed = FALSE //resets threshold effect if we fall below threshold so threshold effect can trigger again
 			on_threshold_drop()
 		if(stacks_added > 0)
-			tick_interval += delay_before_decay //refreshes time until decay
+			next_tick += delay_before_decay //refreshes time until decay
 		stacks = min(stacks, max_stacks)
 		status_overlay.icon_state = "[overlay_state][stacks]"
 		status_underlay.icon_state = "[underlay_state][stacks]"
@@ -26,6 +26,7 @@
 								"Firefighter",
 								"Odysseus",
 								"Gygax",
+								"Medical-Spec Gygax",
 								"Durand",
 								"H.O.N.K",
 								"Phazon",
@@ -642,6 +642,304 @@
 				user.visible_message("[user] unfastens Gygax Armor Plates.", "<span class='notice'>You unfasten Gygax Armor Plates.</span>")
 	return TRUE

+//Begin Medigax
+/datum/component/construction/unordered/mecha_chassis/medigax
+	result = /datum/component/construction/mecha/medigax
+	steps = list(
+		/obj/item/mecha_parts/part/medigax_torso,
+		/obj/item/mecha_parts/part/medigax_left_arm,
+		/obj/item/mecha_parts/part/medigax_right_arm,
+		/obj/item/mecha_parts/part/medigax_left_leg,
+		/obj/item/mecha_parts/part/medigax_right_leg,
+		/obj/item/mecha_parts/part/medigax_head
+	)
+
+/datum/component/construction/mecha/medigax
+	result = /obj/mecha/medical/medigax
+	base_icon = "medigax"
+	steps = list(
+		//1
+		list(
+			"key" = TOOL_WRENCH,
+			"desc" = "The hydraulic systems are disconnected."
+		),
+
+		//2
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_WRENCH,
+			"desc" = "The hydraulic systems are connected."
+		),
+
+		//3
+		list(
+			"key" = /obj/item/stack/cable_coil,
+			"amount" = 5,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "The hydraulic systems are active."
+		),
+
+		//4
+		list(
+			"key" = TOOL_WIRECUTTER,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "The wiring is added."
+		),
+
+		//5
+		list(
+			"key" = /obj/item/circuitboard/mecha/gygax/main,
+			"action" = ITEM_DELETE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "The wiring is adjusted."
+		),
+
+		//6
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Central control module is installed."
+		),
+
+		//7
+		list(
+			"key" = /obj/item/circuitboard/mecha/gygax/peripherals,
+			"action" = ITEM_DELETE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "Central control module is secured."
+		),
+
+		//8
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Peripherals control module is installed."
+		),
+
+		//9
+		list(
+			"key" = /obj/item/circuitboard/mecha/gygax/targeting,
+			"action" = ITEM_DELETE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "Peripherals control module is secured."
+		),
+
+		//10
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Weapon control module is installed."
+		),
+
+		//11
+		list(
+			"key" = /obj/item/stock_parts/scanning_module,
+			"action" = ITEM_MOVE_INSIDE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "Weapon control module is secured."
+		),
+
+		//12
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Scanner module is installed."
+		),
+
+		//13
+		list(
+			"key" = /obj/item/stock_parts/capacitor,
+			"action" = ITEM_MOVE_INSIDE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "Scanner module is secured."
+		),
+
+		//14
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Capacitor is installed."
+		),
+
+		//15
+		list(
+			"key" = /obj/item/stock_parts/cell,
+			"action" = ITEM_MOVE_INSIDE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "Capacitor is secured."
+		),
+
+		//16
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "The power cell is installed."
+		),
+
+		//17
+		list(
+			"key" = /obj/item/stack/sheet/metal,
+			"amount" = 5,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "The power cell is secured."
+		),
+
+		//18
+		list(
+			"key" = TOOL_WRENCH,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Internal armor is installed."
+		),
+
+		//19
+		list(
+			"key" = TOOL_WELDER,
+			"back_key" = TOOL_WRENCH,
+			"desc" = "Internal armor is wrenched."
+		),
+
+		//20
+		list(
+			"key" = /obj/item/mecha_parts/part/medigax_armor,
+			"action" = ITEM_DELETE,
+			"back_key" = TOOL_WELDER,
+			"desc" = "Internal armor is welded."
+		),
+
+		//21
+		list(
+			"key" = TOOL_WRENCH,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "External armor is installed."
+		),
+
+		//22
+		list(
+			"key" = TOOL_WELDER,
+			"back_key" = TOOL_WRENCH,
+			"desc" = "External armor is wrenched."
+		),
+
+	)
+
+/datum/component/construction/mecha/medigax/action(datum/source, atom/used_atom, mob/user)
+	return check_step(used_atom,user)
+
+/datum/component/construction/mecha/medigax/custom_action(obj/item/I, mob/living/user, diff)
+	if(!..())
+		return FALSE
+
+	switch(index)
+		if(1)
+			user.visible_message("[user] connects [parent] hydraulic systems", "<span class='notice'>You connect [parent] hydraulic systems.</span>")
+		if(2)
+			if(diff==FORWARD)
+				user.visible_message("[user] activates [parent] hydraulic systems.", "<span class='notice'>You activate [parent] hydraulic systems.</span>")
+			else
+				user.visible_message("[user] disconnects [parent] hydraulic systems", "<span class='notice'>You disconnect [parent] hydraulic systems.</span>")
+		if(3)
+			if(diff==FORWARD)
+				user.visible_message("[user] adds the wiring to [parent].", "<span class='notice'>You add the wiring to [parent].</span>")
+			else
+				user.visible_message("[user] deactivates [parent] hydraulic systems.", "<span class='notice'>You deactivate [parent] hydraulic systems.</span>")
+		if(4)
+			if(diff==FORWARD)
+				user.visible_message("[user] adjusts the wiring of [parent].", "<span class='notice'>You adjust the wiring of [parent].</span>")
+			else
+				user.visible_message("[user] removes the wiring from [parent].", "<span class='notice'>You remove the wiring from [parent].</span>")
+		if(5)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] into [parent].", "<span class='notice'>You install [I] into [parent].</span>")
+			else
+				user.visible_message("[user] disconnects the wiring of [parent].", "<span class='notice'>You disconnect the wiring of [parent].</span>")
+		if(6)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the mainboard.", "<span class='notice'>You secure the mainboard.</span>")
+			else
+				user.visible_message("[user] removes the central control module from [parent].", "<span class='notice'>You remove the central computer mainboard from [parent].</span>")
+		if(7)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] into [parent].", "<span class='notice'>You install [I] into [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the mainboard.", "<span class='notice'>You unfasten the mainboard.</span>")
+		if(8)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the peripherals control module.", "<span class='notice'>You secure the peripherals control module.</span>")
+			else
+				user.visible_message("[user] removes the peripherals control module from [parent].", "<span class='notice'>You remove the peripherals control module from [parent].</span>")
+		if(9)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] into [parent].", "<span class='notice'>You install [I] into [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the peripherals control module.", "<span class='notice'>You unfasten the peripherals control module.</span>")
+		if(10)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the weapon control module.", "<span class='notice'>You secure the weapon control module.</span>")
+			else
+				user.visible_message("[user] removes the weapon control module from [parent].", "<span class='notice'>You remove the weapon control module from [parent].</span>")
+		if(11)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] to [parent].", "<span class='notice'>You install [I] to [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the weapon control module.", "<span class='notice'>You unfasten the weapon control module.</span>")
+		if(12)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the scanner module.", "<span class='notice'>You secure the scanner module.</span>")
+			else
+				user.visible_message("[user] removes the scanner module from [parent].", "<span class='notice'>You remove the scanner module from [parent].</span>")
+		if(13)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] to [parent].", "<span class='notice'>You install [I] to [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the scanner module.", "<span class='notice'>You unfasten the scanner module.</span>")
+		if(14)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the capacitor.", "<span class='notice'>You secure the capacitor.</span>")
+			else
+				user.visible_message("[user] removes the capacitor from [parent].", "<span class='notice'>You remove the capacitor from [parent].</span>")
+		if(15)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] into [parent].", "<span class='notice'>You install [I] into [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the capacitor.", "<span class='notice'>You unfasten the capacitor.</span>")
+		if(16)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the power cell.", "<span class='notice'>You secure the power cell.</span>")
+			else
+				user.visible_message("[user] pries the power cell from [parent].", "<span class='notice'>You pry the power cell from [parent].</span>")
+		if(17)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs the internal armor layer to [parent].", "<span class='notice'>You install the internal armor layer to [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the power cell.", "<span class='notice'>You unfasten the power cell.</span>")
+		if(18)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the internal armor layer.", "<span class='notice'>You secure the internal armor layer.</span>")
+			else
+				user.visible_message("[user] pries internal armor layer from [parent].", "<span class='notice'>You pry internal armor layer from [parent].</span>")
+		if(19)
+			if(diff==FORWARD)
+				user.visible_message("[user] welds the internal armor layer to [parent].", "<span class='notice'>You weld the internal armor layer to [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the internal armor layer.", "<span class='notice'>You unfasten the internal armor layer.</span>")
+		if(20)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] to [parent].", "<span class='notice'>You install [I] to [parent].</span>")
+			else
+				user.visible_message("[user] cuts the internal armor layer from [parent].", "<span class='notice'>You cut the internal armor layer from [parent].</span>")
+		if(21)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures Gygax Armor Plates.", "<span class='notice'>You secure Medical Gygax Armor Plates.</span>")
+			else
+				user.visible_message("[user] pries Gygax Armor Plates from [parent].", "<span class='notice'>You pry Medical Gygax Armor Plates from [parent].</span>")
+		if(22)
+			if(diff==FORWARD)
+				user.visible_message("[user] welds Gygax Armor Plates to [parent].", "<span class='notice'>You weld Medical Gygax Armor Plates to [parent].</span>")
+			else
+				user.visible_message("[user] unfastens Gygax Armor Plates.", "<span class='notice'>You unfasten  Medical Gygax Armor Plates.</span>")
+	return TRUE
+// End Medigax
+
 /datum/component/construction/unordered/mecha_chassis/firefighter
 	result = /datum/component/construction/mecha/firefighter
 	steps = list(
@@ -136,6 +136,47 @@
 	desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction."
 	icon_state = "gygax_armor"

+///////// Medical Gygax
+
+/obj/item/mecha_parts/chassis/medigax
+	name = "\improper Medical Gygax chassis"
+	construct_type = /datum/component/construction/unordered/mecha_chassis/medigax
+
+/obj/item/mecha_parts/part/medigax_torso
+	name = "\improper Medical Gygax torso"
+	desc = "A torso part of Gygax. Contains power unit, processing core and life support systems."
+	icon_state = "medigax_harness"
+
+/obj/item/mecha_parts/part/medigax_head
+	name = "\improper Medical Gygax head"
+	desc = "A Gygax head. Houses advanced surveillance and targeting sensors."
+	icon_state = "medigax_head"
+
+/obj/item/mecha_parts/part/medigax_left_arm
+	name = "\improper Medical Gygax left arm"
+	desc = "A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
+	icon_state = "medigax_l_arm"
+
+/obj/item/mecha_parts/part/medigax_right_arm
+	name = "\improper Medical Gygax right arm"
+	desc = "A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
+	icon_state = "medigax_r_arm"
+
+/obj/item/mecha_parts/part/medigax_left_leg
+	name = "\improper Medical Gygax left leg"
+	desc = "A Gygax left leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
+	icon_state = "medigax_l_leg"
+
+/obj/item/mecha_parts/part/medigax_right_leg
+	name = "\improper Medical Gygax right leg"
+	desc = "A Gygax right leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
+	icon_state = "medigax_r_leg"
+
+/obj/item/mecha_parts/part/medigax_armor
+	gender = PLURAL
+	name = "\improper Medical Gygax armor plates"
+	desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction."
+	icon_state = "medigax_armor"

 //////////// Durand

@@ -125,6 +125,24 @@
 	name = "\improper Dark Gygax wreckage"
 	icon_state = "darkgygax-broken"

+/obj/structure/mecha_wreckage/medigax
+	name = "\improper Medical Gygax wreckage"
+	icon_state = "medigax-broken"
+
+/obj/structure/mecha_wreckage/medigax/Initialize()
+	. = ..()
+	var/list/parts = list(/obj/item/mecha_parts/part/medigax_torso,
+								/obj/item/mecha_parts/part/medigax_head,
+								/obj/item/mecha_parts/part/medigax_left_arm,
+								/obj/item/mecha_parts/part/medigax_right_arm,
+								/obj/item/mecha_parts/part/medigax_left_leg,
+								/obj/item/mecha_parts/part/medigax_right_leg)
+	for(var/i = 0; i < 2; i++)
+		if(parts.len && prob(40))
+			var/part = pick(parts)
+			welder_salvage += part
+			parts -= part
+
 /obj/structure/mecha_wreckage/marauder
 	name = "\improper Marauder wreckage"
 	icon_state = "marauder-broken"
@@ -0,0 +1,34 @@
+/obj/mecha/medical/medigax
+	desc = "A Gygax with it's actuator overload stripped and a slick white paint scheme, for medical use, These exosuits are developed and produced by Vey-Med. (&copy; All rights reserved)."
+	name = "\improper Medical Gygax"
+	icon_state = "medigax"
+	step_in = 1.75 // a little faster than an odysseus
+	max_temperature = 25000
+	max_integrity = 250
+	wreckage = /obj/structure/mecha_wreckage/odysseus
+	armor = list("melee" = 25, "bullet" = 20, "laser" = 30, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	internal_damage_threshold = 35
+	deflect_chance = 15
+	step_energy_drain = 6
+	infra_luminosity = 6
+
+
+/obj/mecha/medical/medigax/moved_inside(mob/living/carbon/human/H)
+	. = ..()
+	if(.)
+		var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
+		hud.add_hud_to(H)
+
+/obj/mecha/medical/medigax/go_out()
+	if(isliving(occupant))
+		var/mob/living/carbon/human/L = occupant
+		var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
+		hud.remove_hud_from(L)
+	..()
+
+/obj/mecha/medical/medigax/mmi_moved_inside(obj/item/mmi/mmi_as_oc, mob/user)
+	. = ..()
+	if(.)
+		var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
+		var/mob/living/brain/B = mmi_as_oc.brainmob
+		hud.add_hud_to(B)
@@ -88,6 +88,7 @@
 			var/obj/effect/decal/cleanable/C = locate() in target
 			qdel(C)
 			target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
+			target.clean_blood()
 			SEND_SIGNAL(target, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
 			target.wash_cream()
 	return
@@ -180,4 +181,4 @@
 	name = "Canned Laughter"
 	desc = "Just looking at this makes you want to giggle."
 	icon_state = "laughter"
-	list_reagents = list(/datum/reagent/consumable/laughter = 50)
+	list_reagents = list(/datum/reagent/consumable/laughter = 50)
@@ -103,6 +103,8 @@
 	take_damage(400, BRUTE, "melee", 0, get_dir(src, B))

 /obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime
+	if(SEND_SIGNAL(src, COMSIG_OBJ_ATTACK_GENERIC, user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration) & COMPONENT_STOP_GENERIC_ATTACK)
+		return FALSE
 	user.do_attack_animation(src)
 	user.changeNext_move(CLICK_CD_MELEE)
 	return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration)
@@ -134,6 +134,8 @@
 	if(!ishuman(pushed_mob))
 		return
 	var/mob/living/carbon/human/H = pushed_mob
+	if(iscatperson(H))
+		H.emote("nya")
 	SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "table", /datum/mood_event/table)

 /obj/structure/table/shove_act(mob/living/target, mob/living/user)
@@ -205,7 +205,7 @@
 			if(floor_tile)
 				if(prob(70))
 					remove_tile()
-			else if(prob(50))
+			else if(prob(50) && (/turf/open/space in baseturfs))
 				ReplaceWithLattice()

 /turf/open/floor/narsie_act(force, ignore_mobs, probability = 20)
@@ -257,6 +257,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		return
 	if (active)
 		return //prevent the AI from activating an already active doomsday
+	if (owner_AI.shunted)
+		return //prevent AI from activating doomsday while shunted.
 	active = TRUE
 	set_us_up_the_bomb(owner)

@@ -475,43 +475,26 @@

 /obj/effect/spawner/lootdrop/snowdin/dungeonlite
 	name = "dungeon lite"
-	loot = list(/obj/item/melee/classic_baton = 11,
-				/obj/item/melee/classic_baton/telescopic = 12,
-				/obj/item/book/granter/spell/smoke = 10,
+	loot = list(/obj/item/book/granter/spell/smoke = 10,
 				/obj/item/book/granter/spell/blind = 10,
 				/obj/item/storage/firstaid/regular = 45,
 				/obj/item/storage/firstaid/toxin = 35,
 				/obj/item/storage/firstaid/brute = 27,
 				/obj/item/storage/firstaid/fire = 27,
 				/obj/item/storage/toolbox/syndicate = 12,
-				/obj/item/grenade/plastic/c4 = 7,
 				/obj/item/grenade/clusterbuster/smoke = 15,
 				/obj/item/clothing/under/chameleon = 13,
-				/obj/item/clothing/shoes/chameleon/noslip = 10,
 				/obj/item/borg/upgrade/ddrill = 3)

 /obj/effect/spawner/lootdrop/snowdin/dungeonmid
 	name = "dungeon mid"
-	loot = list(/obj/item/defibrillator/compact = 6,
-				/obj/item/storage/firstaid/tactical = 35,
-				/obj/item/shield/energy = 6,
-				/obj/item/shield/riot/tele = 12,
-				/obj/item/dnainjector/lasereyesmut = 7,
-				/obj/item/gun/magic/wand/fireball/inert = 3,
+	loot = list(/obj/item/shield/riot = 12,
 				/obj/item/pneumatic_cannon = 15,
-				/obj/item/melee/transforming/energy/sword = 7,
-				/obj/item/book/granter/spell/knock = 15,
-				/obj/item/book/granter/spell/summonitem = 20,
-				/obj/item/book/granter/spell/forcewall = 17,
 				/obj/item/storage/backpack/holding = 12,
-				/obj/item/grenade/spawnergrenade/manhacks = 6,
-				/obj/item/grenade/spawnergrenade/spesscarp = 7,
-				/obj/item/grenade/clusterbuster/inferno = 3,
 				/obj/item/stack/sheet/mineral/diamond{amount = 15} = 10,
 				/obj/item/stack/sheet/mineral/uranium{amount = 15} = 10,
 				/obj/item/stack/sheet/mineral/plasma{amount = 15} = 10,
 				/obj/item/stack/sheet/mineral/gold{amount = 15} = 10,
-				/obj/item/book/granter/spell/barnyard = 4,
 				/obj/item/pickaxe/drill/diamonddrill = 6,
 				/obj/item/borg/upgrade/vtec = 7,
 				/obj/item/borg/upgrade/disablercooler = 7)
@@ -519,21 +502,12 @@

 /obj/effect/spawner/lootdrop/snowdin/dungeonheavy
 	name = "dungeon heavy"
-	loot = list(/obj/item/twohanded/singularityhammer = 25,
-				/obj/item/twohanded/mjollnir = 10,
-				/obj/item/twohanded/fireaxe = 25,
+	loot = list(/obj/item/twohanded/fireaxe = 25,
 				/obj/item/organ/brain/alien = 17,
-				/obj/item/twohanded/dualsaber = 15,
-				/obj/item/organ/heart/demon = 7,
-				/obj/item/gun/ballistic/automatic/c20r/unrestricted = 16,
-				/obj/item/gun/magic/wand/resurrection/inert = 15,
-				/obj/item/gun/magic/wand/resurrection = 10,
-				/obj/item/uplink/old = 2,
-				/obj/item/book/granter/spell/charge = 12,
-				/obj/item/grenade/clusterbuster/spawner_manhacks = 15,
-				/obj/item/book/granter/spell/fireball = 10,
+				/obj/item/organ/heart/cursed = 7,
+				/obj/item/book/granter/spell/forcewall = 17,
+				/obj/item/gun/magic/wand/fireball/inert = 3,
 				/obj/item/pickaxe/drill/jackhammer = 30,
-				/obj/item/borg/upgrade/syndicate = 13,
 				/obj/item/borg/upgrade/selfrepair = 17)

 /obj/effect/spawner/lootdrop/snowdin/dungeonmisc
@@ -1,51 +0,0 @@
-//Spacebattle Areas
-
-/area/awaymission/spacebattle
-	name = "Space Battle"
-	icon_state = "awaycontent1"
-	requires_power = FALSE
-
-/area/awaymission/spacebattle/cruiser
-	name = "Nanotrasen Cruiser"
-	icon_state = "awaycontent2"
-
-/area/awaymission/spacebattle/syndicate1
-	name = "Syndicate Assault Ship 1"
-	icon_state = "awaycontent3"
-
-/area/awaymission/spacebattle/syndicate2
-	name = "Syndicate Assault Ship 2"
-	icon_state = "awaycontent4"
-
-/area/awaymission/spacebattle/syndicate3
-	name = "Syndicate Assault Ship 3"
-	icon_state = "awaycontent5"
-
-/area/awaymission/spacebattle/syndicate4
-	name = "Syndicate War Sphere 1"
-	icon_state = "awaycontent6"
-
-/area/awaymission/spacebattle/syndicate5
-	name = "Syndicate War Sphere 2"
-	icon_state = "awaycontent7"
-
-/area/awaymission/spacebattle/syndicate6
-	name = "Syndicate War Sphere 3"
-	icon_state = "awaycontent8"
-
-/area/awaymission/spacebattle/syndicate7
-	name = "Syndicate Fighter"
-	icon_state = "awaycontent9"
-
-/area/awaymission/spacebattle/secret
-	name = "Hidden Chamber"
-	icon_state = "awaycontent10"
-
-/mob/living/simple_animal/hostile/syndicate/ranged/spacebattle
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
-				/obj/item/gun/ballistic/automatic/c20r,
-				/obj/item/shield/energy)
-
-/mob/living/simple_animal/hostile/syndicate/melee/spacebattle
-	deathmessage = "falls limp as they release their grip from the energy weapons, activating their self-destruct function!"
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
@@ -437,3 +437,12 @@
 	item_state = "hunter"
 	armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+
+/obj/item/clothing/head/kepi
+	name = "kepi"
+	desc = "A white cap with visor. Oui oui, mon capitane!"
+	icon_state = "kepi"
+
+/obj/item/clothing/head/kepi/old
+	icon_state = "kepi_old"
+	desc = "A flat, white circular cap with a visor, that demands some honor from it's wearer."
@@ -85,8 +85,8 @@
 /datum/round_event_control/stray_cargo/syndicate
 	name = "Stray Syndicate Cargo Pod"
 	typepath = /datum/round_event/stray_cargo/syndicate
-	weight = 6
-	max_occurrences = 1
+	weight = 0
+	max_occurrences = 0
 	earliest_start = 30 MINUTES

 /datum/round_event/stray_cargo/syndicate
@@ -1,7 +1,3 @@
-/mob/living/carbon/proc/handle_dreams()
-	if(prob(10) && !dreaming)
-		dream()
-
 /mob/living/carbon/proc/dream()
 	set waitfor = FALSE
 	var/list/dream_fragments = list()
@@ -303,12 +303,12 @@ All foods are distributed among various categories. Use common sense.
 	var/obj/item/result
 	if(cooked_type)
 		result = new cooked_type(T)
-		//if the result is food, set its food quality to the original food item's quality
-		if(isfood(result))
-			var/obj/item/reagent_containers/food/food_output = result
-			food_output.adjust_food_quality(food_quality + M.quality_increase)
 		if(istype(M))
 			initialize_cooked_food(result, M.efficiency)
+			//if the result is food, set its food quality to the original food item's quality
+			if(isfood(result))
+				var/obj/item/reagent_containers/food/food_output = result
+				food_output.adjust_food_quality(food_quality + M.quality_increase)
 		else
 			initialize_cooked_food(result, 1)
 		SSblackbox.record_feedback("tally", "food_made", 1, result.type)
@@ -468,6 +468,7 @@
 			if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright
 				H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6)
 				H.update_body()
+				H.update_hair()
 			else
 				to_chat(H, "<span class='notice'>Invalid color. Your color is not bright enough.</span>")
 	else if(select_alteration == "Hair Style")
@@ -1,8 +1,8 @@
 /mob/living/carbon/BiologicalLife(seconds, times_fired)
-	if(stat == DEAD)
-		return FALSE
 	//Reagent processing needs to come before breathing, to prevent edge cases.
 	handle_organs()
+	if(stat == DEAD)
+		return FALSE
 	if(!(. = ..()))
 		return
 	handle_blood()
@@ -1136,6 +1136,7 @@
 		return
 	if(!is_station_level(z))
 		return
+	malf.ShutOffDoomsdayDevice()
 	occupier = new /mob/living/silicon/ai(src, malf.laws, malf) //DEAR GOD WHY?	//IKR????
 	occupier.adjustOxyLoss(malf.getOxyLoss())
 	if(!findtext(occupier.name, "APC Copy"))
@@ -228,6 +228,11 @@
 	var/last_chrg = inputting
 	var/last_onln = outputting

+	//check for self-recharging cells in stock parts and use them to self-charge
+	for(var/obj/item/stock_parts/cell/C in component_parts)
+		if(C.self_recharge)
+			charge += min(capacity-charge, C.chargerate) // If capacity-charge is smaller than the attempted charge rate, this avoids overcharging
+
 	//inputting
 	if(terminal && input_attempt)
 		input_available = terminal.surplus()
@@ -387,7 +387,8 @@
 			return FALSE

 		if("analyze")
-			var/datum/reagent/R = GLOB.name2reagent[params["id"]]
+			var/reagent = GLOB.name2reagent[params["id"]]
+			var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
 			if(R)
 				var/state = "Unknown"
 				if(initial(R.reagent_state) == 1)
@@ -400,13 +401,9 @@
 				var/T = initial(R.metabolization_rate) * (60 / P)
 				if(istype(R, /datum/reagent/fermi))
 					fermianalyze = TRUE
-					var/datum/chemical_reaction/Rcr = get_chemical_reaction(R)
+					var/datum/chemical_reaction/Rcr = get_chemical_reaction(reagent)
 					var/pHpeakCache = (Rcr.OptimalpHMin + Rcr.OptimalpHMax)/2
-					var/datum/reagent/targetReagent = reagents.has_reagent(R)
-
-					if(!targetReagent)
-						CRASH("Tried to find a reagent that doesn't exist in the chem_master!")
-					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold), "purityF" = targetReagent.purity, "inverseRatioF" = initial(R.inverse_chem_val), "purityE" = initial(Rcr.PurityMin), "minTemp" = initial(Rcr.OptimalTempMin), "maxTemp" = initial(Rcr.OptimalTempMax), "eTemp" = initial(Rcr.ExplodeTemp), "pHpeak" = pHpeakCache)
+					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold), "purityF" = R.purity, "inverseRatioF" = initial(R.inverse_chem_val), "purityE" = initial(Rcr.PurityMin), "minTemp" = initial(Rcr.OptimalTempMin), "maxTemp" = initial(Rcr.OptimalTempMax), "eTemp" = initial(Rcr.ExplodeTemp), "pHpeak" = pHpeakCache)
 				else
 					fermianalyze = FALSE
 					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold))
@@ -386,6 +386,20 @@
 /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
 	list_reagents = list()

+/obj/item/reagent_containers/glass/beaker/waterbottle/wataur
+	name = "Bottled Wataur"
+	desc = "Finally, a bottle as proportionate as you."
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "wataur"
+	custom_materials = list(/datum/material/plastic=0)
+	list_reagents = list(/datum/reagent/water = 100)
+	volume = 100
+	amount_per_transfer_from_this = 20
+	possible_transfer_amounts = list(5,10,15,20,25,30,50, 100)
+	container_flags = TEMP_WEAK|APTFT_ALTCLICK|APTFT_VERB
+	container_HP = 1
+	cached_icon = "wataur"
+
 /obj/item/reagent_containers/glass/get_belt_overlay()
 	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle")

@@ -264,6 +264,79 @@
 	construction_time = 600
 	category = list("Gygax")

+//Medical Gygax
+/datum/design/medigax_chassis
+	name = "Exosuit Chassis (\"Medical Gygax\")"
+	id = "medigax_chassis"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/chassis/medigax
+	materials = list(/datum/material/iron=20000)
+	construction_time = 100
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_torso
+	name = "Exosuit Torso (\"Medical Gygax\")"
+	id = "medigax_torso"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_torso
+	materials = list(/datum/material/iron=20000,/datum/material/glass=10000,/datum/material/diamond=2000)
+	construction_time = 300
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_head
+	name = "Exosuit Head (\"Medical Gygax\")"
+	id = "medigax_head"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_head
+	materials = list(/datum/material/iron=10000,/datum/material/glass=5000, /datum/material/diamond=2000)
+	construction_time = 200
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_left_arm
+	name = "Exosuit Left Arm (\"Medical Gygax\")"
+	id = "medigax_left_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_left_arm
+	materials = list(/datum/material/iron=15000, /datum/material/diamond=1000)
+	construction_time = 200
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_right_arm
+	name = "Exosuit Right Arm (\"Medical Gygax\")"
+	id = "medigax_right_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_right_arm
+	materials = list(/datum/material/iron=15000, /datum/material/diamond=1000)
+	construction_time = 200
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_left_leg
+	name = "Exosuit Left Leg (\"Medical Gygax\")"
+	id = "medigax_left_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_left_leg
+	materials = list(/datum/material/iron=15000, /datum/material/diamond=2000)
+	construction_time = 200
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_right_leg
+	name = "Exosuit Right Leg (\"Medical Gygax\")"
+	id = "medigax_right_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_right_leg
+	materials = list(/datum/material/iron=15000, /datum/material/diamond=2000)
+	construction_time = 200
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_armor
+	name = "Exosuit Armor (\"Medical Gygax\")"
+	id = "medigax_armor"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_armor
+	materials = list(/datum/material/iron=15000,/datum/material/diamond=10000,/datum/material/titanium=10000)
+	construction_time = 600
+	category = list("Medical-Spec Gygax")
+
 //Durand
 /datum/design/durand_chassis
 	name = "Exosuit Chassis (\"Durand\")"
@@ -42,6 +42,14 @@
 	"gygax_peri", "gygax_targ", "gygax_armor")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)

+/datum/techweb_node/medigax
+	id = "mech_medigax"
+	display_name = "EXOSUIT: Medical-Spec Gygax"
+	description = "Medical-Spec Gygax designs"
+	prereq_ids = list("mech_gygax", "mecha_odysseus")
+	design_ids = list("medigax_chassis", "medigax_torso", "medigax_head", "medigax_left_arm", "medigax_right_arm", "medigax_left_leg", "medigax_right_leg", "medigax_armor")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
+
 /datum/techweb_node/durand
 	id = "mech_durand"
 	display_name = "EXOSUIT: Durand"
@@ -193,6 +193,8 @@
 			var/datum/uplink_item/I = uplink_items[category][item]
 			if(src == I || !I.item)
 				continue
+			if(istype(I, /datum/uplink_item/bundles_TC/reroll)) //oops!
+				continue
 			if(U.telecrystals < I.cost)
 				continue
 			if(I.limited_stock == 0)
@@ -15,7 +15,8 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
 					/obj/item/reagent_containers/glass/beaker/waterbottle = 10)
 	contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
-					/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6)
+					/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6,
+					/obj/item/reagent_containers/glass/beaker/waterbottle/wataur = 2)
 	premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,
 					/obj/item/reagent_containers/food/drinks/soda_cans/air = 1,
 					/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1,
@@ -7,16 +7,13 @@
 #Do NOT tick the maps during compile -- the game uses this list to decide which map to load. Ticking the maps will result in them ALL being loaded at once.
 #DO tick the associated code file for the away mission you are enabling. Otherwise, the map will be trying to reference objects which do not exist, which will cause runtime errors!

-#_maps/RandomZLevels/away_mission/blackmarketpackers.dmm
-#_maps/RandomZLevels/away_mission/spacebattle.dmm
 #_maps/RandomZLevels/away_mission/TheBeach.dmm
 #_maps/RandomZLevels/away_mission/Academy.dmm
 #_maps/RandomZLevels/away_mission/wildwest.dmm
 #_maps/RandomZLevels/away_mission/challenge.dmm
-#_maps/RandomZLevels/away_mission/centcomAway.dmm
 #_maps/RandomZLevels/away_mission/moonoutpost19.dmm
 #_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
 #_maps/RandomZLevels/away_mission/caves.dmm
 #_maps/RandomZLevels/away_mission/snowdin.dmm
 #_maps/RandomZLevels/away_mission/research.dmm
-#_maps/RandomZLevels/away_mission/SnowCabin.dmm
+#_maps/RandomZLevels/away_mission/SnowCabin.dmm
@@ -50,6 +50,65 @@
 		-->
 		<div class="commit sansserif">

+			<h2 class="date">26 June 2020</h2>
+			<h3 class="author">Ghommie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Snore spam.</li>
+				<li class="bugfix">Hostile mobs shouldn't hit their original spawner structures or thoses of the same faction.</li>
+			</ul>
+			<h3 class="author">silicons updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">soap cleans blood again</li>
+			</ul>
+
+			<h2 class="date">25 June 2020</h2>
+			<h3 class="author">Anonymous updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added kepi and orvilike kepi. Available through loadout.</li>
+			</ul>
+			<h3 class="author">Detective Google updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Medigygax</li>
+			</ul>
+			<h3 class="author">Detective-Google updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">malf AIs can no longer yeet the station while shunted</li>
+				<li class="bugfix">SMESes can now properly use self charging cells</li>
+				<li class="rscadd">ghosts now show up when the round ends</li>
+				<li class="balance">away missions</li>
+			</ul>
+			<h3 class="author">Funce updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Mentor SQL queries are now deleted properly.</li>
+			</ul>
+			<h3 class="author">Linzolle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">analyze function on chem master is no longer broken</li>
+				<li class="bugfix">organs now decay inside dead bodies again</li>
+			</ul>
+			<h3 class="author">dapnee updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">wataur bottle item</li>
+				<li class="imageadd">wataur bottle and overlay</li>
+			</ul>
+
+			<h2 class="date">24 June 2020</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">Choosing a random item in your uplink will no longer sometimes reroll your contract.</li>
+				<li class="rscdel">Syndicate crate event cannot fire as a random event anymore.</li>
+			</ul>
+			<h3 class="author">Detective-Google updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">singulos no longer succ infinite rods out of the ice</li>
+				<li class="bugfix">one of the directions for the diag hudpatch was blu instead of orang</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">bonfires/grills no longer produce infinite quantities of food</li>
+				<li class="bugfix">slime's alter form ability now updates their hair colour when changing their body colour</li>
+			</ul>
+
 			<h2 class="date">22 June 2020</h2>
 			<h3 class="author">Ghommie (porting PRs by zxaber, Ryll-Ryll, AnturK) updated:</h3>
 			<ul class="changes bgimages16">
@@ -26047,3 +26047,40 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
      signal has been added that can prevent either from ticking.
  shellspeed1:
  - rscadd: Adds IV bags.
+2020-06-24:
+  DeltaFire15:
+  - balance: Choosing a random item in your uplink will no longer sometimes reroll
+      your contract.
+  - rscdel: Syndicate crate event cannot fire as a random event anymore.
+  Detective-Google:
+  - bugfix: singulos no longer succ infinite rods out of the ice
+  - bugfix: one of the directions for the diag hudpatch was blu instead of orang
+  timothyteakettle:
+  - bugfix: bonfires/grills no longer produce infinite quantities of food
+  - bugfix: slime's alter form ability now updates their hair colour when changing
+      their body colour
+2020-06-25:
+  Anonymous:
+  - rscadd: Added kepi and orvilike kepi. Available through loadout.
+  Detective Google:
+  - rscadd: Medigygax
+  Detective-Google:
+  - bugfix: malf AIs can no longer yeet the station while shunted
+  - bugfix: SMESes can now properly use self charging cells
+  - rscadd: ghosts now show up when the round ends
+  - balance: away missions
+  Funce:
+  - bugfix: Mentor SQL queries are now deleted properly.
+  Linzolle:
+  - bugfix: analyze function on chem master is no longer broken
+  - bugfix: organs now decay inside dead bodies again
+  dapnee:
+  - rscadd: wataur bottle item
+  - imageadd: wataur bottle and overlay
+2020-06-26:
+  Ghommie:
+  - bugfix: Snore spam.
+  - bugfix: Hostile mobs shouldn't hit their original spawner structures or thoses
+      of the same faction.
+  silicons:
+  - bugfix: soap cleans blood again
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes: 
+  - rscadd: "felinids now nya when tabled"
@@ -98,6 +98,46 @@
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")

+// orvilike "original" kepi
+/datum/gear/orvkepicom
+	name = "Federation Kepi, command"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi/command
+	restricted_desc = "Heads of Staff"
+	restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
+
+/datum/gear/orvkepiops
+	name = "Federation Kepi, ops/sec"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi/engsec
+	restricted_desc = "Engineering, Security and Cargo"
+	restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster")
+
+/datum/gear/orvkepimedsci
+	name = "Federation Kepi, medsci"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi/medsci
+	restricted_desc = "Medical and Science"
+	restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist")
+
+/datum/gear/orvkepisrv
+	name = "Federation Kepi, service"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi/service
+	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
+	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
+
+/datum/gear/orvkepiass
+	name = "Federation Kepi, assistant"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi
+	restricted_roles = list("Assistant")
+
 /*Commenting out Until next Christmas or made automatic
 /datum/gear/santahatr
 	name = "Red Santa Hat"
@@ -137,3 +177,9 @@
 	path = /obj/item/clothing/head/cowboyhat/sec
 	restricted_desc = "Security"
 	restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
+
+// Misc
+/datum/gear/wkepi
+	name = "white kepi"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi
@@ -162,3 +162,21 @@
 /obj/item/clothing/head/caphat/formal/fedcover/black
 		icon_state = "fedcapblack"
 		item_state = "fedcapblack"
+
+//orvilike caps
+/obj/item/clothing/head/kepi/orvi
+	name = "\improper Federation kepi"
+	desc = "A visored cap worn by all officers since 2550s."
+	icon_state = "kepi_ass"
+
+/obj/item/clothing/head/kepi/orvi/command
+	icon_state = "kepi_com"
+
+/obj/item/clothing/head/kepi/orvi/engsec
+	icon_state = "kepi_ops"
+
+/obj/item/clothing/head/kepi/orvi/medsci
+	icon_state = "kepi_medsci"
+
+/obj/item/clothing/head/kepi/orvi/service
+	icon_state = "kepi_srv"
@@ -33,11 +33,14 @@
 			var/datum/DBQuery/query_memocheck = SSdbcore.NewQuery("SELECT ckey FROM [format_table_name("mentor_memo")] WHERE ckey = '[sql_ckey]'")
 			if(!query_memocheck.Execute())
 				var/err = query_memocheck.ErrorMsg()
+				qdel(query_memocheck)
 				log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n")
 				return
 			if(query_memocheck.NextRow())
+				qdel(query_memocheck)
 				to_chat(src, "You already have set a memo.")
 				return
+			qdel(query_memocheck)
 			var/memotext = input(src,"Write your Memo","Memo") as message
 			if(!memotext)
 				return
@@ -46,20 +49,24 @@
 			var/datum/DBQuery/query_memoadd = SSdbcore.NewQuery("INSERT INTO [format_table_name("mentor_memo")] (ckey, memotext, timestamp) VALUES ('[sql_ckey]', '[memotext]', '[timestamp]')")
 			if(!query_memoadd.Execute())
 				var/err = query_memoadd.ErrorMsg()
+				qdel(query_memoadd)
 				log_game("SQL ERROR adding new memo. Error : \[[err]\]\n")
 				return
 			log_admin("[key_name(src)] has set a mentor memo: [memotext]")
 			message_admins("[key_name_admin(src)] has set a mentor memo:<br>[memotext]")
+			qdel(query_memoadd)
 		if("Edit")
 			var/datum/DBQuery/query_memolist = SSdbcore.NewQuery("SELECT ckey FROM [format_table_name("mentor_memo")]")
 			if(!query_memolist.Execute())
 				var/err = query_memolist.ErrorMsg()
+				qdel(query_memolist)
 				log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n")
 				return
 			var/list/memolist = list()
 			while(query_memolist.NextRow())
 				var/lkey = query_memolist.item[1]
 				memolist += "[lkey]"
+			qdel(query_memolist)
 			if(!memolist.len)
 				to_chat(src, "No memos found in database.")
 				return
@@ -70,10 +77,12 @@
 			var/datum/DBQuery/query_memofind = SSdbcore.NewQuery("SELECT memotext FROM [format_table_name("mentor_memo")] WHERE ckey = '[target_sql_ckey]'")
 			if(!query_memofind.Execute())
 				var/err = query_memofind.ErrorMsg()
+				qdel(query_memofind)
 				log_game("SQL ERROR obtaining memotext from memo table. Error : \[[err]\]\n")
 				return
 			if(query_memofind.NextRow())
 				var/old_memo = query_memofind.item[1]
+				qdel(query_memofind)
 				var/new_memo = input("Input new memo", "New Memo", "[old_memo]", null) as message
 				if(!new_memo)
 					return
@@ -83,6 +92,7 @@
 				var/datum/DBQuery/update_query = SSdbcore.NewQuery("UPDATE [format_table_name("mentor_memo")] SET memotext = '[new_memo]', last_editor = '[sql_ckey]', edits = CONCAT(IFNULL(edits,''),'[edit_text]') WHERE ckey = '[target_sql_ckey]'")
 				if(!update_query.Execute())
 					var/err = update_query.ErrorMsg()
+					qdel(update_query)
 					log_game("SQL ERROR editing memo. Error : \[[err]\]\n")
 					return
 				if(target_sql_ckey == sql_ckey)
@@ -91,10 +101,14 @@
 				else
 					log_admin("[key_name(src)] has edited [target_sql_ckey]'s mentor memo from [old_memo] to [new_memo]")
 					message_admins("[key_name_admin(src)] has edited [target_sql_ckey]'s mentor memo from<br>[old_memo]<br>to<br>[new_memo]")
+				qdel(update_query)
+			else
+				qdel(query_memofind)
 		if("Show")
 			var/datum/DBQuery/query_memoshow = SSdbcore.NewQuery("SELECT ckey, memotext, timestamp, last_editor FROM [format_table_name("mentor_memo")]")
 			if(!query_memoshow.Execute())
 				var/err = query_memoshow.ErrorMsg()
+				qdel(query_memoshow)
 				log_game("SQL ERROR obtaining ckey, memotext, timestamp, last_editor from memo table. Error : \[[err]\]\n")
 				return
 			var/output = null
@@ -107,6 +121,7 @@
 				if(last_editor)
 					output += "<br><span class='memoedit'>Last edit by [last_editor] <A href='?_src_=holder;mentormemoeditlist=[ckey]'>(Click here to see edit log)</A></span>"
 				output += "<br>[memotext]</span><br>"
+			qdel(query_memoshow)
 			if(!output)
 				to_chat(src, "No memos found in database.")
 				return
@@ -115,12 +130,14 @@
 			var/datum/DBQuery/query_memodellist = SSdbcore.NewQuery("SELECT ckey FROM [format_table_name("mentor_memo")]")
 			if(!query_memodellist.Execute())
 				var/err = query_memodellist.ErrorMsg()
+				qdel(query_memodellist)
 				log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n")
 				return
 			var/list/memolist = list()
 			while(query_memodellist.NextRow())
 				var/ckey = query_memodellist.item[1]
 				memolist += "[ckey]"
+			qdel(query_memodellist)
 			if(!memolist.len)
 				to_chat(src, "No memos found in database.")
 				return
@@ -131,6 +148,7 @@
 			var/datum/DBQuery/query_memodel = SSdbcore.NewQuery("DELETE FROM [format_table_name("memo")] WHERE ckey = '[target_sql_ckey]'")
 			if(!query_memodel.Execute())
 				var/err = query_memodel.ErrorMsg()
+				qdel(query_memodel)
 				log_game("SQL ERROR removing memo. Error : \[[err]\]\n")
 				return
 			if(target_sql_ckey == sql_ckey)
@@ -138,4 +156,4 @@
 				message_admins("[key_name_admin(src)] has removed their mentor memo.")
 			else
 				log_admin("[key_name(src)] has removed [target_sql_ckey]'s mentor memo.")
-				message_admins("[key_name_admin(src)] has removed [target_sql_ckey]'s mentor memo.")
+				message_admins("[key_name_admin(src)] has removed [target_sql_ckey]'s mentor memo.")
@@ -877,6 +877,7 @@
 #include "code\game\mecha\equipment\weapons\mecha_ammo.dm"
 #include "code\game\mecha\equipment\weapons\weapons.dm"
 #include "code\game\mecha\medical\medical.dm"
+#include "code\game\mecha\medical\medigax.dm"
 #include "code\game\mecha\medical\odysseus.dm"
 #include "code\game\mecha\working\ripley.dm"
 #include "code\game\mecha\working\working.dm"
@@ -1710,7 +1711,6 @@
 #include "code\modules\awaymissions\mission_code\murderdome.dm"
 #include "code\modules\awaymissions\mission_code\research.dm"
 #include "code\modules\awaymissions\mission_code\snowdin.dm"
-#include "code\modules\awaymissions\mission_code\spacebattle.dm"
 #include "code\modules\awaymissions\mission_code\stationCollision.dm"
 #include "code\modules\awaymissions\mission_code\undergroundoutpost45.dm"
 #include "code\modules\awaymissions\mission_code\wildwest.dm"