Merge remote-tracking branch 'upstream/master'

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm

@@ -338,7 +338,7 @@
 /obj/structure/railing/corner{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/mimic/crate,
+/mob/living/basic/mimic/crate,
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/underground/explored)
 "fO" = (
@@ -2073,7 +2073,7 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/underground/explored)
 "KV" = (
-/mob/living/simple_animal/hostile/mimic/crate,
+/mob/living/basic/mimic/crate,
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/underground/explored)
 "KY" = (

_maps/RandomRuins/SpaceRuins/interdyne.dmm

@@ -104,7 +104,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
 "eJ" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
@@ -496,7 +496,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
 "uy" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
 "vd" = (
@@ -656,7 +656,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/interdyne)
 "By" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/interdyne)
@@ -672,7 +672,7 @@
 /turf/open/floor/iron/smooth,
 /area/ruin/space/has_grav/interdyne)
 "DA" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
@@ -719,7 +719,7 @@
 /area/ruin/space/has_grav/interdyne)
 "Ft" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
@@ -732,7 +732,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/interdyne)
 "FC" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)

_maps/RandomRuins/SpaceRuins/meatderelict.dmm

@@ -1008,7 +1008,7 @@
 /area/ruin/space/has_grav/powered/biooutpost)
 "tv" = (
 /obj/effect/decal/cleanable/blood/tracks,
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /turf/open/indestructible/white{
 	icon_state = "showroomfloor"
 	},

_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm

@@ -50,6 +50,10 @@
 /obj/structure/girder,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/turretedoutpost)
+"eR" = (
+/obj/structure/foamedmetal/iron,
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/turretedoutpost)
 "eT" = (
 /obj/effect/turf_decal/trimline/red/line,
 /obj/effect/turf_decal/trimline/red/line{
@@ -190,7 +194,7 @@
 "mf" = (
 /obj/structure/lattice,
 /obj/structure/girder,
-/turf/open/floor/plating/rust,
+/turf/open/floor/plating/rust/airless,
 /area/template_noop)
 "my" = (
 /obj/effect/turf_decal/trimline/red/line{
@@ -204,7 +208,7 @@
 /area/ruin/space/has_grav/turretedoutpost)
 "nd" = (
 /obj/structure/girder/reinforced,
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/turretedoutpost)
 "no" = (
 /obj/machinery/light/dim/directional/west,
@@ -459,6 +463,10 @@
 /obj/structure/marker_beacon/burgundy,
 /turf/template_noop,
 /area/ruin/space/has_grav/turretedoutpost)
+"Ct" = (
+/obj/structure/girder,
+/turf/open/floor/plating/rust/airless,
+/area/ruin/space/has_grav/turretedoutpost)
 "Cu" = (
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
@@ -577,6 +585,10 @@
 /obj/structure/barricade/wooden/crude,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/turretedoutpost)
+"Ny" = (
+/obj/structure/girder,
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/turretedoutpost)
 "NU" = (
 /obj/effect/turf_decal/trimline/red/line{
 	dir = 8
@@ -650,6 +662,14 @@
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/turretedoutpost)
+"Sw" = (
+/obj/structure/girder,
+/obj/structure/grille,
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/turretedoutpost)
+"Te" = (
+/turf/open/floor/plating/rust/airless,
+/area/ruin/space/has_grav/turretedoutpost)
 "Tg" = (
 /obj/effect/turf_decal/siding/thinplating_new/dark,
 /obj/structure/table/reinforced,
@@ -686,6 +706,11 @@
 "TY" = (
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/turretedoutpost)
+"Ut" = (
+/obj/structure/girder,
+/obj/structure/grille,
+/turf/open/floor/plating/rust/airless,
+/area/ruin/space/has_grav/turretedoutpost)
 "UD" = (
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -721,7 +746,7 @@
 /obj/structure/girder/displaced,
 /obj/structure/grille/broken,
 /obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/turretedoutpost)
 "VO" = (
 /obj/machinery/porta_turret/syndicate/energy/ruin,
@@ -904,7 +929,7 @@ ro
 ro
 ro
 nd
-up
+Te
 ro
 ro
 ro
@@ -931,13 +956,13 @@ jM
 jM
 ro
 ro
-ID
-cD
-ID
-ID
+Sw
+Ct
+Ut
+Sw
 VB
-ID
-pO
+Sw
+eR
 ro
 ro
 jM
@@ -961,15 +986,15 @@ Ci
 bU
 ro
 ro
-ID
-ID
+Sw
+Sw
 ro
 ro
 ro
 ro
 ro
-pO
-pO
+eR
+eR
 ro
 ro
 ro
@@ -991,16 +1016,16 @@ jM
 jM
 jM
 ro
-ID
-ID
+Sw
+Sw
 ro
 ro
 sy
 fF
 EA
 ro
 ro
-ID
+Sw
 ro
 St
 pi
@@ -1022,7 +1047,7 @@ jM
 jM
 jM
 ro
-ID
+Ut
 ro
 ro
 hr
@@ -1053,7 +1078,7 @@ jM
 jM
 jM
 ro
-ID
+Ut
 ro
 Pf
 aH
@@ -1084,7 +1109,7 @@ bU
 jM
 rK
 ro
-ID
+Sw
 ro
 gn
 aH
@@ -1115,7 +1140,7 @@ bU
 bU
 bU
 ro
-pO
+eR
 ro
 ro
 lF
@@ -1146,8 +1171,8 @@ Ci
 jM
 rK
 ro
-pO
-cD
+eR
+Ny
 ro
 Lf
 US

_maps/map_files/Birdshot/birdshot.dmm

@@ -26116,7 +26116,7 @@
 /turf/open/floor/iron/smooth_large,
 /area/station/science/robotics/mechbay)
 "iPU" = (
-/mob/living/simple_animal/hostile/mimic/crate,
+/mob/living/basic/mimic/crate,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
 "iPW" = (

_maps/map_files/NebulaStation/NebulaStation.dmm

@@ -81457,12 +81457,6 @@
 /obj/item/reagent_containers/cup/rag,
 /turf/open/floor/iron/white/textured_large,
 /area/station/maintenance/department/medical)
-"mdT" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/closed/wall,
-/area/station/maintenance/fore/lesser)
 "mec" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
@@ -118778,10 +118772,6 @@
 /obj/effect/turf_decal/siding/thinplating_new/dark/corner,
 /turf/open/floor/iron/dark/herringbone,
 /area/station/service/chapel/funeral)
-"rDY" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall,
-/area/station/maintenance/fore/greater)
 "rEc" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -196595,7 +196585,7 @@ fQE
 cUZ
 xGl
 pjP
-mdT
+iEt
 xnA
 pQW
 hAK
@@ -266242,7 +266232,7 @@ bzt
 jkE
 nLg
 cij
-rDY
+bYy
 loK
 kCi
 nKp
@@ -294174,4 +294164,4 @@ txW
 txW
 txW
 txW
-"}
+"}

_maps/map_files/wawastation/wawastation.dmm

@@ -840,7 +840,7 @@
 /obj/effect/decal/cleanable/blood/old{
 	icon_state = "gib3-old"
 	},
-/mob/living/simple_animal/hostile/mimic,
+/mob/living/basic/mimic/crate,
 /turf/open/floor/iron/white,
 /area/station/maintenance/aft/upper)
 "anu" = (