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

 into fusion-why

_maps/RandomRuins/SpaceRuins/anomaly_research.dmm

@@ -1138,7 +1138,6 @@
 /obj/effect/turf_decal/siding/purple{
 	dir = 9
 	},
-/obj/machinery/monkey_recycler,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)

_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm

@@ -375,9 +375,8 @@
 /turf/open/floor/carpet/black,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "jC" = (
-/mob/living/simple_animal/slime{
-	colour = "bluespace";
-	rabid = 1
+/mob/living/basic/slime{
+	current_color = /datum/slime_color/bluespace
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/titanium/tiled/purple,
@@ -903,9 +902,8 @@
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "wY" = (
-/mob/living/simple_animal/slime{
-	colour = "bluespace";
-	rabid = 1
+/mob/living/basic/slime{
+	current_color = /datum/slime_color/bluespace
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
@@ -1610,7 +1608,6 @@
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "JW" = (
 /obj/machinery/light/broken/directional/north,
-/obj/machinery/monkey_recycler,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "Kd" = (
@@ -2192,9 +2189,8 @@
 	dir = 10
 	},
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/slime{
-	colour = "bluespace";
-	rabid = 1
+/mob/living/basic/slime{
+	current_color = /datum/slime_color/bluespace
 	},
 /turf/open/floor/mineral/titanium/tiled/purple,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
@@ -2330,9 +2326,8 @@
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "Ze" = (
-/mob/living/simple_animal/slime{
-	colour = "bluespace";
-	rabid = 1
+/mob/living/basic/slime{
+	current_color = /datum/slime_color/bluespace
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/plastitanium,

_maps/map_files/Basketball/lusty_xenomorphs.dmm

@@ -218,7 +218,7 @@
 /turf/open/floor/engine,
 /area/centcom/basketball)
 "pu" = (
-/mob/living/simple_animal/slime/random,
+/mob/living/basic/slime/random,
 /turf/open/floor/engine,
 /area/centcom/basketball)
 "qU" = (
@@ -529,18 +529,6 @@
 /obj/structure/window/reinforced/spawner/directional/south,
 /turf/open/floor/iron/white,
 /area/centcom/basketball)
-"Se" = (
-/obj/machinery/computer/camera_advanced/xenobio,
-/turf/open/floor/iron/white,
-/area/centcom/basketball)
-"Tc" = (
-/obj/machinery/monkey_recycler,
-/turf/open/floor/iron/white,
-/area/centcom/basketball)
-"Uq" = (
-/obj/machinery/processor/slime,
-/turf/open/floor/iron/white,
-/area/centcom/basketball)
 "Uv" = (
 /obj/effect/decal/cleanable/xenoblood/xgibs/torso,
 /turf/open/floor/engine,
@@ -820,7 +808,7 @@ Hu
 (9,1,1) = {"
 Hu
 Lu
-Tc
+JM
 ly
 AI
 LS
@@ -901,7 +889,7 @@ Hu
 (12,1,1) = {"
 Hu
 Lu
-Se
+JM
 OB
 Vr
 Vr
@@ -982,7 +970,7 @@ Hu
 (15,1,1) = {"
 Hu
 Lu
-Uq
+JM
 ly
 rU
 LS