Granite's Love pass 1 of X for ruins (#16746)

* Fab Five

* forgot to move the rack in front of the false wall

* Holy shit scrapheap looked HORRIBLE

_maps/RandomRuins/SpaceRuins/skyrat/blackmarket.dmm

@@ -110,6 +110,9 @@
 	dir = 10
 	},
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"hO" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "io" = (
 /obj/structure/sink/directional/east,
 /obj/structure/mirror{
@@ -118,6 +121,10 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/showroomfloor,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"iG" = (
+/obj/structure/table,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "iY" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
@@ -136,6 +143,23 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"kT" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "lp" = (
 /turf/template_noop,
 /area/template_noop)
@@ -151,6 +175,9 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"mQ" = (
+/turf/open/misc/asteroid/airless,
+/area/template_noop)
 "mX" = (
 /obj/machinery/door/airlock{
 	name = "Bathroom"
@@ -191,6 +218,7 @@
 	},
 /obj/item/stack/sheet/iron/fifty,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/spawner/random/entertainment/plushie_delux,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "oo" = (
@@ -203,6 +231,12 @@
 "oV" = (
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"qc" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/sand,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "qe" = (
 /obj/effect/turf_decal/tile/brown{
 	dir = 4
@@ -215,6 +249,10 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"qj" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "qA" = (
 /obj/effect/turf_decal/tile/brown{
 	dir = 1
@@ -282,18 +320,18 @@
 /obj/item/food/meat/slab/monkey,
 /obj/item/food/meat/slab/monkey,
 /obj/item/reagent_containers/condiment/rice{
-	list_reagents = list(/datum/reagent/consumable/rice = 150);
+	list_reagents = list(/datum/reagent/consumable/rice=150);
 	name = "Basmati Rice Sack (4KG)";
 	volume = 150
 	},
 /obj/item/reagent_containers/condiment/milk,
 /obj/item/reagent_containers/condiment/enzyme{
-	list_reagents = list(/datum/reagent/consumable/enzyme = 500);
+	list_reagents = list(/datum/reagent/consumable/enzyme=500);
 	name = "universe-sized universal enyzyme";
 	volume = 500
 	},
 /obj/item/reagent_containers/condiment/flour{
-	list_reagents = list(/datum/reagent/consumable/flour = 600);
+	list_reagents = list(/datum/reagent/consumable/flour=600);
 	name = "Premium All-Purpose Flour (16KG)";
 	volume = 600
 	},
@@ -350,25 +388,29 @@
 /obj/item/storage/backpack/duffelbag/syndie,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"uG" = (
+/obj/structure/falsewall,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "vg" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "vj" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/sand,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"vy" = (
+/obj/effect/spawner/random/entertainment/drugs,
+/obj/effect/spawner/random/entertainment/drugs,
+/obj/effect/spawner/random/contraband/narcotics,
+/obj/item/reagent_containers/cocainebrick,
+/obj/item/reagent_containers/cocainebrick,
+/obj/item/reagent_containers/hashbrick,
+/obj/item/reagent_containers/hashbrick,
+/obj/effect/turf_decal/sand,
+/obj/structure/closet/crate,
+/turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "vU" = (
 /obj/machinery/door/airlock/mining{
@@ -444,6 +486,12 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"Bf" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/table,
+/obj/item/reagent_containers/heroin,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "Bm" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/tile/brown,
@@ -455,12 +503,19 @@
 	},
 /obj/item/poster/random_contraband,
 /obj/item/poster/random_contraband,
+/obj/effect/spawner/random/exotic/tool,
+/obj/effect/spawner/random/engineering/material_cheap,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "Bp" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"BG" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/space_heater/improvised_chem_heater,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "Ca" = (
 /obj/structure/rack,
 /obj/item/stack/sheet/mineral/plasma/thirty,
@@ -508,6 +563,16 @@
 /obj/item/market_uplink,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"FG" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/table,
+/obj/effect/spawner/random/entertainment/drugs,
+/obj/effect/spawner/random/entertainment/drugs,
+/obj/effect/spawner/random/entertainment/drugs,
+/obj/effect/spawner/random/entertainment/drugs,
+/obj/effect/spawner/random/entertainment/drugs,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "Hq" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron,
@@ -525,7 +590,6 @@
 	},
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "KV" = (
-/obj/structure/rack,
 /obj/effect/turf_decal/tile/brown,
 /obj/effect/turf_decal/tile/brown{
 	dir = 4
@@ -533,9 +597,7 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/item/stack/sheet/glass/fifty,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/holosign_creator/atmos,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "LL" = (
@@ -562,6 +624,9 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/rack,
+/obj/item/holosign_creator/atmos,
+/obj/item/stack/sheet/glass/fifty,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "Mc" = (
@@ -701,7 +766,9 @@
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "SI" = (
-/turf/open/floor/iron/dark,
+/obj/structure/table,
+/obj/item/reagent_containers/heroinbrick,
+/turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "SQ" = (
 /obj/machinery/door/airlock/external,
@@ -735,6 +802,11 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/powered/skyrat/blackmarket)
+"Vl" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/broken,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/powered/skyrat/blackmarket)
 "VP" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -816,18 +888,22 @@ lp
 lp
 lp
 lp
+lp
+lp
 YG
 YG
 YG
+lp
+lp
+lp
+lp
+lp
+lp
+lp
 YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+lp
+lp
+lp
 lp
 lp
 "}
@@ -835,43 +911,123 @@ lp
 lp
 lp
 lp
+lp
+lp
 YG
 YG
 YG
 YG
 YG
+lp
+lp
+lp
+lp
 YG
 YG
 YG
 YG
-YG
-YG
-YG
-YG
-YG
+lp
+lp
+lp
 lp
 "}
 (3,1,1) = {"
 lp
 lp
+lp
+lp
+lp
+YG
+YG
+YG
+YG
+YG
+YG
+mQ
+mQ
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+lp
+"}
+(4,1,1) = {"
+lp
+lp
+lp
+lp
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
 YG
 YG
-Zh
-Zh
-Zh
-Zh
-Zh
-Zh
-Zh
-Zh
-Zh
-Zh
-Zh
-Zh
 YG
 YG
 "}
-(4,1,1) = {"
+(5,1,1) = {"
+lp
+lp
+lp
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+lp
+lp
+"}
+(6,1,1) = {"
+lp
+lp
+YG
+YG
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+YG
+YG
+YG
+lp
+lp
+lp
+"}
+(7,1,1) = {"
 lp
 YG
 YG
@@ -890,8 +1046,12 @@ ub
 Zh
 YG
 YG
+mQ
+lp
+lp
+lp
 "}
-(5,1,1) = {"
+(8,1,1) = {"
 lp
 YG
 YG
@@ -909,9 +1069,13 @@ Ph
 Rv
 Zh
 YG
+YG
+mQ
+lp
+lp
 lp
 "}
-(6,1,1) = {"
+(9,1,1) = {"
 lp
 YG
 YG
@@ -930,8 +1094,12 @@ Zh
 Zh
 YG
 YG
+YG
+lp
+lp
+lp
 "}
-(7,1,1) = {"
+(10,1,1) = {"
 lp
 YG
 YG
@@ -950,8 +1118,12 @@ vg
 Zh
 YG
 YG
+YG
+YG
+lp
+lp
 "}
-(8,1,1) = {"
+(11,1,1) = {"
 lp
 YG
 YG
@@ -965,13 +1137,17 @@ Zh
 Zh
 Zh
 Zh
-SI
+qj
 Mc
 Zh
 YG
 YG
+YG
+YG
+YG
+lp
 "}
-(9,1,1) = {"
+(12,1,1) = {"
 lp
 YG
 YG
@@ -986,12 +1162,16 @@ nE
 Pd
 PG
 LL
-vj
+kT
 Zh
 YG
+YG
+YG
+mQ
+lp
 lp
 "}
-(10,1,1) = {"
+(13,1,1) = {"
 lp
 YG
 YG
@@ -1010,8 +1190,12 @@ gf
 Zh
 YG
 YG
+mQ
+mQ
+lp
+lp
 "}
-(11,1,1) = {"
+(14,1,1) = {"
 lp
 YG
 YG
@@ -1030,8 +1214,12 @@ LZ
 Zh
 YG
 YG
+YG
+mQ
+lp
+lp
 "}
-(12,1,1) = {"
+(15,1,1) = {"
 lp
 lp
 YG
@@ -1050,10 +1238,14 @@ AG
 Zh
 YG
 YG
+YG
+YG
+lp
+lp
 "}
-(13,1,1) = {"
-lp
+(16,1,1) = {"
 lp
+mQ
 YG
 Zh
 Zh
@@ -1065,13 +1257,17 @@ vU
 Zh
 Zh
 Zh
-Zh
+uG
 Zh
 Zh
 YG
 YG
+YG
+YG
+lp
+lp
 "}
-(14,1,1) = {"
+(17,1,1) = {"
 lp
 Zh
 Zh
@@ -1084,14 +1280,18 @@ mb
 De
 Fq
 Zh
+SI
+Hq
+qc
+Zh
 YG
 YG
 YG
 YG
-YG
-YG
+lp
+lp
 "}
-(15,1,1) = {"
+(18,1,1) = {"
 tP
 zb
 fi
@@ -1104,14 +1304,18 @@ de
 De
 tI
 Zh
+Bf
+fi
+fi
+hO
 YG
 YG
 YG
 YG
 YG
-YG
+lp
 "}
-(16,1,1) = {"
+(19,1,1) = {"
 lp
 Zh
 Zh
@@ -1124,14 +1328,18 @@ tV
 De
 NB
 Zh
+BG
+fi
+Vl
+hO
 YG
 YG
 YG
 YG
 YG
-YG
+lp
 "}
-(17,1,1) = {"
+(20,1,1) = {"
 lp
 lp
 YG
@@ -1144,14 +1352,18 @@ De
 MN
 dm
 Zh
+iG
+fi
+vj
+hO
+YG
 YG
 YG
 YG
 YG
 YG
-lp
 "}
-(18,1,1) = {"
+(21,1,1) = {"
 lp
 YG
 YG
@@ -1164,14 +1376,18 @@ Ut
 AD
 YQ
 Zh
+FG
+vj
+vy
+hO
+YG
 YG
 YG
 YG
 YG
-lp
 lp
 "}
-(19,1,1) = {"
+(22,1,1) = {"
 lp
 YG
 YG
@@ -1184,6 +1400,10 @@ Zh
 Zh
 Zh
 Zh
+Zh
+Zh
+hO
+hO
 YG
 YG
 YG
@@ -1191,7 +1411,7 @@ lp
 lp
 lp
 "}
-(20,1,1) = {"
+(23,1,1) = {"
 lp
 lp
 YG
@@ -1207,11 +1427,15 @@ YG
 YG
 YG
 YG
+YG
+YG
+YG
+lp
 lp
 lp
 lp
 "}
-(21,1,1) = {"
+(24,1,1) = {"
 lp
 lp
 lp
@@ -1225,6 +1449,10 @@ YG
 YG
 YG
 YG
+mQ
+lp
+lp
+lp
 lp
 lp
 lp

_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm

@@ -341,6 +341,13 @@
 /obj/structure/ore_box,
 /turf/open/floor/iron/dark/brown,
 /area/ruin/space/has_grav/cargodise_freighter/mining)
+"hm" = (
+/obj/machinery/light/directional/south,
+/obj/machinery/airalarm/all_access{
+	pixel_y = -25
+	},
+/turf/open/floor/iron/dark/green/side,
+/area/ruin/space/has_grav/cargodise_freighter/primaryhall)
 "hq" = (
 /obj/structure/bed,
 /obj/item/bedsheet/dorms,
@@ -1588,12 +1595,6 @@
 	},
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/cargodise_freighter/quarters)
-"zU" = (
-/obj/machinery/airalarm/all_access{
-	pixel_y = 26
-	},
-/turf/open/floor/iron/cafeteria,
-/area/ruin/space/has_grav/cargodise_freighter/kitchen)
 "zY" = (
 /obj/structure/table/reinforced,
 /obj/effect/spawner/random/engineering/toolbox,
@@ -4262,9 +4263,9 @@ yn
 aL
 XU
 YF
-qW
+hm
 Bb
-zU
+ZB
 ZB
 Ma
 ZB

_maps/RandomRuins/SpaceRuins/skyrat/derelictferry.dmm

@@ -28,7 +28,7 @@
 	},
 /obj/effect/decal/cleanable/blood,
 /obj/machinery/light/small/directional/west,
-/obj/item/clothing/under/rank/centcom/intern,
+/obj/item/clothing/under/plasmaman/centcom_official,
 /turf/open/floor/mineral/titanium/blue/airless,
 /area/ruin/space)
 "i" = (
@@ -42,7 +42,7 @@
 /area/ruin/space)
 "j" = (
 /obj/structure/chair/comfy/shuttle,
-/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/jackboots,
 /turf/open/floor/mineral/titanium/blue/airless,
 /area/ruin/space)
 "k" = (
@@ -80,12 +80,12 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/blood/splatter,
-/obj/item/clothing/shoes/sneakers/black,
+/obj/item/stamp/centcom,
 /turf/open/floor/mineral/titanium/blue/airless,
 /area/ruin/space)
 "t" = (
 /obj/effect/decal/cleanable/blood/gibs,
-/obj/item/clothing/shoes/sneakers/brown,
+/obj/item/clothing/shoes/sports,
 /turf/open/floor/mineral/titanium/blue/airless,
 /area/ruin/space)
 "u" = (
@@ -93,7 +93,7 @@
 /turf/open/floor/mineral/titanium/blue/airless,
 /area/ruin/space)
 "y" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/smg/space/stormtrooper,
+/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/stormtrooper/anthro/fox,
 /turf/template_noop,
 /area/template_noop)
 "z" = (

_maps/RandomRuins/SpaceRuins/skyrat/polychromicfacility.dmm

@@ -83,6 +83,8 @@
 "q" = (
 /obj/item/clothing/neck/cloak/colourable/veil,
 /obj/structure/rack,
+/obj/item/clothing/neck/cloak/colourable/veil,
+/obj/item/clothing/neck/cloak/colourable/veil,
 /turf/open/floor/engine,
 /area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
 "r" = (
@@ -218,6 +220,9 @@
 /area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
 "T" = (
 /obj/structure/rack,
+/obj/item/clothing/neck/cloak/colourable/shroud,
+/obj/item/clothing/neck/cloak/colourable/shroud,
+/obj/item/clothing/neck/cloak/colourable/shroud,
 /turf/open/floor/engine,
 /area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
 "U" = (
@@ -225,9 +230,7 @@
 /turf/open/floor/iron/showroomfloor,
 /area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
 "V" = (
-/obj/structure/statue/silver/secborg{
-	anchored = 1
-	},
+/obj/structure/statue/plasma/scientist,
 /turf/open/floor/iron/bluespace,
 /area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
 "W" = (

modular_skyrat/modules/mapping/code/areas/space.dm

@@ -23,6 +23,9 @@
 /area/ruin/space/has_grav/powered/skyrat/blackmarket
 	name = "Shady Market"
 
+/area/ruin/space/has_grav/powered/skyrat/scrapheap
+	name = "Scrap Heap"
+
 ///Interdyne, Forward Operating Base
 /area/ruin/space/has_grav/skyrat/interdynefob
 	name = "DS-2" //If DS-1 is so great...