Merge branch 'master' of https://github.com/wonderinghost/Yogstation

Author: wonderinghost

_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm

@@ -3024,10 +3024,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/eva)
-"Ow" = (
-/obj/structure/fans/tiny,
-/turf/template_noop,
-/area/template_noop)
 "OC" = (
 /obj/machinery/power/smes/engineering,
 /obj/structure/cable{
@@ -3991,7 +3987,7 @@ ab
 ab
 Ap
 ab
-Ow
+ab
 ab
 ab
 ab

_maps/RandomRuins/JungleRuins/jungleland_dead_tartemple.dmm

@@ -279,7 +279,7 @@
 /turf/open/floor/plating,
 /area/awaymission/academy/academycellar)
 "eT" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
 /turf/open/floor/plasteel{
 	icon_state = "showroomfloor"
 	},

_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm

@@ -1283,7 +1283,7 @@
 /area/ruin/space/derelict/bridge)
 "ee" = (
 /obj/structure/window/reinforced,
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
 /turf/open/floor/plasteel/airless{
 	icon_state = "damaged3"
 	},

_maps/RandomRuins/JungleRuins/jungleland_tar_king.dmm

@@ -237,7 +237,7 @@
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	dir = 4
 	},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/gasthelizard)
 "F" = (

_maps/RandomRuins/JungleRuins/miningbase.dmm

@@ -4473,7 +4473,7 @@
 /area/ruin/space/has_grav/ancientstation/rnd)
 "pN" = (
 /obj/structure/window/plasma/reinforced/spawner/north,
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
 /turf/open/floor/engine/plasma,
 /area/ruin/space/has_grav/ancientstation/engi)
 "pO" = (
@@ -6303,7 +6303,7 @@
 /turf/template_noop,
 /area/ruin/space/has_grav/ancientstation/solararray)
 "As" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
 	dir = 8
 	},
@@ -8367,7 +8367,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/ancientstation/engi)
 "OO" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/ancientstation/engi)

_maps/RandomRuins/SpaceRuins/Academy.dmm

@@ -95,7 +95,7 @@
 	},
 /obj/machinery/door/airlock/engineering{
 	name = "AI Satellite Access";
-	req_one_access_txt = "10;17;32"
+	req_access_txt = "10"
 	},
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 9