Aggregate changes from Scav.

maps/_map_include.dm

@@ -1,4 +1,4 @@
 /*
 	This is a dummy file to act as a marker point for dm.sh to insert its maps at.
 	DO NOT MOVE, REMOVE OR RENAME THIS FILE WITHOUT FIXING THE SCRIPT OR THINGS WILL BREAK
-*/
+*/

maps/away/bearcat/bearcat-1.dmm

@@ -894,6 +894,7 @@
 "bX" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/item/frame/light/small,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
 /turf/floor/usedup,
 /area/ship/scrap/broken2)
 "bY" = (
@@ -908,6 +909,7 @@
 /obj/machinery/power/apc/derelict{
 	dir = 1
 	},
+/obj/structure/closet/crate/uranium,
 /turf/floor/usedup,
 /area/ship/scrap/broken2)
 "bZ" = (
@@ -1624,6 +1626,8 @@
 /obj/item/clothing/glasses/welding,
 /obj/item/stack/cable_coil,
 /obj/item/stack/cable_coil,
+/obj/item/stack/material/sheet/mapped/steel/fifty,
+/obj/item/stack/material/sheet/mapped/steel/fifty,
 /turf/floor/tiled/usedup,
 /area/ship/scrap/broken1)
 "dy" = (
@@ -1977,9 +1981,7 @@
 /turf/floor/usedup,
 /area/ship/scrap/maintenance/storage)
 "ej" = (
-/obj/structure/rack,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/clothing/mask/breath,
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/floor/usedup,
 /area/ship/scrap/maintenance/eva)
 "ek" = (
@@ -1991,6 +1993,8 @@
 /obj/structure/rack,
 /obj/item/tank/jetpack/oxygen,
 /obj/item/clothing/mask/breath,
+/obj/item/tank/jetpack/oxygen,
+/obj/item/clothing/mask/breath,
 /turf/floor/usedup,
 /area/ship/scrap/maintenance/eva)
 "el" = (
@@ -2393,6 +2397,9 @@
 /obj/item/stack/material/pane/mapped/glass/fifty,
 /obj/item/stack/material/pane/mapped/rglass/fifty,
 /obj/item/stack/material/sheet/reinforced/mapped/fiberglass/fifty,
+/obj/item/stack/material/sheet/mapped/steel/fifty,
+/obj/item/stack/material/sheet/mapped/steel/fifty,
+/obj/item/stack/material/sheet/reinforced/mapped/plasteel/fifty,
 /turf/floor/tiled/usedup,
 /area/ship/scrap/maintenance/storage)
 "eT" = (
@@ -2417,6 +2424,7 @@
 "eW" = (
 /obj/machinery/suit_cycler,
 /obj/machinery/light/small,
+/obj/item/clothing/shoes/magboots,
 /turf/floor/tiled/usedup,
 /area/ship/scrap/maintenance/eva)
 "eX" = (
@@ -2426,6 +2434,7 @@
 	pixel_x = 24;
 	req_access = newlist()
 	},
+/obj/item/clothing/shoes/magboots,
 /turf/floor/tiled/usedup,
 /area/ship/scrap/maintenance/eva)
 "eY" = (

maps/away/bearcat/bearcat-2.dmm

@@ -116,7 +116,8 @@
 /area/ship/scrap/comms)
 "as" = (
 /obj/machinery/door/blast/regular{
-	id_tag = "sensor"
+	id_tag = "sensor";
+	dir = 4
 	},
 /turf/floor/usedup,
 /area/ship/scrap/comms)
@@ -490,6 +491,7 @@
 /obj/item/chems/drinks/glass2/coffeecup/one,
 /obj/item/tank/oxygen,
 /obj/item/clothing/mask/breath/emergency,
+/obj/item/flashlight,
 /turf/floor/wood,
 /area/ship/scrap/command/captain)
 "bd" = (
@@ -1175,6 +1177,7 @@
 	},
 /obj/item/plate/tray,
 /obj/item/circular_saw,
+/obj/item/flashlight/lamp,
 /turf/floor/tiled/usedup,
 /area/ship/scrap/crew/saloon)
 "cz" = (
@@ -1202,16 +1205,9 @@
 /turf/floor/tiled/usedup,
 /area/ship/scrap/crew/cryo)
 "cE" = (
-/obj/structure/window/reinforced/tinted{
-	dir = 4;
-	icon_state = "twindow"
-	},
 /obj/structure/hygiene/shower{
 	dir = 4
 	},
-/obj/structure/window/reinforced/tinted{
-	dir = 1
-	},
 /obj/item/soap,
 /obj/structure/curtain/open/shower,
 /obj/effect/floor_decal/corner/white/diagonal,
@@ -1223,17 +1219,6 @@
 	icon_state = "bulb1"
 	},
 /obj/structure/hygiene/toilet,
-/obj/structure/window/reinforced/tinted{
-	dir = 1
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 4;
-	icon_state = "twindow"
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 8;
-	icon_state = "twindow"
-	},
 /obj/effect/decal/cleanable/dirt/visible,
 /obj/effect/floor_decal/corner/white/diagonal,
 /turf/floor/tiled/usedup,
@@ -1287,6 +1272,10 @@
 /obj/random/voidsuit,
 /obj/random/voidsuit,
 /obj/random/voidsuit,
+/obj/item/clothing/head/helmet/space/void/security,
+/obj/item/clothing/suit/space/void/security,
+/obj/item/clothing/head/helmet/space/void/security,
+/obj/item/clothing/suit/space/void/security,
 /turf/floor/tiled/usedup,
 /area/ship/scrap/crew/saloon)
 "cM" = (
@@ -1532,11 +1521,6 @@
 /obj/structure/hygiene/shower{
 	dir = 4
 	},
-/obj/structure/window/reinforced/tinted{
-	dir = 4;
-	icon_state = "twindow"
-	},
-/obj/structure/window/reinforced/tinted,
 /obj/structure/curtain/open/shower,
 /obj/effect/floor_decal/corner/white/diagonal,
 /turf/floor/tiled/usedup,
@@ -1545,15 +1529,6 @@
 /obj/structure/hygiene/toilet{
 	dir = 1
 	},
-/obj/structure/window/reinforced/tinted,
-/obj/structure/window/reinforced/tinted{
-	dir = 4;
-	icon_state = "twindow"
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 8;
-	icon_state = "twindow"
-	},
 /obj/effect/decal/cleanable/dirt/visible,
 /obj/effect/floor_decal/corner/white/diagonal,
 /turf/floor/tiled/usedup,
@@ -1562,15 +1537,6 @@
 /obj/structure/hygiene/toilet{
 	dir = 1
 	},
-/obj/structure/window/reinforced/tinted{
-	dir = 8;
-	icon_state = "twindow"
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 4;
-	icon_state = "twindow"
-	},
-/obj/structure/window/reinforced/tinted,
 /obj/effect/decal/cleanable/dirt/visible,
 /obj/structure/cable,
 /obj/machinery/power/apc/derelict{
@@ -2459,6 +2425,7 @@
 /obj/item/stack/tape_roll/duct_tape,
 /obj/item/retractor,
 /obj/item/scalpel,
+/obj/item/tank/oxygen,
 /turf/floor/tiled/white,
 /area/ship/scrap/crew/medbay)
 "eP" = (
@@ -4701,6 +4668,7 @@
 /obj/structure/window/reinforced{
 	current_health = 1e+007
 	},
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/floor/reinforced/airless,
 /area/ship/scrap/maintenance/atmos)
 "je" = (
@@ -5034,21 +5002,6 @@
 /obj/structure/hygiene/sink{
 	pixel_y = 18
 	},
-/obj/structure/window/reinforced/tinted{
-	dir = 8;
-	icon_state = "twindow"
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 4;
-	icon_state = "twindow"
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 1
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 8;
-	icon_state = "twindow"
-	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	level = 2
 	},
@@ -5121,6 +5074,7 @@
 "uM" = (
 /obj/item/stack/material/sheet/mapped/steel,
 /obj/structure/lattice,
+/obj/machinery/portable_atmospherics/canister/nitrogen,
 /turf/space,
 /area/ship/scrap/maintenance/atmos)
 "vs" = (
@@ -5145,6 +5099,10 @@
 /obj/effect/paint/brown,
 /turf/wall/r_wall,
 /area/space)
+"zq" = (
+/obj/item/stack/material/rods,
+/turf/space,
+/area/ship/scrap/maintenance/atmos)
 "zT" = (
 /obj/effect/floor_decal/corner/blue/diagonal{
 	dir = 4
@@ -5197,9 +5155,12 @@
 /turf/wall/r_wall,
 /area/ship/scrap/crew/kitchen)
 "Hd" = (
-/obj/machinery/portable_atmospherics/canister/nitrogen,
-/turf/space,
-/area/space)
+/obj/item/stack/material/sheet/mapped/steel,
+/obj/machinery/atmospherics/unary/tank/nitrogen{
+	dir = 1
+	},
+/turf/floor/plating/airless,
+/area/ship/scrap/maintenance/atmos)
 "HQ" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/floor/reinforced/airless,
@@ -5251,6 +5212,12 @@
 	},
 /turf/floor/tiled/usedup,
 /area/ship/scrap/maintenance/engineering)
+"KW" = (
+/obj/item/shard,
+/obj/structure/lattice,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/space,
+/area/ship/scrap/maintenance/atmos)
 "Lp" = (
 /turf/floor/reinforced/airless,
 /area/space)
@@ -5290,6 +5257,12 @@
 	},
 /turf/floor/usedup,
 /area/ship/scrap/hidden)
+"Nc" = (
+/obj/machinery/network/router{
+	initial_network_id = "bearnet"
+	},
+/turf/floor/bluegrid/airless,
+/area/ship/scrap/comms)
 "Od" = (
 /obj/effect/floor_decal/corner/blue,
 /obj/effect/floor_decal/corner/yellow{
@@ -11296,14 +11269,14 @@ wp
 gY
 hx
 hx
-ie
+Hd
 iQ
-hw
+zq
 iP
 Eq
-id
+KW
 Yl
-Hd
+aa
 aa
 aa
 aa
@@ -11547,7 +11520,7 @@ IG
 Mm
 hN
 hx
-hM
+hw
 aa
 aa
 aa
@@ -11994,7 +11967,7 @@ xU
 Yv
 Yv
 ar
-Ix
+Nc
 aO
 aX
 Yv

maps/away/bearcat/bearcat_access.dm

@@ -39,3 +39,4 @@ var/global/const/access_bearcat_captain = "ACCESS_BEARCAT_CAPTAIN" //999
 
 /obj/machinery/vending/tool/bearcat
 	req_access = list(access_bearcat)
+