Merge branch 'master' of https://github.com/Monkestation/Monkestation2.0

 into cassette-refactor

_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm

@@ -864,7 +864,7 @@
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/derelictsulaco)
 "BQ" = (
-/mob/living/simple_animal/pet/cat{
+/mob/living/basic/pet/cat{
 	name = "Jonesy";
 	desc = "Old and grumpy cat- wait, how the hell is he still alive?!"
 	},

_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm

@@ -245,7 +245,7 @@
 /obj/structure/bed/dogbed{
 	name = "kitty bed"
 	},
-/mob/living/simple_animal/pet/cat/space,
+/mob/living/basic/pet/cat/space,
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/powered/cat_man)
 "aS" = (

_maps/RandomRuins/SpaceRuins/oldstation.dmm

@@ -2802,9 +2802,6 @@
 /obj/machinery/atmospherics/components/binary/pump/layer2{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
-	dir = 10
-	},
 /obj/effect/decal/cleanable/glass,
 /obj/item/shard,
 /obj/effect/mapping_helpers/broken_floor,
@@ -4160,7 +4157,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/blue/half/contrasted,
-/obj/machinery/atmospherics/components/binary/pump/layer4,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/broken_flooring/corner/directional/north,
 /turf/open/floor/iron/airless,
@@ -5819,6 +5815,15 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/delta/hall)
+"AI" = (
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/trash/garbage,
+/obj/structure/closet/crate/bin,
+/turf/open/floor/iron/airless,
+/area/ruin/space/ancientstation/beta/medbay)
 "AJ" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
@@ -6192,11 +6197,8 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
 "Dy" = (
-/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/trash/garbage,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm/directional/west,
+/obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airalarm/all_access,
 /turf/open/floor/iron/airless,
 /area/ruin/space/ancientstation/beta/medbay)
@@ -8379,9 +8381,6 @@
 "Sq" = (
 /obj/item/shard,
 /obj/machinery/atmospherics/components/binary/pump/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
-	dir = 4
-	},
 /obj/effect/decal/cleanable/glass,
 /obj/effect/mapping_helpers/broken_floor,
 /obj/structure/cable,
@@ -10616,7 +10615,7 @@ aa
 Ck
 NC
 IR
-yz
+AI
 Qr
 Dy
 XI