TGS Test Merge (#5999)

citadel.dme

@@ -2943,7 +2943,6 @@
 #include "code\modules\language\languages\species\moth.dm"
 #include "code\modules\language\languages\species\naramadi.dm"
 #include "code\modules\language\languages\species\phoronoid.dm"
-#include "code\modules\language\languages\species\promethean.dm"
 #include "code\modules\language\languages\species\scori.dm"
 #include "code\modules\language\languages\species\shadekin.dm"
 #include "code\modules\language\languages\species\skrell.dm"

code/game/turfs/simulated/floors/outdoors.dm

@@ -13,6 +13,9 @@
 	name = "mud"
 	icon_state = "mud_dark"
 
+/turf/simulated/floor/outdoors/mud/indoors
+	outdoors = FALSE
+
 /turf/simulated/floor/outdoors/rocks
 	name = "rocks"
 	desc = "Hard as a rock."

code/game/turfs/simulated/floors/water.dm

@@ -106,7 +106,7 @@
 
 /turf/simulated/floor/water/deep/indoors
 	outdoors = FALSE
-	
+
 /turf/simulated/floor/water/pool
 	name = "pool"
 	desc = "Don't worry, it's not closed."
@@ -415,10 +415,16 @@ var/list/shoreline_icon_cache = list()
 			to_chat(L, "<span class='warning'>You climb out of \the [src].</span>")
 	..()
 
+/turf/simulated/floor/water/blood/indoors
+	outdoors = FALSE
+
 /turf/simulated/floor/water/blood/deep
 	name = "deep coagulating pool"
 	desc = "A body of crimson fluid. It smells like pennies and gasoline.  It seems quite deep."
 	icon_state = "acidb_deep"
 	under_state = "abyss"
 	slowdown = 8
 	depth = 7
+
+/turf/simulated/floor/water/blood/deep/indoors
+	outdoors = FALSE

maps/rift/levels/rift-04-surface1.dmm

@@ -1994,15 +1994,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"bqY" = (
-/obj/machinery/door/airlock/maintenance/engi{
-	name = "Substation Access"
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/substation/surface_one)
 "brd" = (
 /obj/machinery/light{
 	dir = 1
@@ -3083,25 +3074,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfaceone)
-"cdP" = (
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/railing/grey,
-/obj/structure/railing/grey{
-	dir = 1
-	},
-/obj/structure/railing/grey{
-	dir = 4
-	},
-/turf/simulated/floor/grass,
-/area/hallway/primary/surfaceone)
 "cdW" = (
 /obj/structure/grille,
 /obj/machinery/door/firedoor/glass,
@@ -7764,6 +7736,15 @@
 /obj/structure/sink/puddle,
 /turf/simulated/floor/outdoors/grass/heavy/interior,
 /area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+"fcG" = (
+/obj/machinery/door/airlock/maintenance/engi{
+	name = "Substation Access"
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/substation/surface_one)
 "fcI" = (
 /obj/machinery/door/airlock/security{
 	name = "Confinement Storage";
@@ -8959,6 +8940,18 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/surface_one)
+"fTp" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/window/reinforced,
+/obj/structure/railing/grey,
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/obj/structure/bonfire/permanent,
+/turf/simulated/floor/outdoors/mud,
+/area/hallway/primary/surfaceone)
 "fTz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/monowhite,
@@ -14710,6 +14703,18 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/rnd/xenobiology/xenoflora)
+"jqO" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/window/reinforced,
+/obj/structure/railing/grey,
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/obj/structure/flora/pumpkin/carved/scream,
+/turf/simulated/floor/outdoors/mud,
+/area/hallway/primary/surfaceone)
 "jrc" = (
 /obj/machinery/light/small,
 /obj/structure/cable/green{
@@ -15108,19 +15113,6 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/outpost/xenobiology/outpost_hallway)
-"jER" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sunnybush,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/obj/structure/railing/grey,
-/obj/structure/railing/grey{
-	dir = 1
-	},
-/turf/simulated/floor/grass,
-/area/hallway/primary/surfaceone)
 "jEU" = (
 /obj/effect/floor_decal/borderfloor/corner{
 	dir = 1
@@ -25315,19 +25307,6 @@
 /obj/structure/railing,
 /turf/simulated/floor/plating,
 /area/maintenance/cargo)
-"pJn" = (
-/obj/structure/flora/ausbushes/ywflowers,
-/obj/structure/flora/ausbushes/genericbush,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced,
-/obj/structure/railing/grey,
-/obj/structure/railing/grey{
-	dir = 1
-	},
-/turf/simulated/floor/grass,
-/area/hallway/primary/surfaceone)
 "pJC" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/space_heater,
@@ -33925,6 +33904,24 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/xenoarch_storage)
+"uME" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/railing/grey,
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/obj/structure/railing/grey{
+	dir = 4
+	},
+/obj/structure/flora/pumpkin/carved,
+/turf/simulated/floor/outdoors/mud,
+/area/hallway/primary/surfaceone)
 "uNc" = (
 /obj/structure/closet/emcloset,
 /obj/random/maintenance/cargo,
@@ -51280,7 +51277,7 @@ sIG
 oFn
 sXZ
 iBT
-bqY
+fcG
 iZX
 iBT
 iBT
@@ -51469,7 +51466,7 @@ uAl
 jGp
 atV
 ttD
-pJn
+jqO
 pHO
 bXk
 iBT
@@ -51663,7 +51660,7 @@ hQz
 bok
 nTf
 ttD
-jER
+fTp
 pHO
 moS
 iBT
@@ -51857,7 +51854,7 @@ mhK
 sQN
 nTf
 ttD
-cdP
+uME
 pHO
 gKl
 kDS