From e20b4da59e6f2fb53a973febc00c6e01b092add2 Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Sat, 4 May 2024 02:53:22 -0600 Subject: [PATCH 01/12] soul additions, nt ship area creation --- .../overgrown_mining_station.dmm | 7332 +++++++++-------- .../wrecked_nt_ship/wrecked_nt_ship.dm | 4 + .../wrecked_nt_ship/wrecked_nt_ship.dmm | 1235 ++- 3 files changed, 4624 insertions(+), 3947 deletions(-) diff --git a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm index da11a93e608..3761316db4d 100644 --- a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm +++ b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm @@ -1,15 +1,12 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/airless, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "ab" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/airless, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "ac" = ( /obj/machinery/door/airlock/external{ @@ -18,73 +15,80 @@ /turf/simulated/floor/airless, /area/overgrown_mining_station) "ad" = ( -/obj/machinery/door/airlock/external{ +/obj/structure/bed/stool/chair/sofa/right/black{ dir = 4 }, -/turf/simulated/floor/airless, -/area/overgrown_mining_station) -"ae" = ( -/obj/machinery/door/airlock/mining{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) +"ae" = ( +/turf/simulated/floor/tiled/asteroid/airless, +/turf/unsimulated/floor/asteroid/ash) "af" = ( /obj/machinery/door/airlock/mining{ dir = 1 }, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full/airless, /area/overgrown_mining_station) "ag" = ( -/obj/machinery/door/airlock/mining{ - dir = 1 - }, -/turf/simulated/floor/tiled/airless, +/obj/effect/decal/cleanable/ash, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "ah" = ( /obj/machinery/door/airlock/silver{ dir = 1 }, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full/airless, /area/overgrown_mining_station) "ai" = ( /obj/effect/floor_decal/asteroid, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) "aj" = ( -/obj/machinery/door/airlock/mining{ - dir = 1 +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/railing/mapped{ + dir = 4 }, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "ak" = ( -/obj/machinery/door/airlock/external{ +/obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 4 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "al" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/airless, +/obj/item/material/shard, +/turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "am" = ( -/obj/machinery/door/airlock/external{ +/obj/structure/toilet{ dir = 4 }, -/turf/simulated/floor/airless, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "an" = ( -/obj/machinery/door/airlock/external{ - dir = 4 +/obj/structure/table/reinforced/wood, +/obj/item/device/flashlight/lamp/lava/green, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "aw" = ( /obj/machinery/vending/cigarette, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) +"ax" = ( +/obj/item/reagent_containers/glass/bottle/cyanide, +/turf/unsimulated/floor/asteroid/ash, +/area/overgrown_mining_station) "aK" = ( /obj/item/crowbar, /turf/simulated/floor/airless, @@ -93,6 +97,33 @@ /obj/machinery/media/jukebox, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) +"bn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster{ + pixel_y = 32 + }, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"bt" = ( +/obj/item/trash/cigbutt/roll, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) +"bG" = ( +/obj/structure/trash_pile, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 6 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"bO" = ( +/obj/structure/bookcase/manuals/engineering, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 7 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "bQ" = ( /obj/machinery/autolathe, /turf/simulated/floor/tiled/airless, @@ -100,8 +131,9 @@ "bU" = ( /obj/item/ore_detector, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "bV" = ( +/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "ch" = ( @@ -112,11 +144,20 @@ /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "cx" = ( -/obj/structure/inflatable, +/obj/structure/inflatable/wall, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) +"cA" = ( +/obj/structure/anomaly_container, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) +"cD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/material/shard/wood, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "cX" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/custom_ka_upgrade/cells/loader/uranium, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) @@ -127,6 +168,18 @@ /obj/item/stack/cable_coil/orange, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) +"dn" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/door/window{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "dq" = ( /obj/machinery/constructable_frame/temp_deco{ icon_state = "blueprint_1" @@ -136,15 +189,16 @@ "dt" = ( /obj/item/ore/silver, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) "dD" = ( /obj/effect/overmap/visitable/sector/overgrown_mining_station, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "dF" = ( /obj/effect/floor_decal/asteroid, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "dV" = ( /obj/item/trash/cigbutt/roll, /turf/simulated/floor/tiled/airless, @@ -152,30 +206,90 @@ "dX" = ( /obj/item/pickaxe/silver, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) +"eb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 9 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"ef" = ( +/obj/item/gun/projectile/shotgun/pump/rifle/blank, +/turf/unsimulated/floor/asteroid/ash, +/area/overgrown_mining_station) +"ev" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "eK" = ( -/turf/simulated/floor/diona/airless, -/area/space) +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) +"eO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"eW" = ( +/obj/effect/floor_decal/corner_wide/lime/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "eZ" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/gun/custom_ka/frameE, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"ff" = ( +/obj/structure/trash_pile, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"fh" = ( +/obj/structure/closet/crate/loot, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/full/airless, +/area/overgrown_mining_station) "fj" = ( /obj/machinery/appliance/cooker/oven, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "fx" = ( /obj/machinery/door/airlock/external{ dir = 1 }, +/obj/effect/decal/cleanable/blood/tracks/footprints, /turf/simulated/floor/airless, /area/overgrown_mining_station) +"fC" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/closet/crate, +/obj/item/toy/figure/rd, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) +"fH" = ( +/obj/item/broken_bottle, +/turf/simulated/floor/tiled/asteroid/airless, +/area/overgrown_mining_station) +"fM" = ( +/obj/effect/floor_decal/corner_wide/lime{ + dir = 9 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "fN" = ( -/obj/structure/sign/poster{ - icon_state = "bsposter3" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/turf/simulated/wall, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "fP" = ( /obj/effect/decal/cleanable/liquid_fuel, @@ -187,20 +301,31 @@ /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "fS" = ( -/turf/simulated/floor/tiled, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "gj" = ( /obj/structure/closet/crate/loot, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 10 + }, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "gm" = ( /obj/structure/table/steel, /obj/item/trash/cigbutt/roll, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"go" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/bottle/brandy, +/turf/simulated/floor/tiled/rust/airless, +/area/overgrown_mining_station) "gy" = ( /obj/machinery/mech_recharger, /obj/structure/mech_wreckage/powerloader, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "gC" = ( @@ -229,42 +354,68 @@ "hc" = ( /obj/item/ore/strangerock, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "hd" = ( /obj/item/oreportal, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "hi" = ( -/obj/structure/table/reinforced, +/obj/structure/table/stone/marble, /obj/item/material/knife, +/obj/effect/floor_decal/corner/grey/full{ + dir = 4 + }, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "hp" = ( /obj/item/trash/coffee, -/turf/simulated/floor/tiled/airless, +/obj/structure/undies_wardrobe, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "hv" = ( /obj/structure/curtain/open/shower, /obj/item/bikehorn/rubberducky, /obj/machinery/shower, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"hA" = ( +/obj/effect/floor_decal/corner/grey, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "hG" = ( /obj/machinery/constructable_frame/temp_deco, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) "hJ" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/tiled/airless, +/obj/structure/bed, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "hN" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "hS" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, +/obj/item/material/shard, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"hZ" = ( +/obj/machinery/constructable_frame/temp_deco{ + icon_state = "box_2" + }, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 10 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "ia" = ( /obj/machinery/computer/arcade/battle, /turf/simulated/floor/tiled/rust/airless, @@ -273,26 +424,41 @@ /obj/item/tape_roll, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"ih" = ( +/obj/item/trash/uselessplastic, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "im" = ( /obj/structure/computerframe, /turf/simulated/floor/airless, /area/overgrown_mining_station) +"it" = ( +/obj/item/material/shard/shrapnel, +/turf/unsimulated/floor/asteroid/ash, +/area/overgrown_mining_station) +"iH" = ( +/obj/machinery/floodlight, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "iK" = ( /obj/machinery/vending/robotics, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/tiled/dark/full/airless, /area/overgrown_mining_station) "iT" = ( /obj/structure/toilet{ dir = 4 }, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "iY" = ( /obj/item/custom_ka_upgrade/cells/loader, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "jf" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/stack/material/phoron/full{ icon_state = "sheet-phoron_3" }, @@ -302,13 +468,13 @@ /obj/machinery/door/airlock/silver{ dir = 4 }, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "jm" = ( /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "jq" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/handcuffs/cable, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) @@ -316,8 +482,15 @@ /obj/structure/trash_pile, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"jH" = ( +/obj/structure/bed/stool/chair/folding{ + dir = 8 + }, +/obj/item/material/shard, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "jS" = ( -/obj/structure/table/reinforced/wood, +/obj/structure/table/standard, /obj/item/reagent_containers/food/drinks/bottle/small/beer, /obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/tiled/rust/airless, @@ -340,38 +513,70 @@ /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) "ky" = ( -/turf/simulated/wall, +/obj/structure/table/standard, +/obj/item/trash/stew, +/turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "kC" = ( /obj/machinery/vending/snack, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"kI" = ( +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full/airless, +/area/overgrown_mining_station) +"kP" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "kW" = ( /obj/machinery/floodlight, /turf/simulated/floor/airless, /area/overgrown_mining_station) "lf" = ( /mob/living/simple_animal/carp/baby, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/airless, /area/overgrown_mining_station) "lm" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/tank/phoron, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) "ls" = ( -/mob/living/simple_animal/carp, -/turf/unsimulated/floor/asteroid/ash, -/area/space) +/obj/item/tape_roll, +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "lN" = ( /obj/machinery/constructable_frame/temp_deco{ icon_state = "pico_mani" }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"lO" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) +"lQ" = ( +/obj/structure/closet/emcloset, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) +"lU" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "lV" = ( /mob/living/simple_animal/hostile/carp, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "lX" = ( /obj/item/trash/match, @@ -380,13 +585,16 @@ "md" = ( /obj/effect/floor_decal/asteroid_dug, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) "mf" = ( -/obj/machinery/vending/medical, -/turf/simulated/floor/tiled/airless, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/full/airless, /area/overgrown_mining_station) "ml" = ( /obj/structure/closet/secure_closet/freezer/meat, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "mq" = ( @@ -400,12 +608,30 @@ /obj/effect/decal/cleanable/blood{ icon_state = "gibbearcore" }, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"mu" = ( +/obj/item/trash/cigbutt/roll, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "mw" = ( /obj/machinery/floodlight, /turf/simulated/floor/tiled/asteroid/airless, -/area/space) +/area/overgrown_mining_station) +"mK" = ( +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 1 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) +"mP" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/random/junk, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "nk" = ( /obj/structure/table/rack, /obj/item/towel, @@ -413,7 +639,8 @@ /obj/item/towel, /obj/item/towel, /obj/item/towel, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "nl" = ( /obj/structure/closet/radiation, @@ -430,20 +657,33 @@ "nP" = ( /obj/structure/ore_box, /turf/simulated/floor/tiled/asteroid/airless, -/area/space) +/area/overgrown_mining_station) "nV" = ( /obj/item/trash/popcorn, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) +"ob" = ( +/obj/effect/floor_decal/corner_wide/lime{ + dir = 5 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "oj" = ( -/turf/simulated/wall/diona, -/area/space) +/turf/simulated/floor/tiled/dark/full/airless, +/area/overgrown_mining_station) "om" = ( /obj/machinery/portable_atmospherics/canister/empty/phoron, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) +"op" = ( +/obj/random/medical{ + pixel_y = 6 + }, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "oq" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/crowbar, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) @@ -452,31 +692,36 @@ /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "ot" = ( -/obj/structure/table/steel, /obj/item/custom_ka_upgrade/cells/cell02, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "ov" = ( /obj/item/reagent_containers/food/snacks/chips, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "ox" = ( /obj/structure/ore_box, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "oz" = ( /obj/item/modular_computer/console, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "oD" = ( -/obj/structure/table/steel, +/obj/structure/table/reinforced/steel, /obj/item/rig/industrial/equipped, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "oH" = ( /obj/item/ore/strangerock, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) +"oR" = ( +/obj/structure/table/steel, +/obj/item/stamp/hephaestus, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "oV" = ( /obj/item/tank/jetpack/oxygen, /turf/simulated/floor/tiled/airless, @@ -486,16 +731,26 @@ /turf/simulated/floor/airless, /area/overgrown_mining_station) "pi" = ( -/obj/structure/table/reinforced/wood, +/obj/structure/table/standard, /obj/item/trash/chipbasket, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "pp" = ( /obj/item/ore/silver, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) +"pB" = ( +/obj/structure/closet/crate/loot, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "pM" = ( /obj/machinery/floodlight, +/obj/structure/sign/poster{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "pP" = ( @@ -519,7 +774,7 @@ "qu" = ( /obj/structure/flora/rock, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "qA" = ( /obj/effect/decal/cleanable/liquid_fuel, /turf/simulated/floor/tiled/airless, @@ -530,17 +785,30 @@ }, /turf/simulated/wall, /area/overgrown_mining_station) +"qN" = ( +/obj/machinery/vending/medical, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "qQ" = ( -/obj/structure/diona/bulb, -/turf/simulated/floor/diona/airless, -/area/space) +/obj/structure/bed/stool/chair/sofa/left/black{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "ra" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /turf/simulated/floor/tiled/asteroid/airless, -/area/space) +/area/overgrown_mining_station) "rf" = ( -/obj/structure/table/reinforced, +/obj/structure/table/stone/marble, /obj/item/trash/snack_bowl, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "rl" = ( @@ -560,22 +828,47 @@ /obj/structure/grille/broken, /turf/template_noop, /area/overgrown_mining_station) +"rA" = ( +/obj/item/trash/uselessplastic, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "rC" = ( -/turf/simulated/wall, -/area/space) +/obj/item/bedsheet/dorms, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "rH" = ( -/obj/structure/table/reinforced, -/obj/item/material/ashtray, -/turf/simulated/floor/tiled/airless, +/obj/structure/table/steel, +/obj/random/medical{ + pixel_y = 6 + }, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "rK" = ( /obj/item/cell/hyper, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/tiled/dark/full/airless, /area/overgrown_mining_station) "rV" = ( /obj/structure/grille/broken, /turf/template_noop, /area/overgrown_mining_station) +"sa" = ( +/obj/structure/table/stone/marble, +/obj/item/trash/plate, +/obj/effect/floor_decal/corner/grey/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"sw" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "sz" = ( /obj/structure/closet/crate, /turf/simulated/floor/diona/airless, @@ -584,16 +877,40 @@ /obj/item/surgery/scalpel, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"sJ" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_deco{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark/full/airless, +/area/overgrown_mining_station) +"sP" = ( +/obj/item/material/shard/wood, +/turf/simulated/floor/tiled/asteroid/airless, +/area/overgrown_mining_station) "sQ" = ( /obj/structure/flora/rock/pile, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "sR" = ( /obj/machinery/door/airlock/silver{ name = "Toilet"; dir = 4 }, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"td" = ( +/obj/effect/floor_decal/corner_wide/lime{ + dir = 10 + }, +/obj/item/flora/pottedplant_small/dead, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "tg" = ( /obj/structure/bed/stool/chair/office/bridge{ @@ -616,21 +933,44 @@ "tF" = ( /obj/item/ore, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) +"tJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "tK" = ( -/obj/structure/sign/poster{ - icon_state = "bsposter10" - }, -/turf/simulated/wall, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) +"tT" = ( +/obj/structure/curtain/open/shower, +/obj/machinery/shower, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "tY" = ( /obj/structure/ore_box, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"un" = ( +/obj/structure/railing/mapped, +/obj/item/material/shard, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "uw" = ( /obj/structure/flora/rock/pile, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/airless, +/area/overgrown_mining_station) +"uK" = ( +/obj/item/trash/broken_electronics, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 5 + }, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "uO" = ( /obj/machinery/door/airlock/mining{ @@ -638,38 +978,92 @@ }, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) +"uU" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/obj/random/junk, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) +"vm" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/mining{ + dir = 4 + }, +/turf/simulated/floor/tiled/full/airless, +/area/overgrown_mining_station) "vB" = ( /obj/effect/map_effect/window_spawner/full/reinforced, /turf/simulated/floor/plating, /area/overgrown_mining_station) +"vQ" = ( +/obj/random/medical{ + pixel_y = 6 + }, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 9 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "vU" = ( /obj/item/reagent_containers/food/snacks/phoroncandy, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) +"vY" = ( +/obj/machinery/constructable_frame/temp_deco, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 10 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"wm" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "ws" = ( /obj/item/ore/iron, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "wt" = ( -/obj/structure/table/reinforced/wood, +/obj/structure/table/standard, /obj/item/broken_bottle, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "wv" = ( /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) +"wA" = ( +/obj/effect/decal/cleanable/blood/tracks/footprints, +/turf/simulated/floor/airless, +/area/overgrown_mining_station) "wC" = ( /obj/item/gun/projectile/pistol/sol, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"wJ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "wN" = ( /obj/item/pickaxe/diamond, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) "wU" = ( /obj/structure/ore_box, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) "xh" = ( /obj/item/trash/cigbutt/roll, /turf/simulated/floor/tiled/rust/airless, @@ -691,9 +1085,9 @@ "xq" = ( /obj/structure/flora/rock/pile, /turf/unsimulated/mineral/asteroid, -/area/space) +/area/overgrown_mining_station) "xt" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) "xu" = ( @@ -704,7 +1098,6 @@ /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "xH" = ( -/obj/structure/table/steel, /obj/item/gun/custom_ka/frame03/prebuilt/shaft_miner, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) @@ -714,8 +1107,29 @@ }, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"xT" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 5 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"xV" = ( +/obj/item/material/shard/shrapnel, +/turf/simulated/floor/tiled/asteroid/airless, +/area/overgrown_mining_station) "yc" = ( /obj/machinery/appliance/cooker/stove, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"yd" = ( +/obj/item/material/shard{ + icon_state = "shrapnelmedium" + }, +/obj/effect/decal/cleanable/floor_damage/tiled_broken2, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "yp" = ( @@ -723,14 +1137,21 @@ /obj/item/trash/broken_electronics, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"yr" = ( +/obj/effect/floor_decal/corner_wide/lime/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "ys" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/item/stack/cable_coil, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "yw" = ( +/obj/structure/platform, /obj/machinery/mecha_part_fabricator, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/tiled/dark/full/airless, /area/overgrown_mining_station) "yy" = ( /turf/simulated/wall, @@ -739,17 +1160,30 @@ /obj/item/material/shard{ icon_state = "shrapnelmedium" }, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 6 + }, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "yF" = ( /obj/structure/bed, /obj/item/material/knife/tacknife, -/turf/simulated/floor/tiled/airless, +/obj/item/bedsheet/dorms, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "yK" = ( -/obj/structure/table/reinforced/wood, -/obj/item/reagent_containers/food/drinks/bottle/brandy, -/turf/simulated/floor/tiled/rust/airless, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) +"yO" = ( +/obj/structure/sink{ + pixel_y = 21 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "yU" = ( /obj/effect/decal/cleanable/blood/oil{ @@ -761,9 +1195,21 @@ /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"zi" = ( +/obj/machinery/constructable_frame/temp_deco{ + icon_state = "box_1" + }, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 9 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "zj" = ( -/obj/structure/table/reinforced, +/obj/structure/table/stone/marble, /obj/item/trash/plate, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "zp" = ( @@ -774,10 +1220,29 @@ /obj/item/ore/phoron, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"zS" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "zY" = ( /obj/structure/closet/radiation, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"Ae" = ( +/obj/effect/floor_decal/corner_wide/lime{ + dir = 6 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"Af" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/item/toy/comic/azmarian/issue_6, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "Ao" = ( /obj/structure/bed/stool/chair/folding{ dir = 4 @@ -785,7 +1250,16 @@ /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "Au" = ( -/obj/machinery/vending/dinnerware/plastic, +/obj/machinery/vending/dinnerware, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/structure/window{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/full{ + dir = 8 + }, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Ax" = ( @@ -795,27 +1269,33 @@ /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "Az" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/item/paper_bin, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"AA" = ( +/obj/random/pottedplant, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "AC" = ( /obj/structure/flora/rock/pile, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) "AF" = ( /obj/structure/closet/crate/trashcart, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "AJ" = ( /mob/living/simple_animal/carp, -/turf/simulated/floor/tiled/asteroid/airless, -/area/space) +/turf/unsimulated/floor/asteroid/ash, +/area/overgrown_mining_station) "AQ" = ( /obj/machinery/door/airlock/mining{ dir = 4 }, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full/airless, /area/overgrown_mining_station) "AS" = ( /obj/machinery/constructable_frame/temp_deco, @@ -826,7 +1306,7 @@ /obj/item/ore, /obj/structure/diona/bulb, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) "Be" = ( /obj/effect/decal/cleanable/ash, /turf/simulated/floor/tiled/airless, @@ -835,34 +1315,77 @@ /obj/item/trash/cigbutt/roll, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) +"Bw" = ( +/mob/living/simple_animal/carp/baby, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"BF" = ( +/obj/machinery/vending/dinnerware/plastic, +/turf/simulated/floor/tiled/rust/airless, +/area/overgrown_mining_station) "BV" = ( -/obj/structure/sign/poster{ - icon_state = "bsposter4" +/obj/structure/railing/mapped{ + dir = 4 }, -/turf/simulated/wall, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "Cf" = ( /obj/item/shreddedp, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"Cu" = ( +/obj/structure/table/reinforced/steel, +/obj/item/trash/cigbutt/roll, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) +"CH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 10 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "CP" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/item/pickaxe/drill/weak, /turf/simulated/floor/tiled/asteroid/airless, -/area/space) +/area/overgrown_mining_station) "CU" = ( /obj/machinery/constructable_frame/temp_deco, /obj/item/circuitboard/refiner, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"CW" = ( +/obj/structure/platform_stairs{ + dir = 4 + }, +/obj/structure/platform/ledge{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full/airless, +/area/overgrown_mining_station) "Db" = ( -/obj/structure/table/reinforced, +/obj/structure/table/stone/marble, /obj/machinery/reagentgrinder, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/structure/sign/poster{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) +"Dc" = ( +/obj/item/book/manual/wiki/engineering_hacking, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "Do" = ( /obj/machinery/mech_recharger, /obj/effect/decal/cleanable/blood/oil, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "Dw" = ( @@ -870,13 +1393,27 @@ icon_state = "asteroid9" }, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "Dy" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"DA" = ( +/obj/item/stack/cable_coil, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"DE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "DF" = ( /obj/structure/dispenser/phoron, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "Ed" = ( @@ -896,12 +1433,19 @@ /area/overgrown_mining_station) "EB" = ( /obj/item/trash/broken_electronics, -/turf/simulated/floor/tiled/airless, +/obj/structure/bed/roller, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "EC" = ( /obj/machinery/optable, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"EF" = ( +/obj/effect/decal/cleanable/ash, +/obj/item/tank/oxygen, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "EJ" = ( /obj/item/trash/uselessplastic, /turf/simulated/floor/diona/airless, @@ -912,21 +1456,46 @@ /area/overgrown_mining_station) "EU" = ( /obj/machinery/computer/arcade/orion_trail, +/obj/structure/sign/poster{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) +"EV" = ( +/obj/item/trash/cigbutt/roll, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "Fb" = ( /obj/structure/closet/secure_closet/xenoarchaeologist, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"Fg" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/full/airless, +/area/overgrown_mining_station) "Fh" = ( /obj/machinery/conveyor, /obj/item/ore/phoron, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"Fq" = ( +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "FC" = ( /obj/structure/table/reinforced/wood, /obj/item/trash/cigbutt/roll, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) +"FF" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "FQ" = ( /obj/effect/decal/cleanable/ash, @@ -941,61 +1510,95 @@ "Ga" = ( /obj/item/oremagnet, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) "Gl" = ( /obj/machinery/artifact, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "Gy" = ( /obj/item/stack/cable_coil, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"GU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "GV" = ( /obj/item/material/shard, /turf/template_noop, /area/space) "Hf" = ( /turf/simulated/mineral/random/high_chance, -/area/space) +/area/overgrown_mining_station) "Hn" = ( /obj/item/gun/energy/pistol, -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled/airless, +/obj/structure/table/steel, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 6 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"Hu" = ( +/obj/random/firstaid{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "HM" = ( /obj/item/material/shard, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) +"HU" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 7 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "HW" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/item/gun/custom_ka/frame04/prebuilt, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "Ia" = ( /obj/machinery/mech_recharger, /mob/living/heavy_vehicle/premade/ripley/cargo, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "Ih" = ( -/obj/structure/table/reinforced, /obj/item/trash/candy, +/obj/random/cookingoil, +/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Im" = ( /obj/structure/mech_wreckage, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "In" = ( /obj/structure/bed, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/item/toy/plushie/carp, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "Iu" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Ix" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /turf/simulated/floor/airless, /area/overgrown_mining_station) "Iy" = ( @@ -1006,32 +1609,35 @@ /obj/structure/curtain/open/shower, /obj/item/soap/deluxe, /obj/machinery/shower, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "IG" = ( /turf/unsimulated/mineral/asteroid, -/area/space) +/area/overgrown_mining_station) "IJ" = ( /obj/machinery/artifact, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "IM" = ( -/obj/structure/sign/poster{ - icon_state = "bsposter2" +/obj/item/stack/cable_coil/green{ + icon_state = "coil2" }, -/turf/simulated/wall, +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full/airless, /area/overgrown_mining_station) "IO" = ( /obj/structure/flora/rock, /turf/simulated/floor/diona/airless, -/area/space) +/area/overgrown_mining_station) "IT" = ( -/obj/structure/table/reinforced, -/obj/item/stamp/hephaestus, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "Jd" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/stack/cable_coil/orange{ icon_state = "coil2" }, @@ -1040,9 +1646,10 @@ "Je" = ( /obj/machinery/floodlight, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "Jh" = ( /obj/structure/reagent_dispensers/fueltank, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "Jm" = ( @@ -1053,7 +1660,10 @@ /area/overgrown_mining_station) "Jq" = ( /obj/effect/floor_decal/asteroid, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 4 + }, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Jv" = ( /obj/item/stack/rods{ @@ -1062,28 +1672,45 @@ /turf/template_noop, /area/space) "Jw" = ( -/obj/structure/table/reinforced/wood, +/obj/structure/table/standard, /obj/item/trash/plate, /obj/item/device/flashlight, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "JD" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/item/storage/box/fancy/cigarettes/cigar, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Kf" = ( /obj/item/ore, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "Kq" = ( -/obj/structure/table/reinforced/wood, +/obj/structure/table/standard, /obj/item/pizzabox/meat, /obj/item/pickaxe/drill, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) +"Kt" = ( +/obj/effect/decal/cleanable/blood/tracks/footprints, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "Kx" = ( -/obj/structure/sink/kitchen, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"KH" = ( +/obj/structure/table/reinforced/steel, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) +"KL" = ( +/obj/machinery/portable_atmospherics/canister/empty/oxygen, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) +"KQ" = ( +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "KS" = ( @@ -1101,7 +1728,21 @@ "Lm" = ( /obj/structure/table/reinforced/wood, /obj/item/reagent_containers/food/snacks/chips, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) +"Lq" = ( +/obj/effect/decal/cleanable/blood/oil{ + icon_state = "gib4" + }, +/obj/random/medical{ + pixel_y = 6 + }, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Lv" = ( /obj/machinery/vending/cigarette, @@ -1135,7 +1776,10 @@ "Mh" = ( /obj/structure/table/reinforced/wood, /obj/item/trash/can, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "Ms" = ( /obj/item/material/stool/chair/folding, @@ -1158,25 +1802,44 @@ /area/overgrown_mining_station) "MP" = ( /obj/structure/closet/secure_closet/kitchen_cabinet/standard, +/obj/effect/floor_decal/corner/grey/full{ + dir = 4 + }, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) +"MS" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/overgrown_mining_station) "MW" = ( /obj/item/ore/glass, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "Nb" = ( /obj/item/device/flashlight, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) +"Nh" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 5 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "Nk" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/effect/decal/cleanable/ash, +/obj/item/flora/pottedplant_small/rose, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "Nt" = ( /obj/effect/floor_decal/asteroid_dug, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) +"NV" = ( +/obj/item/material/shard/wood, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "NX" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/trash_pile, @@ -1185,9 +1848,14 @@ "NY" = ( /obj/item/ore/uranium, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) +"Oi" = ( +/obj/item/trash/uselessplastic, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "Ol" = ( -/obj/structure/table/steel, +/obj/structure/table/reinforced/steel, /obj/item/pickaxe, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) @@ -1199,18 +1867,23 @@ "OF" = ( /obj/effect/floor_decal/asteroid, /turf/simulated/floor/tiled/asteroid/airless, -/area/space) +/area/overgrown_mining_station) "OS" = ( /obj/structure/bed/stool/bar, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) +"Pa" = ( +/obj/item/trash/can, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "Pb" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/closet/crate, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "Pj" = ( -/obj/structure/table/steel, +/obj/structure/table/reinforced/steel, /obj/item/coin/phoron, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) @@ -1218,21 +1891,50 @@ /obj/machinery/vending/boozeomat/merchant, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) +"Pp" = ( +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "Pu" = ( /obj/machinery/door/blast/regular/open, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) +"Pw" = ( +/obj/machinery/floodlight, +/obj/effect/decal/cleanable/dirt, +/obj/item/material/shard/wood, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "Px" = ( /obj/structure/crystal, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) +"PF" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "PP" = ( -/obj/structure/table/reinforced/wood, +/obj/structure/table/standard, /obj/item/rig/industrial/equipped, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) +"Qb" = ( +/obj/item/tape_roll, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) +"Qj" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "Qm" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/item/gun/custom_ka/frame03/prebuilt/shaft_miner, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) @@ -1253,33 +1955,64 @@ /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "QV" = ( -/obj/structure/table/reinforced, +/obj/structure/table/stone/marble, /obj/item/reagent_containers/food/snacks/phoroncandy, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Rd" = ( /obj/item/stack/cable_coil/green{ icon_state = "coil2" }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "Rf" = ( -/obj/structure/table/reinforced, +/obj/structure/table/stone/marble, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/structure/window{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/full, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Rg" = ( /obj/structure/table/rack, /obj/item/soap/deluxe, /obj/item/soap/deluxe, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Rj" = ( /mob/living/simple_animal/carp/baby, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) +"Rs" = ( +/obj/item/pickaxe/drill, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) +"Rv" = ( +/obj/machinery/vending/engineering{ + req_access = null + }, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "RC" = ( /turf/simulated/floor/tiled/asteroid/airless, -/area/space) +/area/overgrown_mining_station) +"RJ" = ( +/obj/effect/floor_decal/corner_wide/lime{ + dir = 10 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "RS" = ( /obj/structure/diona/bulb, /turf/simulated/floor/diona/airless, @@ -1288,9 +2021,30 @@ /obj/machinery/constructable_frame/temp_deco, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"Sf" = ( +/obj/structure/platform, +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/tiled/dark/full/airless, +/area/overgrown_mining_station) +"Sh" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"St" = ( +/obj/effect/decal/cleanable/floor_damage/tiled_broken3, +/obj/machinery/iv_drip, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"SX" = ( +/obj/machinery/floodlight, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "SZ" = ( /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) "Tc" = ( /obj/item/wrench, /turf/simulated/floor/tiled/airless, @@ -1299,11 +2053,12 @@ /obj/item/stack/cable_coil/cyan{ icon_state = "coil2" }, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "TE" = ( -/obj/structure/table/reinforced/wood, -/obj/item/trash/stew, +/obj/random/junk, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "TK" = ( @@ -1311,18 +2066,19 @@ /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "TO" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/item/pickaxe, /turf/simulated/floor/tiled/asteroid/airless, -/area/space) +/area/overgrown_mining_station) "TR" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/item/gun/energy/xray/xenoarch, /turf/simulated/floor/airless, /area/overgrown_mining_station) "TU" = ( /obj/structure/grille/broken, -/turf/simulated/floor/tiled/airless, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Ub" = ( /obj/structure/ore_box, @@ -1334,26 +2090,57 @@ }, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"Uu" = ( +/obj/structure/platform, +/turf/simulated/floor/tiled/dark/full/airless, +/area/overgrown_mining_station) +"UA" = ( +/obj/structure/sink{ + pixel_y = 21 + }, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "UE" = ( /obj/machinery/door/airlock/external{ dir = 1 }, +/obj/effect/decal/cleanable/blood/tracks/footprints, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "UI" = ( /obj/item/pickaxe, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"UT" = ( +/obj/item/material/shard/shrapnel, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 10 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "UZ" = ( /obj/item/pickaxe/drill, /turf/unsimulated/floor/asteroid/ash, -/area/space) +/area/overgrown_mining_station) +"Vj" = ( +/obj/structure/bed, +/obj/item/bedsheet/dorms, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/structure/sign/poster{ + pixel_y = 32 + }, +/turf/simulated/floor/wood/airless, +/area/overgrown_mining_station) "Vn" = ( +/obj/item/trash/broken_electronics, +/obj/structure/platform, /obj/machinery/constructable_frame/temp_deco{ icon_state = "box_1" }, -/obj/item/trash/broken_electronics, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/tiled/dark/full/airless, /area/overgrown_mining_station) "Vs" = ( /obj/item/trash/plate, @@ -1361,7 +2148,7 @@ /area/overgrown_mining_station) "Vt" = ( /obj/structure/inflatable, -/obj/structure/inflatable, +/obj/structure/inflatable/wall, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) "VA" = ( @@ -1369,21 +2156,31 @@ /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "VC" = ( -/obj/structure/table/reinforced, /obj/item/custom_ka_upgrade/barrels/supermatter, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) -"Ws" = ( -/obj/structure/table/reinforced, +"Wd" = ( /obj/item/trash/cigbutt/roll, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"Wn" = ( +/obj/machinery/iv_drip, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"Ws" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "WC" = ( /obj/random/pottedplant, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "WN" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/item/reagent_containers/food/drinks/flask, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) @@ -1392,6 +2189,13 @@ /obj/structure/ore_box, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"Xe" = ( +/obj/structure/platform, +/obj/machinery/constructable_frame/temp_deco{ + icon_state = "box_1" + }, +/turf/simulated/floor/tiled/dark/full/airless, +/area/overgrown_mining_station) "Xs" = ( /obj/machinery/constructable_frame/temp_deco{ icon_state = "blueprint_0" @@ -1403,44 +2207,108 @@ /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "XB" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel, /obj/item/stack/cable_coil/green, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"XC" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/simulated/floor/tiled/airless, +/area/overgrown_mining_station) "XE" = ( /obj/structure/table/steel, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"XL" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full/airless, +/area/overgrown_mining_station) +"XT" = ( +/obj/effect/floor_decal/corner_wide/lime/full{ + dir = 8 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "XY" = ( /obj/item/ore/glass, -/turf/simulated/floor/tiled/airless, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"Yb" = ( +/obj/item/trash/plate, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "Yh" = ( -/obj/structure/bed, -/obj/structure/curtain/black, -/turf/simulated/floor/tiled/airless, +/obj/structure/bed/stool/chair/sofa/black{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "Yi" = ( /obj/item/ore/gold, /turf/template_noop, /area/space) +"Yl" = ( +/obj/machinery/door/airlock{ + dir = 4 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "Ym" = ( /obj/structure/bed/stool/chair/folding, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/door/window{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"Yp" = ( +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/item/ore/glass, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "Yv" = ( /obj/item/trash/cigbutt/roll, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) +"YF" = ( +/obj/item/trash/cigbutt/roll, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 5 + }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "YJ" = ( /obj/machinery/crystal, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) +"YO" = ( +/obj/effect/floor_decal/corner_wide/lime/full, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "YW" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/floodlight, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) +"Zk" = ( +/obj/item/material/shard, +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/turf/simulated/floor/tiled/white/airless, +/area/overgrown_mining_station) "Zo" = ( /obj/item/deployable_kit/surgery_table, /turf/simulated/floor/tiled/airless, @@ -1456,11 +2324,14 @@ /area/overgrown_mining_station) "ZP" = ( /obj/item/gun/custom_ka/frame04, -/turf/simulated/floor/tiled/airless, +/obj/structure/platform_stairs{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full/airless, /area/overgrown_mining_station) "ZT" = ( /obj/structure/curtain/black, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/wood/airless, /area/overgrown_mining_station) "ZY" = ( /obj/machinery/mineral/equipment_vendor, @@ -1468,8 +2339,11 @@ /area/overgrown_mining_station) "ZZ" = ( /obj/item/surgery/scalpel/manager, -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled/airless, +/obj/structure/table/steel, +/obj/effect/floor_decal/corner_wide/lime{ + dir = 6 + }, +/turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) (1,1,1) = {" @@ -22133,9 +23007,9 @@ SZ SZ SZ SZ -oj -oj -eK +Eh +Eh +wv SZ IG IG @@ -22391,8 +23265,8 @@ gV SZ SZ SZ -qQ -eK +RS +wv SZ SZ SZ @@ -22649,7 +23523,7 @@ SZ SZ SZ SZ -oj +Eh SZ SZ SZ @@ -22899,7 +23773,7 @@ SZ IG SZ SZ -eK +wv SZ SZ SZ @@ -23155,8 +24029,8 @@ gV sQ IG SZ -eK -qQ +wv +RS SZ SZ SZ @@ -23413,7 +24287,7 @@ SZ SZ SZ SZ -oj +Eh SZ SZ SZ @@ -24231,7 +25105,7 @@ SZ SZ IG IG -ls +AJ IG Hf Hf @@ -24429,11 +25303,11 @@ SZ IG IG IG -oj -oj -oj -oj -oj +Eh +Eh +Eh +Eh +Eh IG IG Hf @@ -24686,11 +25560,11 @@ Dw IG IG IG -oj -qQ -eK -eK -oj +Eh +RS +wv +wv +Eh IG IG IG @@ -24943,15 +25817,15 @@ SZ IG IG IG -oj -eK -eK -eK -oj -oj -oj -oj -oj +Eh +wv +wv +wv +Eh +Eh +Eh +Eh +Eh SZ IG IG @@ -25200,17 +26074,17 @@ SZ IG IG IG -oj -eK -eK -eK -eK -eK -oj -oj +Eh +wv +wv +wv +wv +wv +Eh +Eh SZ dF -oj +Eh IG IG IG @@ -25457,17 +26331,17 @@ SZ SZ SZ IG -oj -eK -eK -qQ -eK +Eh +wv +wv +RS +wv IO -eK -eK -eK -eK -oj +wv +wv +wv +wv +Eh IG IG IG @@ -25714,18 +26588,18 @@ SZ SZ SZ IG -oj -eK -eK -eK -eK -eK -eK -eK -eK -eK -oj -oj +Eh +wv +wv +wv +wv +wv +wv +wv +wv +wv +Eh +Eh SZ SZ SZ @@ -25972,19 +26846,19 @@ SZ SZ IG IG -oj -oj -eK -eK -eK -eK -eK -eK -eK -eK -qQ +Eh +Eh +wv +wv +wv +wv +wv +wv +wv +wv +RS SZ -oj +Eh IG SZ SZ @@ -26230,18 +27104,18 @@ SZ IG IG IG -oj -eK -qQ -eK -eK -qQ -eK -eK -eK -eK +Eh +wv +RS +wv +wv +RS +wv +wv +wv +wv SZ -oj +Eh IG SZ Kf @@ -26309,7 +27183,7 @@ SZ SZ SZ SZ -ls +AJ SZ gV gV @@ -26487,18 +27361,18 @@ sQ IG IG IG -oj -oj -eK -eK -eK -eK -eK -oj -eK +Eh +Eh +wv +wv +wv +wv +wv +Eh +wv SZ SZ -oj +Eh IG SZ Hf @@ -26745,17 +27619,17 @@ IG IG IG IG -oj -eK -eK -oj -oj -eK -oj -oj -oj -oj -oj +Eh +wv +wv +Eh +Eh +wv +Eh +Eh +Eh +Eh +Eh IG SZ Hf @@ -27002,16 +27876,16 @@ IG IG IG IG -oj -oj -eK -eK -eK -eK -eK -oj -oj -oj +Eh +Eh +wv +wv +wv +wv +wv +Eh +Eh +Eh IG IG SZ @@ -27258,17 +28132,17 @@ IG IG IG IG -oj -oj +Eh +Eh wU -eK -eK -eK -eK -eK -qQ -oj -oj +wv +wv +wv +wv +wv +RS +Eh +Eh SZ IG IG @@ -27293,7 +28167,7 @@ SZ SZ SZ IG -ls +AJ SZ IG SZ @@ -27515,17 +28389,17 @@ SZ IG IG IG -oj -eK -oj -eK -eK -qQ -eK +Eh +wv +Eh +wv +wv +RS +wv IG -eK -eK -eK +wv +wv +wv SZ IG IG @@ -27772,18 +28646,18 @@ SZ SZ IG IG -oj +Eh oH -eK -oj -eK -eK -eK -eK -eK -eK -eK -eK +wv +Eh +wv +wv +wv +wv +wv +wv +wv +wv SZ SZ SZ @@ -28028,18 +28902,18 @@ SZ SZ SZ IG -oj -eK -qQ -eK -oj -eK -eK -eK -eK -qQ -eK -eK +Eh +wv +RS +wv +Eh +wv +wv +wv +wv +RS +wv +wv SZ SZ SZ @@ -28289,12 +29163,12 @@ SZ SZ SZ SZ -oj -eK -oj -oj -eK -eK +Eh +wv +Eh +Eh +wv +wv SZ Nt SZ @@ -28530,14 +29404,14 @@ gV gV gV gV -ky -ky -ky -ky -ky -ky -ky -ky +yy +yy +yy +yy +yy +yy +yy +yy SZ SZ SZ @@ -28546,11 +29420,11 @@ SZ SZ SZ SZ -oj +Eh SZ -eK -oj -eK +wv +Eh +wv SZ SZ SZ @@ -28786,15 +29660,15 @@ gV gV gV gV -ky -ky +yy +yy xu Ix XB IJ xu xu -ky +yy SZ SZ SZ @@ -28805,11 +29679,11 @@ SZ SZ SZ SZ -eK -oj -eK -eK -eK +wv +Eh +wv +wv +wv SZ SZ SZ @@ -29041,32 +29915,32 @@ gV gV gV gV -ky -ky -ky -xu -jm +yy +yy +yy xu jm -jm xu +IT +IT +MS xu -ky +yy SZ ys -hN -hN -hN -hN SZ SZ SZ SZ -qQ -eK -eK -qQ -eK +SZ +SZ +SZ +SZ +RS +wv +wv +RS +wv SZ SZ SZ @@ -29298,7 +30172,7 @@ gV gV gV gV -ky +yy Ix TR jm @@ -29308,7 +30182,7 @@ jm xu xu xu -ky +yy SZ hN SZ @@ -29555,17 +30429,17 @@ gV gV gV gV -ky +yy jm xu jm -jm +cA jm xu aK dq xu -ky +yy SZ HW SZ @@ -29812,17 +30686,17 @@ gV gV gV gV -ky -jm +yy jm +IT jm xu jm QQ -ky -ky -ky -ky +yy +yy +yy +yy SZ SZ SZ @@ -30069,7 +30943,7 @@ gV gV gV gV -ky +yy Fb jm jm @@ -30082,38 +30956,38 @@ xu KS RC RC +ae RC +SZ RC RC RC RC +SZ RC +SZ +SZ RC RC +SZ RC +SZ +SZ +SZ RC RC RC RC RC +SZ RC +SZ RC +SZ +SZ RC RC -RC -RC -RC -RC -RC -RC -RC -RC -RC -RC -RC -RC -RC -RC +SZ RC IG IG @@ -30135,7 +31009,7 @@ SZ IG IG SZ -ls +AJ IG IG IG @@ -30326,52 +31200,52 @@ gV gV gV gV -ky +yy kW jm -jm +XC qm -xu -jm +wA +Kt UE -xu -xu +wA +wA fx RC RC RC +SZ RC RC +SZ RC +SZ +SZ RC +SZ RC +SZ RC RC +SZ RC RC RC RC RC +SZ RC RC +SZ RC RC RC -RC -RC -RC -RC -RC -RC -RC -RC -RC -RC +SZ AJ RC +SZ RC -RC -RC +SZ IG IG SZ @@ -30583,16 +31457,16 @@ gV gV gV gV -ky +yy im -jm -jm +IT +kP jm xu xu -ky -ky -ky +yy +yy +yy Eh Je SZ @@ -30840,7 +31714,7 @@ gV gV gV gV -ky +yy rl jm jm @@ -30851,15 +31725,15 @@ xu RS Ep Eh -oj -eK -eK -eK -eK -eK -qQ +Eh +wv +wv +wv +wv +wv +RS tF -eK +wv SZ SZ SZ @@ -30883,7 +31757,7 @@ SZ Kf SZ SZ -RC +SZ RC SZ IG @@ -31097,27 +31971,27 @@ gV gV gV gV -ky +yy pf -xu -jm +MS jm +IT jm RW -hS +XE wv Ep Eh -eK -eK -qQ -eK -eK -oj -oj -eK -eK -qQ +wv +wv +RS +wv +wv +Eh +Eh +wv +wv +RS SZ IG IG @@ -31354,7 +32228,7 @@ gV gV gV gV -ky +yy xu xu jm @@ -31365,16 +32239,16 @@ xt wv wv Eh -eK -eK -eK -eK -eK -oj -eK +wv +wv +wv +wv +wv +Eh +wv ai -eK -eK +wv +wv SZ IG IG @@ -31611,28 +32485,28 @@ gV gV gV gV -ky -xu -xu +yy +MS xu +MS RS xu -jm +IT Qm wv RS Eh -eK -eK -eK -oj -oj -oj -oj +wv +wv +wv +Eh +Eh +Eh +Eh ai -eK -eK -eK +wv +wv +wv IG IG IG @@ -31655,7 +32529,7 @@ SZ SZ SZ RC -RC +SZ SZ SZ IG @@ -31868,9 +32742,9 @@ gV gV gV gV -ky -ky -ky +yy +yy +yy kW xu xu @@ -31879,17 +32753,17 @@ wv wv wv Eh -qQ -eK -eK -qQ -oj -oj -oj -eK -qQ -eK -eK +RS +wv +wv +RS +Eh +Eh +Eh +wv +RS +wv +wv IG IG IG @@ -31911,7 +32785,7 @@ IG IG SZ SZ -RC +SZ RC SZ SZ @@ -32127,8 +33001,8 @@ gV gV SZ SZ -ky -xu +yy +MS xu Xs wv @@ -32136,23 +33010,23 @@ RS wv wv Eh -eK -eK -eK -eK -eK -oj -oj -oj -eK -oj -eK -eK -qQ -eK +wv +wv +wv +wv +wv +Eh +Eh +Eh +wv +Eh +wv +wv +RS +wv tF -eK -eK +wv +wv SZ SZ IG @@ -32384,41 +33258,41 @@ gV gV SZ SZ -ky -ky -ky -ky +yy +yy +yy +yy wv -ky +yy Eh Eh Eh -eK -eK -eK -eK -eK -oj -oj -oj -eK -oj -eK -eK -oj -oj +wv +wv +wv +wv +wv +Eh +Eh +Eh +wv +Eh +wv +wv +Eh +Eh IG -qQ -eK -eK -qQ +RS +wv +wv +RS IG IG IG SZ SZ -eK -eK +wv +wv IG IG IG @@ -32426,7 +33300,7 @@ IG SZ SZ RC -RC +SZ SZ SZ IG @@ -32642,46 +33516,46 @@ gV SZ SZ SZ -eK -eK -eK -eK -qQ -eK -eK -eK -eK -eK +wv +wv +wv +wv +RS +wv +wv +wv +wv +wv tF -eK +wv IG -oj -oj -oj -qQ -eK -eK -oj -oj -oj +Eh +Eh +Eh +RS +wv +wv +Eh +Eh +Eh IG -eK -eK -eK -eK +wv +wv +wv +wv IG IG IG -eK -eK -eK -eK -qQ -oj -eK -eK -eK -eK +wv +wv +wv +wv +RS +Eh +wv +wv +wv +wv RC RC SZ @@ -32899,45 +33773,45 @@ gV SZ SZ SZ -eK -oj -oj -oj -oj -oj -eK -eK -eK -qQ -oj -oj -oj -oj -oj -oj -eK -eK -eK -oj -oj -oj -eK -eK -oj -eK -eK -eK -qQ -eK -eK -eK -qQ -eK -oj -oj +wv +Eh +Eh +Eh +Eh +Eh +wv +wv +wv +RS +Eh +Eh +Eh +Eh +Eh +Eh +wv +wv +wv +Eh +Eh +Eh +wv +wv +Eh +wv +wv +wv +RS +wv +wv +wv +RS +wv +Eh +Eh IG IG -eK +wv Ga RC RC @@ -33156,46 +34030,46 @@ gV SZ SZ SZ -qQ -oj -eK -eK -eK +RS +Eh +wv +wv +wv ai -eK -eK -oj -eK -oj -oj -oj -oj -oj -eK -eK -qQ -eK -eK -qQ -oj -oj -oj -oj -eK -eK +wv +wv +Eh +wv +Eh +Eh +Eh +Eh +Eh +wv +wv +RS +wv +wv +RS +Eh +Eh +Eh +Eh +wv +wv tF -eK -eK -eK -eK -eK -oj -oj +wv +wv +wv +wv +wv +Eh +Eh IG -eK +wv IG IG -qQ +RS RC RC SZ @@ -33413,47 +34287,47 @@ gV SZ SZ SZ -eK -oj -oj -eK -eK -qQ -eK +wv +Eh +Eh +wv +wv +RS +wv IG -oj -oj -oj -oj +Eh +Eh +Eh +Eh IG -eK -eK -eK -eK -eK -oj -oj -oj -oj -oj -eK -eK -qQ -eK -eK -eK -eK -eK -oj -oj -oj -oj -eK -eK +wv +wv +wv +wv +wv +Eh +Eh +Eh +Eh +Eh +wv +wv +RS +wv +wv +wv +wv +wv +Eh +Eh +Eh +Eh +wv +wv IG IG -eK -RC +wv +SZ RC SZ SZ @@ -33670,46 +34544,46 @@ gV SZ SZ SZ -eK -eK -oj -eK -eK -eK -eK -eK -oj -oj -oj -eK -qQ -eK -oj -oj -oj -oj -oj -oj -oj -oj +wv +wv +Eh +wv +wv +wv +wv +wv +Eh +Eh +Eh +wv +RS +wv +Eh +Eh +Eh +Eh +Eh +Eh +Eh +Eh IG -eK -eK -eK -eK -eK -eK -eK -qQ -eK -oj -oj -eK -eK -qQ -eK -eK -eK +wv +wv +wv +wv +wv +wv +wv +RS +wv +Eh +Eh +wv +wv +RS +wv +wv +wv RC RC SZ @@ -33927,48 +34801,48 @@ gV gV gV SZ -eK -eK -oj -oj -oj -eK -eK -eK -oj -eK -oj -oj -oj -oj -oj -oj -oj -oj +wv +wv +Eh +Eh +Eh +wv +wv +wv +Eh +wv +Eh +Eh +Eh +Eh +Eh +Eh +Eh +Eh IG IG -eK -eK -eK -eK -eK -eK -oj -oj -eK -eK -eK -eK -oj -oj -eK -eK -eK -eK -eK +wv +wv +wv +wv +wv +wv +Eh +Eh +wv +wv +wv +wv +Eh +Eh +wv +wv +wv +wv +wv +SZ +SZ SZ -RC -RC SZ IG IG @@ -34185,43 +35059,43 @@ gV gV SZ SZ -eK -qQ -eK -oj -eK -qQ -eK -oj -eK -oj -oj -oj -oj -oj -oj -oj -oj +wv +RS +wv +Eh +wv +RS +wv +Eh +wv +Eh +Eh +Eh +Eh +Eh +Eh +Eh +Eh IG IG -eK -eK -oj -oj -eK -eK -oj -eK -eK -qQ -eK -eK -oj -oj -eK -eK -eK -eK +wv +wv +Eh +Eh +wv +wv +Eh +wv +wv +RS +wv +wv +Eh +Eh +wv +wv +wv +wv IG SZ RC @@ -34442,307 +35316,50 @@ gV gV gV gV -eK -eK -gV -oj -eK -eK -eK -eK -eK -AC -oj -oj -oj -oj -qQ -Hf -IG -qQ -eK -eK -eK -AT -eK -eK -eK -oj -eK -eK -eK -eK -oj -eK -eK -eK -qQ -eK -IG -SZ -SZ -RC -RC -SZ -SZ -SZ -SZ -SZ -SZ -SZ -IG -SZ -SZ -SZ -IG -hc -SZ -SZ -SZ -SZ -IG -IG -IG -IG -IG -IG -SZ -SZ -Nt -SZ -SZ -SZ -SZ -SZ -IG -IG -SZ -IG -SZ -SZ -SZ -SZ -IG -SZ -SZ -IG -IG -IG -SZ -SZ -SZ -IG -IG -SZ -SZ -IG -SZ -SZ -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -"} -(130,1,1) = {" -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV +wv +wv gV -oj -eK -eK -eK -oj -eK -eK -qQ -eK -eK -eK -eK -eK -eK -eK -eK -eK -eK -oj -eK -eK -eK -oj -oj -eK -eK -eK -eK -oj -oj +Eh +wv +wv +wv +wv +wv +AC +Eh +Eh +Eh +Eh +RS Hf -eK IG +RS +wv +wv +wv +AT +wv +wv +wv +Eh +wv +wv +wv +wv +Eh +wv +wv +wv +RS +wv IG SZ SZ -RC +SZ RC SZ SZ -sQ +SZ SZ SZ SZ @@ -34753,8 +35370,6 @@ SZ SZ IG hc -IG -SZ SZ SZ SZ @@ -34762,10 +35377,12 @@ SZ IG IG IG +IG +IG +IG SZ SZ -SZ -SZ +Nt SZ SZ SZ @@ -34775,16 +35392,16 @@ IG IG SZ IG -IG SZ SZ SZ -IG -SZ -SZ SZ +IG SZ SZ +IG +IG +IG SZ SZ SZ @@ -34792,8 +35409,8 @@ IG IG SZ SZ +IG SZ -gV SZ gV gV @@ -34882,7 +35499,7 @@ gV gV gV "} -(131,1,1) = {" +(130,1,1) = {" gV gV gV @@ -34959,58 +35576,59 @@ gV gV gV gV -oj -qQ -oj -oj -qQ -eK -eK -eK -eK -eK -eK -oH -eK -eK -eK -IG -eK -IG -oj -oj -eK -AT -eK -oj -eK -eK -oj -oj -oj -oj +Eh +wv +wv +wv +Eh +wv +wv +RS +wv +wv +wv +wv +wv +wv +wv +wv +wv +wv +Eh +wv +wv +wv +Eh +Eh +wv +wv +wv +wv +Eh +Eh Hf -eK +wv +IG IG SZ SZ -Im -RC +SZ RC SZ SZ +sQ +SZ SZ SZ SZ -IG -IG IG SZ SZ SZ IG +hc IG -IG +SZ SZ SZ SZ @@ -35020,7 +35638,6 @@ IG IG SZ SZ -sQ SZ SZ SZ @@ -35029,12 +35646,12 @@ SZ SZ SZ IG -Kf +IG SZ IG IG SZ -sQ +SZ SZ IG SZ @@ -35042,11 +35659,11 @@ SZ SZ SZ SZ -IG -IG SZ SZ SZ +IG +IG SZ SZ SZ @@ -35139,7 +35756,8 @@ gV gV gV "} -(132,1,1) = {" +(131,1,1) = {" +gV gV gV gV @@ -35215,88 +35833,87 @@ gV gV gV gV -oj -oj -eK -oj -oj -eK -eK -oj -oj -oj -oj -qQ -eK +Eh +RS +Eh +Eh +RS +wv +wv +wv +wv +wv +wv +oH +wv +wv +wv +IG +wv +IG +Eh +Eh +wv +AT +wv +Eh +wv +wv +Eh +Eh +Eh +Eh Hf -oj -eK -eK -oj +wv IG -oj -oj -eK -eK -eK -eK -oj -oj -oj -oj -oj -oj -eK -SZ -SZ SZ SZ -SZ -RC +Im RC SZ SZ SZ SZ -dF -SZ SZ SZ +IG +IG +IG SZ SZ SZ IG IG -SZ IG SZ SZ -IG +SZ +SZ IG IG IG SZ SZ +sQ SZ SZ -qu SZ -IG SZ SZ -IG -IG SZ SZ IG +Kf +SZ +IG IG SZ +sQ +ef +IG +SZ +SZ SZ -mw -RC -RC -OF -TO SZ SZ IG @@ -35304,10 +35921,10 @@ IG SZ SZ SZ -IG SZ SZ SZ +gV SZ gV gV @@ -35396,7 +36013,7 @@ gV gV gV "} -(133,1,1) = {" +(132,1,1) = {" gV gV gV @@ -35472,39 +36089,39 @@ gV gV gV gV -oj -eK -eK -eK -eK -eK -eK -oj -oj -IG -oj -oj -IG -oj -oj -qQ -eK -oj -oj -oj -oj +Eh +Eh +wv +Eh +Eh +wv +wv +Eh +Eh +Eh +Eh +RS +wv Hf -eK -eK -qQ -eK -eK -eK -eK -oj -oj -eK -qQ +Eh +wv +wv +Eh +IG +Eh +Eh +wv +wv +wv +wv +Eh +Eh +Eh +Eh +Eh +Eh +wv +SZ SZ SZ SZ @@ -35515,49 +36132,49 @@ SZ SZ SZ SZ +dF +SZ +SZ SZ SZ -IG -IG -IG SZ SZ IG IG -IG -IG -NY SZ +IG SZ SZ IG IG IG +IG SZ SZ SZ SZ +qu SZ IG SZ SZ IG IG -hd +SZ SZ IG IG SZ -Hf +SZ mw -RC -RC -RC -ra +xV SZ -IG +OF +TO SZ SZ +IG +IG SZ SZ SZ @@ -35653,7 +36270,7 @@ gV gV gV "} -(134,1,1) = {" +(133,1,1) = {" gV gV gV @@ -35728,94 +36345,94 @@ gV gV gV gV -oj -oj -eK -eK -oj -oj -eK -oj -oj -oj -eK -eK +gV +Eh +wv +wv +wv +wv +wv +wv +Eh +Eh IG +Eh +Eh IG -oj -oj -oj -eK -oj -oj -qQ -eK -eK -eK -eK -oj -eK -eK -qQ -eK -eK -qQ +Eh +Eh +RS +wv +Eh +Eh +Eh +Eh +Hf +wv +wv +RS +wv +wv +wv +wv +Eh +Eh +wv +RS +SZ SZ SZ SZ SZ -Je -Je -RC RC SZ -ox SZ SZ -IG +SZ +SZ +SZ IG IG IG SZ SZ -SZ IG IG IG IG NY SZ -Kf -SZ -SZ -SZ -SZ -SZ -Kf -SZ SZ SZ +IG +IG +IG SZ SZ -Kf SZ -ox SZ SZ +IG SZ SZ +IG +IG +hd SZ +IG +IG SZ +Hf +mw RC -RC -RC -RC -ra +SZ +fH +it SZ IG SZ SZ -ws +SZ SZ SZ IG @@ -35909,39 +36526,8 @@ gV gV gV gV -"} -(135,1,1) = {" -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV +"} +(134,1,1) = {" gV gV gV @@ -35984,102 +36570,133 @@ gV gV gV gV -qQ -oj -eK -eK -eK -eK -eK -eK -qQ -eK -oH -eK -eK -dt -qQ -eK -eK -eK -eK -oj -oj -eK -eK -eK -eK -eK -oj -oj -eK -eK -eK -eK -eK -eK -SZ -SZ -SZ -ky -KS -aa -ab -KS -ky -SZ -IG +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +Eh +Eh +wv +wv +Eh +Eh +wv +Eh +Eh +Eh +wv +wv IG IG +Eh +Eh +Eh +wv +Eh +Eh +RS +wv +wv +wv +wv +Eh +wv +wv +RS +wv +wv +RS SZ SZ SZ SZ -MW +Je +Je +RC +RC SZ +ox SZ SZ +IG +IG +IG +IG SZ SZ SZ +IG +IG +IG +IG +NY SZ +Kf SZ SZ SZ SZ SZ +Kf SZ SZ SZ SZ SZ +Kf SZ +ox SZ SZ SZ SZ -Kf SZ SZ SZ -Kf -nP -nP RC -CP -ra -IG +RC +RC +RC SZ +IG SZ SZ +ws SZ SZ IG -IG SZ SZ -gV -gV +SZ +SZ gV gV gV @@ -36167,7 +36784,7 @@ gV gV gV "} -(136,1,1) = {" +(135,1,1) = {" gV gV gV @@ -36241,101 +36858,100 @@ gV gV gV gV -eK -oj -eK -qQ -eK -eK -eK -eK -eK -eK -eK -eK -eK +RS +Eh +wv +wv +wv +wv +wv +wv +RS +wv +oH +wv +wv dt -eK -oj -oj -oj -oj -oj -oj -eK -eK -qQ -eK -eK -oj -eK -eK -oj -oj -oj -eK -eK +RS +wv +wv +wv +wv +Eh +Eh +wv +wv +wv +wv +wv +Eh +Eh +wv +wv +wv +wv +wv +wv SZ SZ SZ +yy KS -xu -xu -xu -xu +ac +ac KS +yy SZ IG IG -Kf +IG SZ -gV -Kf SZ SZ -gV SZ -Kf +MW SZ SZ SZ SZ SZ -gV SZ SZ SZ SZ -gV -gV -gV SZ SZ SZ SZ SZ -gV -gV -gV SZ SZ SZ SZ SZ -Nt SZ SZ -IG -IG -IG +SZ +Kf +SZ +SZ +SZ +Kf +nP +nP +sP +CP +ra IG SZ SZ +SZ +SZ +SZ IG IG SZ SZ -SZ gV gV gV @@ -36423,9 +37039,9 @@ gV gV gV gV -"} -(137,1,1) = {" gV +"} +(136,1,1) = {" gV gV gV @@ -36499,40 +37115,41 @@ gV gV gV gV -oj -eK -eK -eK -eK -qQ -eK -eK -eK -oj -eK -eK -eK -eK -eK -oj -oj -oj -oj -oj -oj -oj -oj -eK -eK -qQ -eK -eK -oj -oj -oj -oj -eK -eK +wv +Eh +wv +RS +wv +wv +wv +wv +wv +wv +wv +wv +wv +dt +wv +Eh +Eh +Eh +Eh +Eh +Eh +wv +wv +RS +wv +wv +Eh +wv +wv +Eh +Eh +Eh +wv +wv +SZ SZ SZ KS @@ -36542,31 +37159,30 @@ xu xu KS SZ +IG +IG +Kf SZ -SZ +gV +Kf SZ SZ gV SZ +Kf SZ SZ -gV -gV -gV -gV -gV -gV SZ -gV -gV SZ SZ +gV SZ SZ SZ SZ gV gV +gV SZ SZ SZ @@ -36574,18 +37190,19 @@ SZ SZ gV gV +gV SZ SZ SZ SZ SZ -SZ -SZ +Nt SZ SZ IG IG IG +IG SZ SZ IG @@ -36681,7 +37298,7 @@ gV gV gV "} -(138,1,1) = {" +(137,1,1) = {" gV gV gV @@ -36757,43 +37374,43 @@ gV gV gV Eh +wv +wv +wv +wv +RS +wv +wv +wv +Eh +wv +wv +wv +wv +wv Eh Eh Eh Eh -Pu Eh Eh Eh Eh -eK -eK -qQ -eK -eK -oj -oj -eK -qQ -oj -oj -oj -oj -eK -oj -oj -oj -oj -oj -oj -oj -oj -qQ -eK +wv +wv +RS +wv +wv +Eh +Eh +Eh +Eh +wv +wv SZ SZ KS -Ed +xu xu xu xu @@ -36804,13 +37421,9 @@ SZ SZ SZ gV -gV -gV -gV SZ -gV -gV -gV +SZ +SZ gV gV gV @@ -36820,33 +37433,37 @@ gV SZ gV gV -gV +SZ +SZ +SZ +SZ +SZ SZ gV gV SZ -gV SZ SZ SZ -gV +SZ gV gV SZ +ax SZ SZ SZ -IG -SZ SZ SZ SZ SZ IG IG +IG SZ SZ -SZ +IG +IG SZ SZ SZ @@ -36938,7 +37555,7 @@ gV gV gV "} -(139,1,1) = {" +(138,1,1) = {" gV gV gV @@ -37014,48 +37631,47 @@ gV gV gV Eh -RS -wv Eh +Eh +Eh +Eh +Pu +Eh +Eh +Eh +Eh +wv wv +RS wv wv Eh +Eh wv +RS Eh -eK -eK -eK -eK -eK -oj -oj -eK -eK -oj -oj -oj -oj -eK -oj -eK -oj -eK -eK -eK -oj -oj -oj -eK -eK +Eh +Eh +Eh +wv +Eh +Eh +Eh +Eh +Eh +Eh +Eh +Eh +RS +wv SZ -ky -ky -ac -ad -ky -ky SZ +KS +Ed +xu +xu +xu +KS SZ SZ SZ @@ -37065,6 +37681,7 @@ gV gV gV gV +SZ gV gV gV @@ -37074,12 +37691,12 @@ gV gV gV gV -gV +SZ gV gV gV SZ -SZ +gV gV SZ gV @@ -37094,18 +37711,17 @@ SZ SZ SZ IG -IG SZ -IG SZ SZ SZ SZ +IG +IG +SZ SZ SZ SZ -IG -IG SZ SZ gV @@ -37173,29 +37789,30 @@ gV gV gV gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -"} -(140,1,1) = {" +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +"} +(139,1,1) = {" gV gV gV @@ -37271,47 +37888,47 @@ gV gV gV Eh -ch +RS wv Eh -RS -ny -RS +wv wv wv Eh -eK -eK -eK -eK -eK -qQ -oj -oj -eK -eK -eK -qQ -oj -eK -eK -eK -eK -eK -qQ -eK -wN -oj -oj -AC -eK -eK -SZ -ky -jm -jm -ky +wv +Eh +wv +wv +wv +wv +wv +Eh +Eh +wv +wv +Eh +Eh +Eh +Eh +wv +Eh +wv +Eh +wv +wv +wv +Eh +Eh +Eh +wv +wv SZ +yy +yy +ac +ac +yy +yy SZ SZ SZ @@ -37335,21 +37952,17 @@ gV gV gV gV +SZ +SZ gV +SZ gV +SZ +SZ +SZ gV gV gV -gV -gV -gV -gV -gV -gV -gV -Kf -SZ -SZ SZ SZ SZ @@ -37357,10 +37970,14 @@ SZ IG IG SZ +IG +SZ +SZ +SZ +SZ +SZ SZ SZ -Hf -Hf IG IG SZ @@ -37452,7 +38069,7 @@ gV gV gV "} -(141,1,1) = {" +(140,1,1) = {" gV gV gV @@ -37528,52 +38145,52 @@ gV gV gV Eh +ch +wv +Eh +RS +ny +RS wv wv Eh wv wv wv +wv +wv +RS +Eh Eh wv wv +wv +RS Eh wv wv +wv +wv +wv +RS +wv +wN Eh Eh -oj -oj -oj -oj -IG -eK -oj -oj -qQ -eK -oj -qQ -oj -eK -eK -eK -oj -oj -eK -qQ -eK +AC +wv +wv SZ -KS +yy jm jm -KS +yy +SZ +SZ +SZ +SZ SZ -IG -IG -IG SZ -IG SZ gV gV @@ -37604,7 +38221,7 @@ gV gV gV gV -gV +Kf SZ SZ SZ @@ -37615,9 +38232,9 @@ IG IG SZ SZ -Kf -IG -IG +SZ +Hf +Hf IG IG SZ @@ -37709,7 +38326,7 @@ gV gV gV "} -(142,1,1) = {" +(141,1,1) = {" gV gV gV @@ -37788,48 +38405,48 @@ Eh wv wv Eh +wv +wv +wv +Eh +wv +wv +Eh +wv +wv +Eh Eh +Eh +Eh +Eh +Eh +IG wv Eh Eh RS -om -om wv +Eh RS -sz Eh -qQ -eK -eK -oj -oj -eK -oj -oj -eK -eK -oj -oj -oj -oj -eK -eK -oj -oj -eK -eK -eK +wv +wv +wv +Eh +Eh +wv +RS +wv SZ KS jm jm KS SZ -SZ IG IG IG +SZ IG SZ gV @@ -37872,7 +38489,7 @@ IG IG SZ SZ -SZ +Kf IG IG IG @@ -37945,28 +38562,28 @@ gV gV gV gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -"} -(143,1,1) = {" +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +"} +(142,1,1) = {" gV gV gV @@ -38044,39 +38661,39 @@ gV Eh wv wv -RS +Eh +Eh wv +Eh +Eh +RS +om +om wv +RS +sz +Eh +RS wv wv +Eh +Eh wv +Eh +Eh wv wv +Eh +Eh +Eh +Eh wv -db wv Eh -oj -eK -eK -eK -eK -eK -oj -oj -eK -eK -oj -oj -eK -eK -eK -qQ -oj -oj -eK -tF -eK +Eh +wv +wv +wv SZ KS jm @@ -38085,9 +38702,9 @@ KS SZ SZ IG -SZ IG -SZ +IG +IG SZ gV gV @@ -38119,22 +38736,22 @@ gV gV gV gV -Kf SZ SZ SZ -IG +SZ +SZ +SZ IG IG SZ SZ SZ -SZ IG IG IG IG -gV +SZ SZ gV gV @@ -38223,7 +38840,7 @@ gV gV gV "} -(144,1,1) = {" +(143,1,1) = {" gV gV gV @@ -38300,40 +38917,40 @@ gV gV Eh wv -ch wv +RS wv wv wv -jm -yY wv -ru wv -gC +wv +wv +wv +db wv Eh -oj -qQ -eK -AC -oj -oj -oj -oj -oj -oj -oj -oj -qQ -eK -eK -eK -oj -oj -eK -qQ -eK +Eh +wv +wv +wv +wv +wv +Eh +Eh +wv +wv +Eh +Eh +wv +wv +wv +RS +Eh +Eh +wv +tF +wv SZ KS jm @@ -38341,7 +38958,7 @@ jm KS SZ SZ -SZ +IG SZ IG SZ @@ -38376,11 +38993,11 @@ gV gV gV gV +Kf SZ SZ SZ -Hf -Hf +IG IG IG SZ @@ -38389,8 +39006,8 @@ SZ SZ IG IG -SZ -SZ +IG +IG gV SZ gV @@ -38480,7 +39097,7 @@ gV gV gV "} -(145,1,1) = {" +(144,1,1) = {" gV gV gV @@ -38555,53 +39172,53 @@ gV gV gV gV -vB -RS -or -or -gX -jm -OD -LD -OD +Eh +wv +ch +wv +wv +wv +wv jm -nl +yY +wv +ru +wv +gC +wv +Eh +Eh RS -hG wv +AC Eh -oj -eK -eK -eK -oj -oj -oj -oj -oj -oj -oj -oj -eK -eK -eK -eK -oj -oj -eK -eK -eK +Eh +Eh +Eh +Eh +Eh +Eh +Eh +RS +wv +wv +wv +Eh +Eh +wv +RS +wv SZ KS -yU +jm jm KS SZ SZ -qu SZ SZ -Kf +IG +SZ SZ gV gV @@ -38635,19 +39252,19 @@ gV gV SZ SZ +SZ Hf Hf -Hf -Hf -Hf +IG +IG SZ SZ -IG SZ SZ +IG +IG SZ SZ -NY gV SZ gV @@ -38702,42 +39319,42 @@ gV gV gV gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -"} -(146,1,1) = {" +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +"} +(145,1,1) = {" gV gV gV @@ -38813,55 +39430,54 @@ gV gV gV vB -jm -or +RS or or +gX jm -LD OD +LD OD jm -zY -ch -ZO +nl +RS +hG wv Eh -oj -eK -eK -eK -eK -md -qQ -wU -eK -eK -qQ -eK -eK -oj -eK -eK -qQ -eK -eK -eK -eK +Eh +wv +wv +wv +Eh +Eh +Eh +Eh +Eh +Eh +Eh +Eh +wv +wv +wv +wv +Eh +Eh +wv +wv +wv SZ KS -jm +yU jm KS SZ SZ -SZ -IG +qu SZ SZ +Kf SZ gV -SZ gV gV gV @@ -38889,23 +39505,24 @@ gV gV gV gV -SZ +gV +gV SZ SZ Hf Hf Hf -IG -IG Hf -Gl -SZ +Hf SZ SZ +IG SZ SZ SZ SZ +NY +gV SZ gV gV @@ -38994,7 +39611,7 @@ gV gV gV "} -(147,1,1) = {" +(146,1,1) = {" gV gV gV @@ -39071,41 +39688,41 @@ gV gV vB jm +or +or +or jm +LD +OD +OD jm -jm -jm -jm -jm -jm -jm -jm +zY +ch +ZO +wv +Eh +Eh wv wv wv +wv +md +RS +wU +wv +wv +RS +wv +wv Eh -oj -eK -eK -eK -eK -eK -eK -eK -eK -eK -eK -eK -eK -oj -eK -eK -eK -eK -eK -eK -eK -eK +wv +wv +RS +wv +wv +wv +wv +SZ KS jm jm @@ -39114,11 +39731,11 @@ SZ SZ SZ IG -xq +SZ SZ SZ gV -gV +SZ gV gV gV @@ -39151,11 +39768,11 @@ SZ SZ Hf Hf +Hf IG IG -IG -Hf Hf +Gl SZ SZ SZ @@ -39251,7 +39868,22 @@ gV gV gV "} -(148,1,1) = {" +(147,1,1) = {" +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV gV gV gV @@ -39311,6 +39943,70 @@ gV gV gV gV +vB +jm +jm +jm +jm +jm +jm +jm +jm +jm +jm +wv +wv +wv +Eh +Eh +wv +wv +wv +wv +wv +wv +wv +wv +wv +wv +wv +wv +Eh +wv +wv +wv +wv +wv +wv +wv +wv +KS +jm +jm +KS +SZ +SZ +SZ +IG +xq +SZ +SZ +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV gV gV gV @@ -39324,103 +40020,24 @@ gV gV gV gV -gV -gV -vB -jm -jm -jm -jm -jm -jm -jm -jm -jm -jm -wv -wv -RS -Eh -oj -eK -qQ -eK -eK -eK -eK -IG -rC -IG -IG -IG -eK -oj -oj -oj -oj -oj -oj -qQ -eK -eK -ky -xE -jm -ky -SZ -SZ -SZ -SZ -SZ -SZ SZ -gV SZ SZ -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -SZ -SZ -SZ -Kf +Hf Hf IG IG IG -IG -Hf -Hf Hf Hf SZ SZ SZ SZ -gV +SZ +SZ +SZ +SZ gV gV gV @@ -39508,7 +40125,7 @@ gV gV gV "} -(149,1,1) = {" +(148,1,1) = {" gV gV gV @@ -39583,48 +40200,47 @@ gV gV gV gV -LU -Jh +vB +jm +jm +jm +jm +jm +jm +jm +jm +jm jm -yY -DF -qm -AS -RW -jf -hS -Jd -lm wv wv +RS Eh -oj -eK -rC -rC -rC -eK -eK +Eh +wv +RS +wv +wv +wv +wv IG -ky -ky -ky -ky -ky +yy +IG +IG +IG +wv Eh Eh Eh Eh Eh Eh -ky -ky +RS wv wv -Bm +yy +xE jm -ky -IG +yy SZ SZ SZ @@ -39632,7 +40248,8 @@ SZ SZ SZ SZ -IG +gV +SZ SZ gV gV @@ -39662,21 +40279,21 @@ gV gV SZ SZ -gV SZ +Kf Hf IG IG IG IG Hf -IG Hf Hf Hf SZ SZ -gV +SZ +SZ gV gV gV @@ -39765,7 +40382,7 @@ gV gV gV "} -(150,1,1) = {" +(149,1,1) = {" gV gV gV @@ -39840,52 +40457,52 @@ gV gV gV gV -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -uO -wv -Eh -wv -wv -wv -eK -eK -eK -eK -eK -ky -kt -wv +LU +Jh +jm +Qj +DF +qm +AS +RW +jf +KH +Jd +lm wv wv -Nb +Eh +Eh wv -ch +yy +yy +yy wv -RS wv -Jm +IG +yy +yy +yy +yy +yy +Eh +Eh +Eh +Eh +Eh +Eh +yy +yy wv wv -RS -dV +Bm jm -ky +yy IG SZ SZ -IG -IG +SZ +SZ SZ SZ SZ @@ -39918,7 +40535,7 @@ gV gV gV SZ -gV +SZ gV SZ Hf @@ -39928,8 +40545,8 @@ IG IG Hf IG -IG -SZ +Hf +Hf Hf SZ SZ @@ -40021,32 +40638,8 @@ gV gV gV gV -"} -(151,1,1) = {" -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV +"} +(150,1,1) = {" gV gV gV @@ -40098,54 +40691,78 @@ gV gV gV gV -ky -gy -jm -Rd -jG -jm -hS -VC -hS -eZ -ky -RS -xR -ky -Cf +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +uO +wv +Eh wv -RS wv wv wv -qQ -eK -ky -RS wv -EJ +wv +wv +wv +yy +kt +wv +wv +wv +Nb +wv +ch wv RS wv +Jm wv wv -sz -jm -EM -jm -jm -jm -jm +RS +dV jm -ky -IG -IG -IG -IG -IG +yy IG +SZ +SZ IG IG +SZ +SZ +SZ IG SZ gV @@ -40178,18 +40795,18 @@ SZ gV gV SZ -SZ -IG -IG +Hf IG IG IG IG +Hf IG IG +SZ Hf SZ -MW +SZ gV gV gV @@ -40279,7 +40896,7 @@ gV gV gV "} -(152,1,1) = {" +(151,1,1) = {" gV gV gV @@ -40355,56 +40972,56 @@ gV gV gV gV -ky -Do +yy +gy jm +Rd +jG jm jm +VC jm +eZ +yy +RS +xR +yy +Cf +wv +RS +wv +wv +wv +RS +wv +yy +RS +wv +EJ +wv +RS +wv +wv +wv +sz jm +EM jm -yY -hS -ky jm jm -ky -wC jm -wv -Zv -ha -wv -wv -wv -ky -cx -Vt -ky -ky -ky -ky -ky -ky -ky -ky -ky -AQ -ky -Lb -Xd jm -ky -SZ -SZ +yy IG IG IG IG IG -SZ IG -Kf +IG +IG +IG +SZ gV gV gV @@ -40432,12 +41049,12 @@ gV gV gV SZ -SZ gV -Kf +gV +SZ +SZ IG IG -Hf IG IG IG @@ -40446,7 +41063,7 @@ IG IG Hf SZ -SZ +MW gV gV gV @@ -40536,7 +41153,7 @@ gV gV gV "} -(153,1,1) = {" +(152,1,1) = {" gV gV gV @@ -40612,47 +41229,47 @@ gV gV gV gV -ky -ky -fR -jm -yY -jm -mq -EC -jm -cX -ky -jm -AF -ky -jm -jm -oz -jm -Be -FQ -xo -xo -ky -Uj +yy +Do jm -ky -Be jm jm jm jm jm +yY +KH +yy jm jm +yy +wC jm -Xy -ky -or +wv +Zv +ha +wv +wv +wv +yy +cx +Vt +yy +yy +yy +yy +yy +yy +yy +yy +yy +AQ +yy +Lb +Xd jm -ky -gV +yy +SZ SZ IG IG @@ -40660,9 +41277,8 @@ IG IG IG SZ -SZ -SZ -gV +IG +Kf gV gV gV @@ -40691,20 +41307,21 @@ gV gV SZ SZ -SZ +gV +Kf IG IG Hf IG -Hf -Hf +IG +IG IG IG IG Hf SZ SZ -SZ +gV gV gV gV @@ -40793,8 +41410,7 @@ gV gV gV "} -(154,1,1) = {" -gV +(153,1,1) = {" gV gV gV @@ -40870,52 +41486,53 @@ gV gV gV gV -ky -oq +yy +yy +fR jm +ab +Rv +Oi +EC jm -Tc +cX +yy jm +AF +yy jm +IT +oz +IT +Be +FQ +xo +xo +yy +Uj jm -Jh -ky +yy +EF jm -Dy -Ei jm jm -WN -tg -tg jm jm jm -ky -Uj -jm -LU jm -Gy -zP -pP -Fh -or -qA -Ol jm Xy -ky -tY +yy +or jm -ky -SZ -SZ -SZ +yy +gV SZ IG IG -SZ +IG +IG +IG SZ SZ SZ @@ -40946,18 +41563,18 @@ gV gV gV gV -gV -SZ SZ SZ SZ +IG +IG Hf +IG Hf -SZ -SZ -SZ -SZ -SZ +Hf +IG +IG +IG Hf SZ SZ @@ -41050,7 +41667,7 @@ gV gV gV "} -(155,1,1) = {" +(154,1,1) = {" gV gV gV @@ -41127,53 +41744,53 @@ gV gV gV gV -ky -hS -jm -dV +yy +oq jm jm +Tc jm jm +IT Jh -ky -jm -jm yy -Be -jm -Az -Nk -Ws -hS -IT -jm -ky -jG jm -ky +Dy +Ei jm -RW -qA jm +WN +tg +tg +IT jm jm +yy +Uj jm -oD +LU jm -Ub -ky +Gy +zP +pP +Fh or +qA +Ol jm -ky -gV +Xy +yy +tY +jm +yy SZ SZ -gV SZ SZ -gV -gV +IG +IG +SZ +SZ SZ SZ gV @@ -41203,20 +41820,19 @@ gV gV gV gV +gV SZ SZ SZ SZ +Hf +Hf SZ SZ SZ SZ SZ -SZ -SZ -SZ -SZ -SZ +Hf SZ SZ SZ @@ -41306,8 +41922,9 @@ gV gV gV gV +gV "} -(156,1,1) = {" +(155,1,1) = {" gV gV gV @@ -41384,45 +42001,45 @@ gV gV gV gV -ky -jq -jm -jm -ic -jm -ZP -jm -jm -ky -jm -jm -xk +yy +hS jm +bt jm +BV +IT jm +aj +yy jm jm -KW +yy +Be jm +Az +Nk +gm +oR +IT jm -ky +yy +jG jm +yy jm -ky +RW +qA jm -CU -yY jm -Be jm jm -gm +oD jm Ub -ky +yy or jm -ky +yy gV SZ SZ @@ -41431,7 +42048,6 @@ SZ SZ gV gV -gV SZ SZ gV @@ -41467,7 +42083,6 @@ SZ SZ SZ SZ -Kf SZ SZ SZ @@ -41477,6 +42092,15 @@ SZ SZ SZ SZ +SZ +SZ +gV +gV +gV +gV +gV +gV +gV gV gV gV @@ -41556,6 +42180,70 @@ gV gV gV gV +"} +(156,1,1) = {" +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV gV gV gV @@ -41563,8 +42251,6 @@ gV gV gV gV -"} -(157,1,1) = {" gV gV gV @@ -41572,11 +42258,56 @@ gV gV gV gV +yy +jq +jm +jm +ls +sJ +ZP +CW +XL +yy +jm +jm +xk +jm +jm +jm +al +jm +KW +jm +jm +yy +IT +IT +yy +jm +CU +yY +jm +Be +jm +jm +Cu +jm +Ub +yy +or +jm +yy gV +SZ +SZ gV +SZ +SZ gV gV gV +SZ +SZ gV gV gV @@ -41604,6 +42335,22 @@ gV gV gV gV +SZ +SZ +SZ +SZ +SZ +SZ +Kf +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ gV gV gV @@ -41641,56 +42388,10 @@ gV gV gV gV -ky -bQ -jm -jm -jm -yw -jm -jm -iK -ky -lX -jm -ky -jm -jm -WC -jm -jm -MC -MC -jm -ky -jm -jm -ky -qA -yp -jm -jm -fP -jm -oV -xE -jm -xH -ky -tY -jm -ky gV -SZ -SZ -SZ -SZ -SZ gV gV gV -SZ -qu gV gV gV @@ -41718,22 +42419,6 @@ gV gV gV gV -SZ -SZ -SZ -SZ -SZ -SZ -SZ -SZ -SZ -SZ -SZ -SZ -SZ -SZ -SZ -SZ gV gV gV @@ -41752,6 +42437,8 @@ gV gV gV gV +"} +(157,1,1) = {" gV gV gV @@ -41820,8 +42507,6 @@ gV gV gV gV -"} -(158,1,1) = {" gV gV gV @@ -41830,10 +42515,56 @@ gV gV gV gV +yy +bQ +jm +IT +eK +yw +kI +mf +iK +yy +lX +jm +yy +tx +WC +jm +jm +jm +jH +MC +jm +yy +jm +IT +yy +qA +yp +jm +jm +fP +jm +oV +xE +jm +xH +yy +tY +jm +yy gV +SZ +SZ +SZ +SZ +SZ gV gV gV +SZ +qu gV gV gV @@ -41861,6 +42592,22 @@ gV gV gV gV +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ gV gV gV @@ -41898,45 +42645,6 @@ gV gV gV gV -ky -jm -jm -iY -jm -qm -yY -jm -jm -qK -Uj -jm -ky -tx -hS -ky -MO -MO -MO -MO -AQ -ky -dD -jm -ky -jm -yY -Qn -Pb -jm -jm -UI -jm -jm -XE -ky -tY -jm -ky gV gV gV @@ -41980,19 +42688,14 @@ gV gV gV gV -SZ -SZ -SZ -SZ -SZ gV gV gV gV -SZ -SZ gV gV +"} +(158,1,1) = {" gV gV gV @@ -42069,6 +42772,45 @@ gV gV gV gV +yy +IT +jm +iY +eK +Xe +Fg +oj +oj +qK +Uj +jm +yy +yy +yy +Lb +MO +MO +MO +MO +vm +yy +dD +IT +yy +jm +yY +Qn +Pb +jm +jm +UI +jm +KL +KQ +yy +tY +jm +yy gV gV gV @@ -42077,8 +42819,6 @@ gV gV gV gV -"} -(159,1,1) = {" gV gV gV @@ -42114,10 +42854,17 @@ gV gV gV gV +SZ +SZ +SZ +SZ +SZ gV gV gV gV +SZ +SZ gV gV gV @@ -42155,45 +42902,6 @@ gV gV gV gV -ky -QR -jm -jm -jm -Vn -Rd -jm -rK -ky -jm -jm -ky -ky -ky -Lb -WC -LZ -LZ -LZ -kk -ky -jm -jm -ky -qi -jm -jm -jm -jm -jm -jm -jm -jm -ot -ky -ky -ky -ky gV gV gV @@ -42238,20 +42946,13 @@ gV gV gV gV -SZ -SZ -SZ -SZ -SZ -SZ -SZ -SZ gV -SZ gV gV gV gV +"} +(159,1,1) = {" gV gV gV @@ -42328,14 +43029,51 @@ gV gV gV gV +yy +QR +IT +jm +un +Vn +IM +mf +rK +yy +jm +jm +Lv +jZ +zp +kC +WC +LZ +LZ +LZ +jm +yy +jm +IT +yy +qi +jm +jm +jm +jm +jm +jm +jm +jm +ot +yy +yy +yy +yy gV gV gV gV gV gV -"} -(160,1,1) = {" gV gV gV @@ -42374,7 +43112,16 @@ gV gV gV gV +SZ +SZ +SZ +SZ +SZ +SZ +SZ +SZ gV +SZ gV gV gV @@ -42412,42 +43159,6 @@ gV gV gV gV -ky -FV -yY -jm -jm -qi -jm -jm -gj -ky -jm -jm -Lv -jZ -zp -kC -jm -jm -jm -jm -jm -ky -jm -jm -ky -qi -ic -jm -jm -Xy -Xy -ZY -Pj -XE -XE -ky gV gV gV @@ -42497,10 +43208,10 @@ gV gV gV gV +"} +(160,1,1) = {" gV gV -SZ -SZ gV gV gV @@ -42575,6 +43286,42 @@ gV gV gV gV +yy +FV +yY +jm +eK +Sf +oj +oj +fh +yy +jm +jm +jm +jm +jm +jm +jm +IT +jm +jm +jm +yy +jm +jm +yy +qi +ic +jm +jm +Xy +Xy +ZY +Pj +KH +KH +yy gV gV gV @@ -42591,8 +43338,6 @@ gV gV gV gV -"} -(161,1,1) = {" gV gV gV @@ -42628,6 +43373,11 @@ gV gV gV gV +SZ +SZ +gV +gV +gV gV gV gV @@ -42669,42 +43419,6 @@ gV gV gV gV -ky -Ax -jm -Dy -jm -jm -jm -jm -jm -ae -jm -jm -jm -jm -jm -jm -jm -jm -jm -jm -Xy -ky -jm -yY -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky gV gV gV @@ -42751,6 +43465,8 @@ gV gV gV gV +"} +(161,1,1) = {" gV gV gV @@ -42827,6 +43543,42 @@ gV gV gV gV +yy +Ax +jm +lQ +eK +Uu +oj +mf +oj +af +jm +jm +jm +jm +jm +jm +jm +jm +jm +IT +Xy +yy +jm +ab +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy gV gV gV @@ -42848,8 +43600,6 @@ gV gV gV gV -"} -(162,1,1) = {" gV gV gV @@ -42925,48 +43675,6 @@ gV gV gV gV -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -Dy -jm -jm -jm -jm -jm -jm -jm -jm -jm -jm -ky -jm -jm -ky -aw -Iy -co -co -co -OS -jS -co -Pm -vB -gV -gV -gV -gV -gV -gV gV gV gV @@ -43014,6 +43722,8 @@ gV gV gV gV +"} +(162,1,1) = {" gV gV gV @@ -43089,6 +43799,43 @@ gV gV gV gV +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +Dy +jm +jm +IT +IT +IT +jm +IT +jm +jm +jm +yy +jm +IT +yy +aw +Iy +co +co +co +OS +jS +co +co +Pm +vB gV gV gV @@ -43105,8 +43852,6 @@ gV gV gV gV -"} -(163,1,1) = {" gV gV gV @@ -43182,42 +43927,6 @@ gV gV gV gV -vB -jm -jm -jm -jm -qm -jm -jm -jm -jm -af -jm -jm -mq -jm -jm -jm -yY -jm -jm -jm -jm -ky -yU -jm -BV -pM -co -Ao -co -Ms -OS -pi -co -yK -vB gV gV gV @@ -43270,6 +43979,8 @@ gV gV gV gV +"} +(163,1,1) = {" gV gV gV @@ -43345,6 +44056,43 @@ gV gV gV gV +vB +XT +vQ +fM +fM +zi +fM +fM +eb +YO +af +jm +jm +mq +jm +jm +IT +ab +IT +jm +IT +jm +yy +yU +IT +yy +pM +co +Ao +co +Ms +OS +pi +co +co +go +vB gV gV gV @@ -43362,8 +44110,6 @@ gV gV gV gV -"} -(164,1,1) = {" gV gV gV @@ -43439,43 +44185,6 @@ gV gV gV gV -vB -jm -jm -yY -jm -jm -jm -jm -jm -jm -ky -jm -mf -LM -LM -RW -RW -rl -VA -TK -jm -jm -ky -jm -jm -ky -co -co -Kq -Jw -wt -OS -PP -co -TE -ky -ky gV gV gV @@ -43527,6 +44236,8 @@ gV gV gV gV +"} +(164,1,1) = {" gV gV gV @@ -43602,6 +44313,43 @@ gV gV gV gV +vB +ob +Fq +zS +Fq +Fq +Yp +Fq +Fq +RJ +yy +jm +jm +LM +jm +RW +RW +rl +VA +TK +IT +WC +yy +jm +IT +yy +BF +co +Kq +Jw +wt +OS +PP +co +TE +ky +vB gV gV gV @@ -43619,8 +44367,6 @@ gV gV gV gV -"} -(165,1,1) = {" gV gV gV @@ -43696,43 +44442,6 @@ gV gV gV gV -vB -dV -jm -jm -jm -jm -jm -lV -hS -jm -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -AQ -ky -tu -yY -jm -ag -co -Vs -Ms -co -co -co -co -co -co -xh -vB gV gV gV @@ -43784,6 +44493,8 @@ gV gV gV gV +"} +(165,1,1) = {" gV gV gV @@ -43859,6 +44570,43 @@ gV gV gV gV +vB +YF +Fq +qN +Zk +Pp +Wn +lV +Sh +RJ +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +AQ +yy +tu +yY +jm +af +aa +Yb +Ms +co +co +co +co +co +co +xh +vB gV gV gV @@ -43876,8 +44624,6 @@ gV gV gV gV -"} -(166,1,1) = {" gV gV gV @@ -43952,45 +44698,8 @@ gV gV gV gV -rV -ky -qi gV -LT gV -Gy -jm -jm -JD -jm -ky -iT -ky -iT -ky -mt -ky -iT -ky -Zo -jm -jm -Dy -jm -jm -fN -EU -co -co -co -nv -co -HM -xh -co -co -ky -ky gV gV gV @@ -44041,6 +44750,8 @@ gV gV gV gV +"} +(166,1,1) = {" gV gV gV @@ -44115,8 +44826,45 @@ gV gV gV gV +rV +yy +Nh gV +LT gV +DA +Fq +Fq +JD +RJ +yy +iT +yy +am +yy +mt +yy +iT +yy +Zo +jm +jm +Dy +jm +jm +yy +EU +co +co +co +nv +co +HM +mu +aa +co +yy +yy gV gV gV @@ -44133,8 +44881,6 @@ gV gV gV gV -"} -(167,1,1) = {" gV gV gV @@ -44210,44 +44956,7 @@ gV gV gV gV -ts gV -GV -LT -LT -QR -mq -jm -rH -jm -ky -sR -ky -sR -ky -sR -ky -sR -ky -jm -jm -AF -sF -jm -jm -ky -ia -nV -co -xh -co -Vs -aY -co -co -co -co -vB gV gV gV @@ -44298,6 +45007,8 @@ gV gV gV gV +"} +(167,1,1) = {" gV gV gV @@ -44373,6 +45084,56 @@ gV gV gV gV +ts +gV +GV +LT +LT +iH +rA +Fq +rH +RJ +yy +sR +yy +sR +yy +sR +yy +sR +yy +jm +jm +AF +sF +jm +jm +yy +ia +nV +aa +xh +aa +Vs +aY +co +co +co +co +vB +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV gV gV gV @@ -44390,8 +45151,6 @@ gV gV gV gV -"} -(168,1,1) = {" gV gV gV @@ -44470,41 +45229,7 @@ gV gV gV gV -yz gV -qn -TK -jm -jm -jm -ky -fS -fS -fS -fS -jm -jm -jm -ky -jm -jm -ky -ky -AQ -ky -ky -ky -ky -ky -ky -AQ -ky -fN -Au -bV -Ym -Rf -vB gV gV gV @@ -44539,6 +45264,8 @@ gV gV gV gV +"} +(168,1,1) = {" gV gV gV @@ -44617,6 +45344,41 @@ gV gV gV gV +yd +gV +qn +Pa +xu +Fq +RJ +yy +Kx +fS +Kx +Kx +Kx +Kx +Kx +yy +jm +jm +yy +yy +AQ +yy +yy +yy +yy +yy +yy +AQ +yy +yy +Au +dn +Ym +Rf +vB gV gV gV @@ -44647,8 +45409,6 @@ gV gV gV gV -"} -(169,1,1) = {" gV gV gV @@ -44727,41 +45487,8 @@ gV gV gV gV -uw gV gV -EB -jm -jm -jm -ky -fS -jm -fS -fS -jm -jm -jm -ky -jm -jm -ky -jm -jm -jm -jm -Dy -Yh -Yh -Yh -jm -ic -ky -fj -bV -bV -rf -vB gV gV gV @@ -44794,6 +45521,8 @@ gV gV gV gV +"} +(169,1,1) = {" gV gV gV @@ -44872,8 +45601,41 @@ gV gV gV gV +uw gV gV +EB +Fq +eO +UT +yy +Kx +fS +Kx +fS +Kx +Kx +Kx +yy +jm +IT +yy +mK +GU +GU +wJ +ev +qQ +Yh +ad +lO +Qb +yy +fj +bV +bV +rf +vB gV gV gV @@ -44904,8 +45666,6 @@ gV gV gV gV -"} -(170,1,1) = {" gV gV gV @@ -44982,46 +45742,6 @@ gV gV gV gV -rv -lN -gV -Jv -gV -lf -yU -jm -jm -ky -ky -ji -ky -ky -WC -jm -jm -ky -jm -yY -ky -ky -ky -Lb -jm -jm -Be -jm -ov -jm -jm -ky -yc -bV -Yv -QV -vB -gV -gV -gV gV gV gV @@ -45058,6 +45778,8 @@ gV gV gV gV +"} +(170,1,1) = {" gV gV gV @@ -45134,8 +45856,43 @@ gV gV gV gV +rv +lN gV +Jv gV +lf +Lq +Fq +td +yy +yy +ji +yy +yy +AA +fS +Kx +yy +jm +ab +yy +yy +yy +Lb +fN +Dc +ag +yK +ov +NV +HU +yy +yc +bV +Yv +QV +vB gV gV gV @@ -45161,8 +45918,6 @@ gV gV gV gV -"} -(171,1,1) = {" gV gV gV @@ -45241,41 +45996,7 @@ gV gV gV gV -Yi gV -GV -jm -jm -jm -jm -ky -jm -jm -jm -ky -jG -jm -jm -ky -Xy -jm -IM -In -jm -ky -jm -jm -QR -jm -jm -dV -jm -ky -Db -bV -bV -hi -vB gV gV gV @@ -45314,6 +46035,8 @@ gV gV gV gV +"} +(171,1,1) = {" gV gV gV @@ -45392,7 +46115,41 @@ gV gV gV gV +Yi gV +GV +Fq +Pp +Fq +CH +yy +Kx +Kx +Kx +yy +ff +fS +Kx +yy +Xy +IT +yy +Vj +wm +yy +mP +yK +Pw +yK +yK +EV +bO +yy +Db +bV +hA +hi +vB gV gV gV @@ -45418,8 +46175,6 @@ gV gV gV gV -"} -(172,1,1) = {" gV gV gV @@ -45495,44 +46250,10 @@ gV gV gV gV -GV gV -LT gV gV gV -jm -jm -lV -jm -ky -hv -jm -Rg -tK -jm -jm -mq -ky -jG -jm -ky -Mh -jm -ZT -jm -jm -dV -jm -jm -Be -jm -ky -zj -bV -ml -ky -ky gV gV gV @@ -45571,6 +46292,8 @@ gV gV gV gV +"} +(172,1,1) = {" gV gV gV @@ -45646,10 +46369,44 @@ gV gV gV gV +GV gV +LT gV gV gV +Pp +op +lV +RJ +yy +hv +fS +Rg +yy +bn +fS +ih +yy +jG +IT +yy +Mh +uU +ZT +fN +yK +EV +tK +cD +ag +HU +yy +zj +bV +ml +yy +yy gV gV gV @@ -45675,8 +46432,6 @@ gV gV gV gV -"} -(173,1,1) = {" gV gV gV @@ -45752,43 +46507,8 @@ gV gV gV gV -Jv -TU -LT gV gV -LT -LT -jm -jm -rl -ky -Iu -jm -nk -ky -Kx -jm -jm -ky -oV -jm -ky -ky -ky -ky -jm -gj -EM -jm -hp -jm -jm -ky -zj -bV -MP -ky gV gV gV @@ -45829,11 +46549,12 @@ gV gV gV gV +"} +(173,1,1) = {" gV gV gV gV -gG gV gV gV @@ -45905,8 +46626,43 @@ gV gV gV gV +Jv +TU +LT gV gV +LT +LT +Hu +Fq +hZ +yy +Iu +Kx +nk +yy +UA +Kx +Kx +yy +oV +IT +yy +yy +yy +yy +fN +pB +Rs +FF +hp +Af +sw +yy +sa +PF +MP +yy gV gV gV @@ -45932,8 +46688,6 @@ gV gV gV gV -"} -(174,1,1) = {" gV gV gV @@ -45953,6 +46707,7 @@ gV gV gV gV +gG gV gV gV @@ -46011,41 +46766,7 @@ gV gV gV gV -yz -Jq -XY -LT gV -lf -jm -RW -ky -Iu -jm -jm -ky -Kx -jm -jm -ky -Uj -jm -ky -hJ -jm -ky -jm -ky -ky -ZT -ky -ky -ZT -ky -Rf -bV -ky -ky gV gV gV @@ -46085,6 +46806,8 @@ gV gV gV gV +"} +(174,1,1) = {" gV gV gV @@ -46162,7 +46885,41 @@ gV gV gV gV +yz +Jq +XY +LT gV +Bw +Fq +vY +yy +Iu +Kx +Kx +yy +yO +Kx +fS +yy +Uj +jm +yy +hJ +Ws +yy +fN +yy +yy +ZT +yy +yy +ZT +yy +yy +Yl +yy +yy gV gV gV @@ -46189,8 +46946,6 @@ gV gV gV gV -"} -(175,1,1) = {" gV gV gV @@ -46267,41 +47022,160 @@ gV gV gV gV -LT -ky -EB -jm -jm -Ti -jm -jm -jm -ky -Iz -jm -jm -ky -Kx -jm -jm -ky -xi -jm -ky -hJ -jm -ZT -jm -ky -FC -jm -ky -Lm -jm -ky -Ih -bV -ky +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +"} +(175,1,1) = {" +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +gV +LT +yy +uK +St +Fq +Ti +Fq +Fq +RJ +yy +Iz +tJ +Kx +yy +UA +Kx +Kx +yy +xi +jm +yy +an +rC +ZT +fN +yy +FC +Ws +yy +Lm +Ws +yy +Ih +bV +yy gV gV gV @@ -46525,40 +47399,40 @@ gV gV gV gV -ky -yY -jm -dV -jm -jm -jm +yy +xT +Fq +Wd +Fq +Pp +Fq gj -ky -Iu -jm -jm -ky +yy +tT +Kx +fS +yy +yO +fS Kx -jm -jm ah +IT jm -jm -ky -ky -ky -ky -jm -ky +yy +yy +yy +yy +ak +yy In -jm -ky +DE +yy yF vU -ky -ky -ky -ky +yy +yy +yy +yy gV gV gV @@ -46782,37 +47656,37 @@ gV gV gV gV -ky -Jh -jG -jG -jm +yy +yr +bG +bG +Ae ZZ Hn -jm -ky -jm -jm -jm -ky +eW +yy Kx -jm -jm -ky +Kx +Kx +yy +Kx +Kx +Kx +yy jm jm vB gV gV -ky -ky -ky -ky -ky -ky -ky -ky -ky +yy +yy +yy +yy +yy +yy +yy +yy +yy gV gV gV @@ -47039,24 +47913,24 @@ gV gV gV gV -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky -ky +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy tu -QR +SX jm vB gV @@ -47303,8 +48177,8 @@ gV gV gV gV -ky -jm +yy +IT jm jm jm @@ -47312,7 +48186,7 @@ yY jm jm Ia -ky +yy xE jm vB @@ -47560,7 +48434,7 @@ gV gV gV gV -ky +yy jm YW jm @@ -47569,7 +48443,7 @@ jm kg jm jm -aj +af Mu jm vB @@ -47817,16 +48691,16 @@ gV gV gV gV -ky +yy jm kg jm Pb jm kg -jm +IT Pb -ky +yy yY lX vB @@ -48074,17 +48948,17 @@ gV gV gV gV -ky -jm -jm -yY +yy +IT jm +ab jm -Pb +IT +fC jm or -ky -jm +yy +IT jm vB gV @@ -48331,16 +49205,16 @@ gV gV gV gV -ky -ky -ky -ky +yy +yy +yy +yy kg jm -or +lU jm kg -ky +yy jG jm vB @@ -48591,13 +49465,13 @@ gV gV gV gV -ky +yy NX jm or jm or -ky +yy jG yY vB @@ -48848,13 +49722,13 @@ gV gV gV gV -ky +yy Dy jm jm +IT jm -jm -ky +yy kk kk vB @@ -49105,16 +49979,16 @@ gV gV gV gV -ky -ky -ky -ky -ky -ky -ky -ak -al -ky +yy +yy +yy +yy +yy +yy +yy +ac +ac +yy gV gV gV @@ -49625,10 +50499,10 @@ gV gV gV gV -ky +yy xu xu -ky +yy gV gV gV @@ -50139,10 +51013,10 @@ gV gV gV gV -ky -am -an -ky +yy +ac +ac +yy gV gV gV diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm index a10bd3a3af7..6d68d0481cf 100644 --- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm +++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm @@ -28,3 +28,7 @@ base_turf = /turf/space no_light_control = TRUE area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP + +/area/wrecked_nt_ship/exterior + name = "wrecked NT ship exterior" + icon_state = "exterior" diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm index 9a3df721ac2..e9d9a09c516 100644 --- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm +++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm @@ -8,38 +8,18 @@ }, /area/wrecked_nt_ship) "ab" = ( -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, -/area/wrecked_nt_ship) -"ac" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/tiled/airless, -/area/wrecked_nt_ship) -"ad" = ( -/obj/machinery/door/airlock/centcom{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel/airless, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "ae" = ( -/obj/machinery/door/airlock/centcom{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel/airless, -/area/wrecked_nt_ship) -"af" = ( -/obj/machinery/door/airlock/centcom{ - dir = 4 - }, +/obj/structure/closet/secure_closet/RD2, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "ag" = ( -/obj/machinery/door/airlock/centcom{ - dir = 4 - }, +/obj/effect/map_effect/window_spawner/full/reinforced, +/obj/machinery/door/blast/regular, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "ah" = ( @@ -49,59 +29,41 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "ai" = ( -/obj/machinery/door/airlock/centcom{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel/airless, +/obj/structure/curtain/black, +/obj/structure/bed, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood/airless, /area/wrecked_nt_ship) "aj" = ( -/obj/machinery/door/airlock/centcom{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel/airless, +/obj/machinery/shower, +/obj/effect/decal/cleanable/dirt, +/obj/random/soap, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "ak" = ( /obj/machinery/door/airlock/centcom{ dir = 4 }, -/turf/simulated/floor/tiled/steel/airless, -/area/wrecked_nt_ship) -"al" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/tiled/airless, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "am" = ( /obj/structure/filingcabinet, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged2" - }, -/area/wrecked_nt_ship) -"an" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/tiled/airless, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "ao" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/tiled/airless, +/obj/structure/trash_pile, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "ap" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/tiled/airless, +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "aq" = ( -/obj/machinery/door/airlock/centcom{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel/airless, -/area/wrecked_nt_ship) +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/airless, +/area/space) "ar" = ( /obj/item/stack/material/silver, /obj/item/stack/material/silver, @@ -109,6 +71,7 @@ /obj/item/stack/material/silver, /obj/item/stack/material/silver, /obj/item/stack/material/silver, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "as" = ( @@ -119,26 +82,17 @@ /area/wrecked_nt_ship) "ax" = ( /obj/item/paper/crumpled/bloody, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "aF" = ( /turf/simulated/floor/tiled/airless{ icon_state = "steel_broken4" }, /area/wrecked_nt_ship) -"aG" = ( -/obj/item/ore/glass, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, -/area/wrecked_nt_ship) "aM" = ( /obj/structure/closet/crate/secure/large, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "asteroidfloor" - }, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "aP" = ( /obj/structure/sink/kitchen{ @@ -152,9 +106,8 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "aY" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged1" - }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "bg" = ( /obj/structure/bed/stool/chair/folding, @@ -166,7 +119,7 @@ /turf/simulated/floor/tiled/airless, /area/wrecked_nt_ship) "bs" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -184,12 +137,11 @@ /area/wrecked_nt_ship) "bC" = ( /mob/living/bot/medbot, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "bF" = ( /obj/item/trash/raisins, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/airless, /area/wrecked_nt_ship) "bO" = ( @@ -223,17 +175,16 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "cd" = ( -/obj/item/material/shard, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged1" - }, +/obj/structure/table/reinforced/steel, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "ch" = ( /obj/structure/blocker, /turf/simulated/floor/airless, /area/wrecked_nt_ship) "cm" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/machinery/recharger, /turf/simulated/floor/airless, /area/wrecked_nt_ship) @@ -242,12 +193,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) -"cT" = ( -/obj/item/clothing/suit/caution, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, -/area/wrecked_nt_ship) "dc" = ( /obj/item/mecha_equipment/toolset, /turf/simulated/floor/tiled/steel/airless, @@ -260,14 +205,12 @@ /area/space) "dw" = ( /obj/structure/trash_pile, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/space) "dB" = ( -/turf/simulated/floor/airless{ - icon_state = "dmg2" - }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/airless, /area/wrecked_nt_ship) "dI" = ( /obj/effect/map_effect/window_spawner/full/reinforced, @@ -276,7 +219,7 @@ }, /area/wrecked_nt_ship) "dK" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/device/multitool, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -293,27 +236,13 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "dX" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/shreddedp, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) -"dZ" = ( -/turf/simulated/floor/airless{ - icon_state = "dmg1" - }, -/area/space) "ey" = ( /obj/item/pickaxe/drill/weak, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, -/area/space) -"eC" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged1" - }, +/turf/simulated/floor/tiled/steel/airless, /area/space) "eQ" = ( /obj/machinery/portable_atmospherics/hydroponics, @@ -321,31 +250,31 @@ /area/wrecked_nt_ship) "eZ" = ( /obj/machinery/shower, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" +/obj/item/bikehorn/rubberducky{ + name = "Lucie" }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "fa" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/material/twohanded/fireaxe, /turf/simulated/floor/airless, /area/wrecked_nt_ship) "fb" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/lazarus_injector, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "fe" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/item/melee/energy/vaurca_zweihander, -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "fg" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged1" - }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "fi" = ( /obj/machinery/floodlight, @@ -360,13 +289,11 @@ /obj/item/material/shard/shrapnel{ icon_state = "shrapnellarge" }, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, +/turf/simulated/floor/tiled/steel/airless, /area/space) "fy" = ( /obj/item/toy/plushie/slime, -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "fz" = ( @@ -374,7 +301,7 @@ /turf/simulated/floor/airless, /area/wrecked_nt_ship) "fC" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/storage/box/fancy/cigarettes/rugged, /obj/item/gun/energy/tesla, /turf/simulated/floor/tiled/steel/airless, @@ -408,21 +335,16 @@ }, /area/wrecked_nt_ship) "gv" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/tiled/airless{ - burnt = 3 - }, +/obj/item/trash/uselessplastic, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "gy" = ( /obj/item/material/shard/shrapnel{ icon_state = "shrapnelmedium" }, -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "asteroidfloor" - }, +/obj/structure/table/reinforced/steel, +/turf/space, /area/space) "gW" = ( /obj/item/material/shard/shrapnel{ @@ -434,9 +356,7 @@ /obj/item/stack/cable_coil/random{ icon_state = "coil2" }, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "gX" = ( /obj/item/pen/fountain, @@ -444,9 +364,7 @@ /area/wrecked_nt_ship) "gZ" = ( /obj/structure/closet/crate/loot, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "asteroidfloor" - }, +/turf/simulated/floor/tiled/steel/airless, /area/space) "hp" = ( /mob/living/carbon/slime/purple, @@ -458,7 +376,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "hw" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/gun/energy/laser/xenoarch, /turf/simulated/floor/airless, /area/wrecked_nt_ship) @@ -476,9 +394,7 @@ /area/space) "hH" = ( /obj/item/slime_extract/metal, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged2" - }, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "hJ" = ( /obj/structure/mech_wreckage, @@ -504,20 +420,16 @@ }, /area/wrecked_nt_ship) "iz" = ( -/obj/structure/grille/broken, -/turf/simulated/floor/airless{ - icon_state = "dmg2" - }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "iA" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "iF" = ( /obj/machinery/vending/snack, -/turf/simulated/floor/wood/airless{ - icon_state = "wood_broken1" - }, +/turf/simulated/floor/wood/airless, /area/wrecked_nt_ship) "iI" = ( /turf/simulated/floor/tiled/ramp{ @@ -525,9 +437,8 @@ }, /area/wrecked_nt_ship) "iK" = ( -/turf/simulated/floor/wood/airless{ - icon_state = "wood_broken1" - }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/airless, /area/wrecked_nt_ship) "iR" = ( /obj/machinery/door/airlock/external{ @@ -536,28 +447,26 @@ /turf/simulated/floor/tiled/airless, /area/wrecked_nt_ship) "iU" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/mecha_equipment/mounted_system/plasmacutter, /obj/item/bluespace_crystal/artificial, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "jn" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/paper_bin, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "jw" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "asteroidfloor" - }, +/turf/simulated/floor/tiled/steel/airless, /area/space) "jM" = ( /turf/simulated/floor/airless/ice, /area/wrecked_nt_ship) "jN" = ( -/turf/simulated/floor/wood/airless{ - icon_state = "wood_broken5" - }, +/mob/living/simple_animal/hostile/giant_spider/emp, +/turf/simulated/floor/reinforced/airless, /area/wrecked_nt_ship) "jP" = ( /obj/structure/closet/secure_closet/xenobotany, @@ -608,7 +517,7 @@ "kE" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/crystal, -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "kO" = ( @@ -620,6 +529,7 @@ "lh" = ( /obj/structure/curtain/black, /obj/structure/bed, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/airless{ icon_state = "wood_broken5" }, @@ -628,17 +538,14 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "lq" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/steel/airless, /area/space) "lC" = ( /obj/machinery/light/colored/red{ dir = 1 }, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged2" - }, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "lH" = ( /obj/item/stack/rods{ @@ -650,13 +557,9 @@ /turf/template_noop, /area/space) "lO" = ( -/obj/item/material/shard/shrapnel{ - icon_state = "shrapnellarge" - }, -/turf/simulated/floor/airless{ - icon_state = "dmg2" - }, -/area/wrecked_nt_ship) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/space) "lT" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/dispenser/phoron, @@ -664,9 +567,8 @@ /area/wrecked_nt_ship) "lU" = ( /obj/effect/floor_decal/industrial/hatch/red, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "lV" = ( /obj/effect/floor_decal/asteroid, @@ -688,7 +590,7 @@ /turf/simulated/floor/tiled/airless, /area/wrecked_nt_ship) "mF" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/machinery/light/colored/red{ dir = 8 }, @@ -697,10 +599,9 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "mT" = ( -/obj/item/material/shard, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "mX" = ( /obj/machinery/constructable_frame/temp_deco{ @@ -708,12 +609,6 @@ }, /turf/simulated/floor/tiled/steel/airless, /area/space) -"mY" = ( -/obj/item/material/shard, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "loadingareadirty2" - }, -/area/wrecked_nt_ship) "nf" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/portable_atmospherics/canister/empty/phoron, @@ -729,6 +624,7 @@ /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/koisspore, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "nq" = ( @@ -737,6 +633,7 @@ /area/space) "nF" = ( /obj/effect/map_effect/window_spawner/full/reinforced, +/obj/machinery/door/blast/regular/open, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "nI" = ( @@ -746,7 +643,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "nR" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/seeds/replicapod{ icon_state = "" }, @@ -800,7 +697,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "pi" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/trash/tray, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -811,9 +708,8 @@ /area/wrecked_nt_ship) "ps" = ( /obj/item/slime_extract/blue, -/turf/simulated/floor/airless{ - icon_state = "dmg2" - }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/airless, /area/wrecked_nt_ship) "pv" = ( /obj/structure/table/rack, @@ -824,7 +720,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "px" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced{ dir = 4 }, @@ -840,9 +736,7 @@ /area/wrecked_nt_ship) "pE" = ( /obj/structure/table/rack, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "pF" = ( /obj/structure/table/rack, @@ -854,7 +748,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "pM" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/stack/cable_coil/random{ icon_state = "coil2" }, @@ -889,37 +783,31 @@ /turf/unsimulated/floor/asteroid/ash/rocky, /area/space) "qK" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/storage/backpack/medic, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "qX" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/mecha_equipment/shield, /obj/item/stack/cable_coil/random, /obj/item/device/integrated_circuit_printer/upgraded, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "qY" = ( -/obj/structure/bed/stool/chair/office/bridge{ - dir = 4; - icon_state = "wooden_chair_item" - }, -/turf/simulated/floor/airless{ - icon_state = "dmg4" - }, +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/space) "rc" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ dir = 4 }, /obj/item/paper_bin, /obj/item/pen/fountain, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged2" - }, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "rA" = ( /obj/machinery/door/airlock/external{ @@ -930,7 +818,7 @@ }, /area/wrecked_nt_ship) "rE" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 8 }, @@ -953,7 +841,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "rY" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 8 }, @@ -973,7 +861,7 @@ /turf/simulated/floor/airless, /area/wrecked_nt_ship) "si" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/trash/coffee, /turf/simulated/floor/airless, /area/wrecked_nt_ship) @@ -989,9 +877,7 @@ "sC" = ( /obj/structure/table/rack, /obj/item/storage/box/gloves, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "sE" = ( /obj/effect/floor_decal/asteroid, @@ -1017,10 +903,10 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "th" = ( -/obj/item/trash/cigbutt, -/turf/simulated/floor/airless{ - icon_state = "dmg2" - }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/item/seeds/koisspore, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "tm" = ( /mob/living/simple_animal/hostile/giant_spider, @@ -1033,9 +919,7 @@ /area/wrecked_nt_ship) "tp" = ( /obj/item/storage/firstaid/surgery, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "tr" = ( /obj/item/trash/broken_electronics, @@ -1052,7 +936,7 @@ /turf/simulated/floor/airless, /area/wrecked_nt_ship) "tN" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/trash/uselessplastic, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -1077,9 +961,7 @@ /obj/machinery/constructable_frame/temp_deco{ icon_state = "vbox_0" }, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "uk" = ( /obj/machinery/constructable_frame/temp_deco{ @@ -1096,10 +978,11 @@ "uD" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/structure/diona/bulb, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "uQ" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 8 }, @@ -1119,14 +1002,12 @@ /turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "vm" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 1 }, /obj/item/custom_ka_upgrade/barrels/supermatter, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged2" - }, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "vx" = ( /turf/simulated/floor/airless, @@ -1150,28 +1031,20 @@ /turf/template_noop, /area/space) "wj" = ( -/obj/item/trash/uselessplastic, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged1" - }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/airless, /area/wrecked_nt_ship) "wk" = ( /obj/item/material/shard, /turf/simulated/floor/airless, /area/space) -"wt" = ( -/obj/item/material/shard/shrapnel{ - icon_state = "shrapnelmedium" - }, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged1" - }, -/area/wrecked_nt_ship) "wO" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/wulumunushaseed{ icon_state = "" }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "wT" = ( @@ -1184,12 +1057,9 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "wY" = ( -/obj/item/stack/rods{ - icon_state = "rods-1" - }, -/turf/simulated/floor/airless{ - icon_state = "dmg2" - }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/wrecked_nt_ship) "wZ" = ( /obj/item/material/shard/shrapnel{ @@ -1204,9 +1074,7 @@ /obj/item/material/shard/shrapnel{ icon_state = "splinterssmall" }, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged1" - }, +/turf/simulated/floor/tiled/steel/airless, /area/space) "xy" = ( /obj/item/material/shard/shrapnel{ @@ -1219,10 +1087,11 @@ /obj/item/material/shard/shrapnel{ icon_state = "shrapnelsmall" }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, /turf/simulated/floor/airless, /area/wrecked_nt_ship) "xL" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/vaurca/box, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -1250,17 +1119,12 @@ /turf/simulated/floor/tiled/steel/airless, /area/space) "yw" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/device/vending_refill/seeds, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) -"yJ" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "asteroidfloor" - }, -/area/wrecked_nt_ship) "yK" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/mecha_equipment/mounted_system/rfd, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -1269,14 +1133,11 @@ /turf/simulated/floor/airless, /area/wrecked_nt_ship) "zc" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged3" - }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "zj" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged4" - }, +/turf/simulated/floor/reinforced/airless, /area/wrecked_nt_ship) "zl" = ( /obj/item/stack/material/gold, @@ -1309,10 +1170,6 @@ /obj/item/bluespace_crystal/artificial, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) -"zU" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/airless, -/area/wrecked_nt_ship) "zZ" = ( /obj/structure/bed/stool/chair/office/bridge{ dir = 4; @@ -1322,7 +1179,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Ab" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 8 }, @@ -1333,9 +1190,7 @@ "Ak" = ( /obj/item/storage/firstaid/adv, /obj/structure/table/rack, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "Ao" = ( /obj/item/trash/spitgum, @@ -1349,18 +1204,16 @@ /obj/item/material/shard/shrapnel{ icon_state = "shrapnelmedium" }, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, +/turf/simulated/floor/tiled/steel/airless, /area/space) "Bh" = ( /obj/item/paper, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Bi" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged2" - }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "BC" = ( /obj/machinery/door/airlock/centcom{ @@ -1369,9 +1222,8 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "BF" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "BO" = ( /obj/structure/bed/stool/chair/office/bridge{ @@ -1390,9 +1242,7 @@ /area/wrecked_nt_ship) "BZ" = ( /obj/item/trash/sosjerky, -/turf/simulated/floor/wood/airless{ - icon_state = "wood_broken1" - }, +/turf/simulated/floor/wood/airless, /area/wrecked_nt_ship) "Cb" = ( /obj/item/material/shard/shrapnel{ @@ -1405,7 +1255,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Cf" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -1417,7 +1267,7 @@ /turf/unsimulated/floor/asteroid/ash/rocky, /area/space) "CN" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 4 }, @@ -1426,7 +1276,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "CR" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/trash/cigbutt, /obj/item/trash/cigbutt, /obj/item/trash/cigbutt, @@ -1441,19 +1291,15 @@ /obj/machinery/constructable_frame/temp_deco{ icon_state = "vbox_2" }, -/turf/simulated/floor/airless{ - icon_state = "dmg2" - }, +/turf/simulated/floor/airless, /area/wrecked_nt_ship) "Dr" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/airless, /area/space) "Dz" = ( /obj/effect/decal/remains/human, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "DI" = ( /obj/item/trash/grease, @@ -1469,9 +1315,7 @@ /area/wrecked_nt_ship) "Ej" = ( /obj/item/ore/glass, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "Ep" = ( /obj/structure/lattice, @@ -1501,13 +1345,12 @@ "FA" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/trash_pile, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "FE" = ( /obj/item/clothing/suit/caution, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged3" - }, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "FP" = ( /obj/structure/shuttle/engine/propulsion, @@ -1521,9 +1364,8 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "FY" = ( -/turf/simulated/floor/wood/airless{ - icon_state = "wood_broken4" - }, +/obj/effect/decal/cleanable/floor_damage/random_wood_broken, +/turf/simulated/floor/wood/airless, /area/wrecked_nt_ship) "Gk" = ( /obj/item/stack/material/uranium, @@ -1531,9 +1373,7 @@ /obj/item/stack/material/uranium, /obj/item/stack/material/uranium, /obj/effect/floor_decal/asteroid, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged1" - }, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Gl" = ( /obj/item/trash/coffee, @@ -1552,14 +1392,13 @@ /obj/machinery/constructable_frame/temp_deco{ icon_state = "vbox_2" }, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "GO" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/seeds/random, /obj/item/seeds/koisspore, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "GP" = ( @@ -1579,8 +1418,9 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "He" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/random/booze, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, /turf/simulated/floor/airless, /area/space) "Hi" = ( @@ -1598,19 +1438,18 @@ /turf/simulated/floor/tiled/steel/airless, /area/space) "Hp" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 8 }, /obj/item/stack/material/phoron, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged2" - }, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Hr" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/item/melee/vaurca/rock, -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "HB" = ( @@ -1625,6 +1464,8 @@ "HI" = ( /obj/structure/bed/stool/chair/folding, /obj/item/trash/cigbutt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/floor_damage/random_wood_broken, /turf/simulated/floor/wood/airless, /area/wrecked_nt_ship) "HM" = ( @@ -1638,23 +1479,15 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Ih" = ( -/obj/item/trash/cigbutt, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged3" - }, -/area/wrecked_nt_ship) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, +/area/space) "Ir" = ( /obj/item/shreddedp, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) -"Iy" = ( -/obj/structure/closet/crate/loot, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "asteroidfloor" - }, -/area/wrecked_nt_ship) "IB" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/storage/toolbox/electrical, /turf/simulated/floor/airless, /area/wrecked_nt_ship) @@ -1663,12 +1496,10 @@ /area/space) "IM" = ( /obj/item/ammo_casing/a762/spent, -/turf/simulated/floor/airless{ - icon_state = "dmg4" - }, +/turf/simulated/floor/airless, /area/wrecked_nt_ship) "IP" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/crowbar/red, /turf/simulated/floor/airless, /area/space) @@ -1699,17 +1530,17 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Jc" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/circuitboard/mecha/phazon, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Jw" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "loadingarea" - }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "JG" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -1725,15 +1556,14 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "JZ" = ( -/obj/item/ore/glass, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged1" - }, +/mob/living/simple_animal/hostile/giant_spider, +/turf/simulated/floor/reinforced/airless, /area/wrecked_nt_ship) "Ke" = ( /obj/structure/toilet, /mob/living/simple_animal/hostile/giant_spider, -/turf/simulated/floor/tiled/steel, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "Kh" = ( /obj/structure/lattice, @@ -1743,15 +1573,10 @@ /turf/template_noop, /area/space) "Kt" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/device/integrated_circuit_printer/upgraded, /turf/simulated/floor/airless, /area/wrecked_nt_ship) -"KF" = ( -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "loadingareadirty2" - }, -/area/wrecked_nt_ship) "Lb" = ( /obj/item/stack/rods{ icon_state = "rods-1" @@ -1759,7 +1584,7 @@ /turf/unsimulated/floor/asteroid/ash/rocky, /area/space) "Lh" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/stack/material/gold, /obj/item/stack/material/gold, /obj/item/stack/material/gold, @@ -1808,6 +1633,7 @@ /turf/simulated/floor/wood/airless, /area/wrecked_nt_ship) "Mc" = ( +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless{ burnt = 3 }, @@ -1815,7 +1641,7 @@ "Mn" = ( /obj/structure/toilet, /obj/item/seeds/koisspore, -/turf/simulated/floor/tiled/steel/airless, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "MB" = ( /obj/item/crowbar/rescue_axe/red, @@ -1823,7 +1649,7 @@ /area/wrecked_nt_ship) "MV" = ( /obj/item/screwdriver, -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/airless, /area/wrecked_nt_ship) "MW" = ( @@ -1832,7 +1658,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "MX" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/stack/material/diamond, /obj/item/stack/material/diamond, /turf/simulated/floor/tiled/steel/airless, @@ -1846,10 +1672,10 @@ /turf/unsimulated/floor/asteroid/ash/rocky, /area/space) "Ni" = ( -/turf/simulated/floor/airless{ - icon_state = "dmg4" - }, -/area/space) +/obj/item/trash/uselessplastic, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, +/area/wrecked_nt_ship) "Nj" = ( /obj/structure/lattice, /turf/unsimulated/floor/asteroid/ash/rocky, @@ -1882,12 +1708,12 @@ /turf/template_noop, /area/space) "Ob" = ( -/turf/simulated/floor/airless{ - icon_state = "dmg1" - }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/wrecked_nt_ship) "On" = ( /obj/effect/decal/cleanable/ash, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Oo" = ( @@ -1937,13 +1763,11 @@ /obj/item/material/shard/shrapnel{ icon_state = "shrapnelsmall" }, -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/airless, /area/wrecked_nt_ship) "Pp" = ( -/obj/structure/table/reinforced{ - icon_state = "cult_flip0" - }, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/airless, /area/wrecked_nt_ship) "Px" = ( @@ -1961,7 +1785,7 @@ /turf/template_noop, /area/space) "PK" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/machinery/light/colored/red{ dir = 8 }, @@ -2009,11 +1833,11 @@ "QK" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/item/anomaly_core, -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "QS" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/stack/material/phoron, /obj/item/stack/material/phoron, /obj/item/stack/material/phoron, @@ -2030,13 +1854,13 @@ /turf/simulated/floor/airless, /area/wrecked_nt_ship) "Rr" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/effect/decal/cleanable/ash, /obj/item/trash/cigbutt/cigarbutt, /turf/simulated/floor/airless, /area/wrecked_nt_ship) "RB" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/toy/mech/phazon, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -2055,9 +1879,8 @@ /turf/simulated/mineral/random, /area/space) "Se" = ( -/turf/simulated/floor/wood/airless{ - icon_state = "wood_broken0" - }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood/airless, /area/wrecked_nt_ship) "St" = ( /obj/machinery/constructable_frame/temp_deco, @@ -2066,17 +1889,15 @@ /area/wrecked_nt_ship) "Sv" = ( /obj/structure/table/steel, -/turf/simulated/floor/wood/airless{ - icon_state = "wood_broken5" - }, +/turf/simulated/floor/wood/airless, /area/wrecked_nt_ship) "Sw" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/device/integrated_circuit_printer/upgraded, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "SE" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/paper_bin, /obj/item/pen/fountain, /turf/simulated/floor/tiled/steel/airless, @@ -2086,7 +1907,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "SL" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/storage/belt/utility/alt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -2101,7 +1922,7 @@ /turf/simulated/floor/airless, /area/wrecked_nt_ship) "Tq" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 8 }, @@ -2113,6 +1934,7 @@ /obj/structure/bed/stool/chair/plastic{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "TC" = ( @@ -2124,16 +1946,15 @@ /obj/item/material/shard/shrapnel{ icon_state = "shrapnellarge" }, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "TW" = ( /obj/item/crowbar, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Ub" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/machinery/cell_charger, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -2141,14 +1962,6 @@ /obj/structure/flora/rock/pile, /turf/unsimulated/floor/asteroid/ash/rocky, /area/space) -"Uj" = ( -/obj/item/material/shard/shrapnel{ - icon_state = "shrapnelsmall" - }, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "loadingarea" - }, -/area/wrecked_nt_ship) "Uk" = ( /obj/effect/floor_decal/asteroid{ icon_state = "asteroid_dug_overlay" @@ -2157,16 +1970,10 @@ /area/space) "Uo" = ( /obj/structure/curtain, -/turf/simulated/floor/tiled/steel/airless, -/area/wrecked_nt_ship) -"Uq" = ( -/obj/item/trash/cigbutt, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged1" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "Uu" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/reagent_containers/food/snacks/koisjelly, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -2175,14 +1982,14 @@ /turf/simulated/floor/tiled/steel/airless, /area/space) "UH" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/item/trash/cigbutt/roll, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "UP" = ( -/turf/simulated/floor/airless{ - icon_state = "dmg4" - }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "UR" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -2196,20 +2003,17 @@ /area/wrecked_nt_ship) "Vc" = ( /obj/item/reagent_containers/blood/OMinus, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "Vl" = ( /obj/machinery/optable, /obj/effect/decal/remains/human, /obj/item/organ/internal/parasite/kois, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "Vr" = ( /obj/effect/overmap/visitable/wrecked_nt_ship, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, /area/wrecked_nt_ship) "VS" = ( @@ -2227,7 +2031,7 @@ /turf/simulated/floor/airless, /area/wrecked_nt_ship) "Wd" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 8 }, @@ -2243,15 +2047,13 @@ /area/space) "Wp" = ( /obj/item/trash/broken_electronics, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "asteroidfloor" - }, +/turf/simulated/floor/airless, /area/wrecked_nt_ship) "WD" = ( -/obj/structure/trash_pile, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged2" - }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "WI" = ( /obj/structure/lattice, @@ -2282,16 +2084,14 @@ /turf/simulated/floor/wood/airless, /area/wrecked_nt_ship) "Xj" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ dir = 8 }, /obj/item/shreddedp, /obj/item/trash/match, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged2" - }, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Xl" = ( /obj/structure/sign/poster{ @@ -2300,7 +2100,7 @@ /turf/simulated/wall/r_wall, /area/wrecked_nt_ship) "Xp" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ dir = 4 }, @@ -2337,7 +2137,7 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "YR" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/random/seed, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -2364,15 +2164,14 @@ /area/wrecked_nt_ship) "ZC" = ( /obj/item/surgery/scalpel/manager, -/turf/simulated/floor/tiled/white/airless{ - icon_state = "freezer" - }, +/obj/effect/decal/cleanable/floor_damage/random_tiled_broken, +/turf/simulated/floor/tiled/white/airless, /area/wrecked_nt_ship) "ZE" = ( -/obj/structure/filingcabinet, -/turf/simulated/floor/tiled/steel/airless{ - icon_state = "damaged5" - }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "ZM" = ( /turf/simulated/floor/tiled/airless{ @@ -2380,7 +2179,7 @@ }, /area/wrecked_nt_ship) "ZZ" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ dir = 4 @@ -27518,7 +27317,7 @@ Kn Kn Kn ot -gv +aa aa iR ot @@ -27776,7 +27575,7 @@ Kn Kn zs iy -iy +Mc Zh zs Kn @@ -28033,7 +27832,7 @@ Kn Kn zs iy -aF +aY Zh zs Kn @@ -28290,7 +28089,7 @@ Kn Kn zs Zh -Zh +iK iy zs PA @@ -28548,7 +28347,7 @@ Kn ot rA rA -ac +iR ot Kn Kn @@ -28805,7 +28604,7 @@ Kn ot iy iy -aF +ll ot Kn Kn @@ -29325,11 +29124,11 @@ uV ot iy Zh -Mc +iy Zh Zh Zh -aF +ll ot FP Kn @@ -29574,13 +29373,13 @@ ll ll ll ll -zc +ll ll dU aY kO ot -aF +ll to nZ iy @@ -29813,7 +29612,7 @@ xi Px ll ll -ll +aY ll ll dU @@ -29824,10 +29623,10 @@ vx vx hw ll -aY +ll BC ll -aY +ll mj ot ot @@ -29835,12 +29634,12 @@ ot ot dP Px -zc +ll ot -Mc +iy bn bn -Mc +iy py lT Zh @@ -30068,18 +29867,18 @@ pg AD AD Pg -aG +bO Sw Tw ll pi -ll +aY ot vT vx vx -UP -zU +vx +Pp ll yq ot @@ -30097,7 +29896,7 @@ ot Zh jR nf -Mc +iy Zh iy iy @@ -30307,7 +30106,7 @@ AD xi xi xi -lq +jw xi xi AD @@ -30330,31 +30129,31 @@ tN fb fC SE -aY +ll ot sd IM vx -vx +dB Rr -ll +zc yq ot pw TW vx vx -vx -ll -ll +Ob +zc +aY ot -ll -wt +aY +kO nI ZM -Mc +iy Zh -Mc +iy LQ Qb ot @@ -30582,19 +30381,19 @@ bO BS HM ot -BF -Bi +ll aY ll ll -Bi +ll +ll ot YB vx GP vX px -zc +ll yq ot Eg @@ -30820,11 +30619,11 @@ AD AD AD AD -lq -lq +jw +jw xi Hn -eC +jw II II xi @@ -30835,15 +30634,15 @@ xi xi yK qX -Bi +aY tr Lt ot -Bi +ll ll MY -Bi -zc +aY +ll ca bP ll @@ -30851,15 +30650,15 @@ ll ll ll ll -aY +ll ll BC ll -UP vx +dB fa MV -dB +vx St ot Kn @@ -31092,8 +30891,8 @@ cA IY aY BS -zc -Bi +aY +ll uV ot ll @@ -31109,14 +30908,14 @@ ot ot ot ot -ad +ah ot jM jM jM iv pM -UP +vx kC ot Kh @@ -31338,14 +31137,14 @@ AD BO Ny qD -IT +lO jw xi xi xi jU -UP -yJ +vx +ll BS ll dK @@ -31358,13 +31157,13 @@ ll bt ZZ ll -dU +gv Ao ll QJ zT HS -aY +ll IU ll ot @@ -31593,29 +31392,30 @@ AD II xi IT -Ni +IT Dr IT xi mX xi xi -UP +vx tY lU -mY -BF +Pg +ll RB Jc ll -Nr +fg bV Ir ll ll ll -Bi -Ih +ll +BS +ll ll ll ll @@ -31623,7 +31423,6 @@ ll ll ll ll -zc ot jM jM @@ -31633,7 +31432,7 @@ Kh Kh bO kO -wj +dU ll Kh Kh @@ -31850,48 +31649,48 @@ AD AD xi xi -IT +lO IP AD AD -eC +jw nW fS Ob QV tI -Jw +ll VS SL Ub -Bi -fg +ll +Nr ot ll ll YY Xj -zc -Bi +aY +ll rY Tq ll -ll +zc rE Hp ll -Bi +ll ot jM ll pM -zU +Pp Kn PQ Kn Kn vx -lO +RT PQ wf wf @@ -32110,26 +31909,26 @@ xi xv AD xi -Ni +IT IT Uk hJ VS gn YN -Uj +Cb ll +aY ll ll -zc ll ot -aY +ll Xp CN rc ll -Bi +ll vm kc ll @@ -32141,7 +31940,7 @@ ll ot jM kO -dB +vx vx vx ll @@ -32372,8 +32171,8 @@ IT Uk II UW -UP -aY +vx +ll pg dR dc @@ -32385,16 +32184,16 @@ ll ll ll ll -Bi -aY +ll +ll Cf ll gX -Bi +ll JG Bh ll -Bi +ll ot MB WM @@ -32402,7 +32201,7 @@ uk UW Di rN -aY +ll ll Gl vx @@ -32636,7 +32435,7 @@ ot ot ot ot -ae +ah ot ot ot @@ -32651,7 +32450,7 @@ ot ot ot ot -af +ah ot ot ot @@ -32659,9 +32458,9 @@ ot ot ot ot -ag +ah ot -ll +zc Kn Kn Kn @@ -32888,24 +32687,24 @@ II LJ pg vx +Jw aY ll ll ll ll +BS ll -Uq ll -Bi ll -uV -zc +ao +ll ll Gl -aY +Jw ll -BF -BF +ll +aY ll kO dU @@ -33144,18 +32943,18 @@ OF GH nW kd -Ob -aY +vx +ll ll UR ll aY ll ll -zc -zc -Bi +aY ll +Jw +aY ll ll kO @@ -33163,21 +32962,21 @@ ll ll dU ll -ll aY ll ll ll ll ll -aY -zc -Bi +ll +ll +ll +ll ll uV vx vx -dB +vx Kn PQ Kn @@ -33411,7 +33210,7 @@ ah ot ll CR -aY +ll vx ll Px @@ -33422,7 +33221,7 @@ ot ot ot ot -ai +ah ot ot ot @@ -33434,7 +33233,7 @@ Fw ot Tl vx -vx +dB Kh Kh Kn @@ -33659,10 +33458,10 @@ II Uk vx QJ -JZ +bO ot -am -ZE +pL +pL am ll ot @@ -33670,7 +33469,7 @@ uR iA vx Vr -Bi +ll ll BC Se @@ -33679,17 +33478,17 @@ Gq Sv OG Mb -iK +uC ot ug gW sp vx -ab +YE bC -ab +YE +vx vx -dB vx Kh Kn @@ -33914,37 +33713,37 @@ xi xi xi AD -UP -zc +dB +ll uV ot ll -BF +aY ll -zj +aY ot vx si -vx dB -th +vx +kd LJ ot -jN -uC +FY +Se uC -iK +FY uC uC BZ ot -ab +iz vx vx Qe -ab +YE Kh -ab +YE vx PQ tt @@ -34161,50 +33960,50 @@ xi xi II II -jw +aq xi ko -lq +jw xi xi xi xi xi -Iy +QJ aM -cd +Pg QJ dP -Bi +ll PM zZ -mT +Pg ot ch ch vx -dB +vx vx ll HD iF uC -uC +Se HI tU bg uC ot -ab +YE WV Kn PQ wf -ab +YE ax ot vx -UP +vx HB wf Kn @@ -34418,10 +34217,10 @@ AD AD II He -dZ +IT IT xi -lq +jw xi xi xi @@ -34429,10 +34228,10 @@ xi xi AD VS -UP +dB rG ot -BF +ll jn xL UH @@ -34442,10 +34241,10 @@ ch Qc vx Df -aY +ll sb DT -Se +uC DI bg Mb @@ -34462,7 +34261,7 @@ Dz ot jU RT -iz +yd Kn Kn nq @@ -34675,8 +34474,8 @@ AD AD II Dr -IT -qD +aq +qY fv IT xi @@ -34689,12 +34488,12 @@ ot ot ot sb -ll +aY iA ll IW ot -dB +vx OW Pp Pp @@ -34702,12 +34501,12 @@ Pp ch ot ot -uC +FY ot ot ot ot -aj +ak ot sC Kn @@ -34715,9 +34514,9 @@ PQ Kn sI vx -ab -ot BF +ot +ll Cb ot Kn @@ -34933,9 +34732,9 @@ AD II Dr IT -qY -IT +BO IT +lO xi xi xi @@ -34946,10 +34745,10 @@ xi xi xi ot -zj +ll dX -zj -BF +aY +ll ot Yb vx @@ -34972,10 +34771,10 @@ Kn Kn pv RT -ab +YE ot ll -aY +ll ot ot zs @@ -35189,12 +34988,12 @@ AD AD II gy -lq -lq +jw +jw Wl -IT +lO yu -lq +Ih dw II AD @@ -35205,34 +35004,34 @@ xi ot Hc On -Bi -pL +ll +am ot -cT +FE Gl -vx dB +vx +ll ll -aY ot gj -uC +Se ot ot ot aP -ll +BF ot -vx +Ob vx Th BR OM vx -ab +YE ot xy -ll +aY nI pp vx @@ -35449,10 +35248,10 @@ xi xi xi xi +aq IT -IT -IT -lq +lO +Ih II AD AD @@ -35467,18 +35266,18 @@ ot ot tg Eq -ll +aY Gl WS ll ot -YT -FY -YT +ai +uC +ai ot Ke BC -Bi +ap ot vx Wb @@ -35488,10 +35287,10 @@ Kn ab tp ot -zc +ll ll ot -aF +ll LI mt vx @@ -35724,34 +35523,34 @@ xi ot is SJ -aY ll -zc +ll +aY Yb ot ta -uC +FY YT ot ot ot ak ot -ab +YE TN Kh PQ Dz -ab -ab +YE +YE ot -aY -dU +ll +Ni ot Mc mt LI -iy +Mc mt LI aF @@ -35980,7 +35779,7 @@ xi xi ot uV -aY +ll OW OW Wp @@ -35990,23 +35789,23 @@ ot bF ot ot -eZ +aj Uo -aY -ot YE +ot +iz Kh pE Ej -ab -ab +iz +YE Vl ot ll ll ot iy -LI +wj mt gr LI @@ -36238,8 +36037,8 @@ xi ot ot ot -al -an +iR +iR ot ot ot @@ -36249,13 +36048,13 @@ ue ot eZ Uo -ll +BF ot uY Kn -ab -ab -ab +YE +YE +YE ZC Vc ot @@ -36263,12 +36062,12 @@ uV uV ot Mc +iy Mc -Mc -aF -Mc +ll Mc iy +iy ot FP Kn @@ -36752,7 +36551,7 @@ xi xi xi AD -dB +vx vx fz PQ @@ -37525,7 +37324,7 @@ Uk IT fG vx -wY +Qe Kn nq PQ @@ -38038,7 +37837,7 @@ xi AD AD hG -dB +vx qh Kn Kn @@ -38294,7 +38093,7 @@ qH AD qH ot -dB +vx Zh ot Kn @@ -38551,8 +38350,8 @@ ot ot ot ot -ao -ap +iR +iR ot ot ot @@ -38807,9 +38606,9 @@ ot QK kE dP -VY +ae +ll ll -yJ ot Cd Cd @@ -38819,7 +38618,7 @@ nR mF ll ot -kt +UP nk aU Kh @@ -39060,27 +38859,27 @@ AD xi Ph ll +aY ll -Bi wZ ot VY aY uV ot -zc -Bi ll -zc Bi -aY ll -bT +ll ll ll aY -vx -vx +bT +ll +aY +aY +dB +Ob vx vx yd @@ -39330,13 +39129,13 @@ ll jP qK YR -iA +cd Hi ot -Bi -kt -aU aY +UP +aU +ll Df vx eQ @@ -39576,14 +39375,14 @@ xi ll Hr hu -dB +vx ot xQ ll VY ot fi -ll +aY jP GO Uu @@ -39830,19 +39629,19 @@ xi kD Nf ot -WD +uV ll aY ll qq -KF -Bi aY +ll +ll BC iI -aY -Hi ll +Hi +aY ll ll ll @@ -40093,14 +39892,14 @@ ot ot ot ot -aq +ah ot ot lC kt kt kt -kt +mT wO Eq ot @@ -40358,13 +40157,13 @@ FS uD kt kt -kt +ZE ll ot ll -Bi -vx -eQ +ll +dB +wY eQ vx Kh @@ -40603,26 +40402,26 @@ nW AD AD Gk -vx +dB vx zl -aY +ll hH ll ot ll -zc ll ll ll ll -aY +ll +ll bT -aY ll +WD vx vx -vx +dB vx sE Kn @@ -40860,12 +40659,12 @@ xi AD jU fz -dB +vx zp zF pF su -aY +zc ot fo kt @@ -40877,9 +40676,9 @@ qo ot MW kt -MW +th ll -zc +aY eQ eQ vx @@ -41116,11 +40915,11 @@ xi xi AD ND -dB -Qe vx +Qe +dB ph -Bi +ll ll ll ot @@ -41377,7 +41176,7 @@ ar os Pg ot -nF +ag as nF ot @@ -41630,13 +41429,13 @@ xi xi Uk ot -aY -Bi -hp -ot -SJ ll ll +hp +ot +jN +zj +zj ot Kn Kn @@ -41891,9 +41690,9 @@ Pg JI wZ ot -ll -aY -WS +zj +zj +JZ ot Kn Kn @@ -42145,12 +41944,12 @@ Nq Nq xi uV -ll +aY FE ot -ll -zc -ll +zj +zj +zj ot Kn Kn From 5e3ad58b14337766c459dd7ae27e93b365d1291c Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Sat, 4 May 2024 03:07:29 -0600 Subject: [PATCH 02/12] area --- .../wrecked_nt_ship/wrecked_nt_ship.dmm | 119 +++++++++--------- 1 file changed, 61 insertions(+), 58 deletions(-) diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm index e9d9a09c516..539b3e4a1ba 100644 --- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm +++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm @@ -63,7 +63,7 @@ "aq" = ( /obj/effect/decal/cleanable/floor_damage/random_tiled_broken, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "ar" = ( /obj/item/stack/material/silver, /obj/item/stack/material/silver, @@ -207,7 +207,7 @@ /obj/structure/trash_pile, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "dB" = ( /obj/effect/decal/cleanable/floor_damage/random_tiled_broken, /turf/simulated/floor/airless, @@ -243,7 +243,7 @@ "ey" = ( /obj/item/pickaxe/drill/weak, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "eQ" = ( /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/airless, @@ -290,7 +290,7 @@ icon_state = "shrapnellarge" }, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "fy" = ( /obj/item/toy/plushie/slime, /obj/structure/table/reinforced/steel, @@ -312,11 +312,11 @@ }, /obj/structure/lattice, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "fS" = ( /obj/structure/closet/crate/loot, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "gj" = ( /obj/structure/sign/poster{ icon_state = "bsposter10" @@ -345,7 +345,7 @@ }, /obj/structure/table/reinforced/steel, /turf/space, -/area/space) +/area/wrecked_nt_ship/exterior) "gW" = ( /obj/item/material/shard/shrapnel{ icon_state = "shrapnelmedium" @@ -365,7 +365,7 @@ "gZ" = ( /obj/structure/closet/crate/loot, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "hp" = ( /mob/living/carbon/slime/purple, /turf/simulated/floor/tiled/steel/airless, @@ -391,7 +391,7 @@ icon_state = "rods-1" }, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "hH" = ( /obj/item/slime_extract/metal, /turf/simulated/floor/tiled/steel/airless, @@ -399,7 +399,7 @@ "hJ" = ( /obj/structure/mech_wreckage, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "hZ" = ( /turf/template_noop, /area/wrecked_nt_ship) @@ -460,7 +460,7 @@ /area/wrecked_nt_ship) "jw" = ( /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "jM" = ( /turf/simulated/floor/airless/ice, /area/wrecked_nt_ship) @@ -499,7 +499,7 @@ "ko" = ( /obj/machinery/vending/boozeomat, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "kt" = ( /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled/steel/airless, @@ -513,7 +513,7 @@ icon_state = "asteroid9" }, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "kE" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/crystal, @@ -540,7 +540,7 @@ "lq" = ( /obj/effect/decal/cleanable/floor_damage/random_tiled_broken, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "lC" = ( /obj/machinery/light/colored/red{ dir = 1 @@ -559,7 +559,7 @@ "lO" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "lT" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/dispenser/phoron, @@ -574,7 +574,7 @@ /obj/effect/floor_decal/asteroid, /obj/effect/floor_decal/asteroid, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "mj" = ( /obj/item/material/shard/shrapnel{ icon_state = "shrapnelmedium" @@ -608,7 +608,7 @@ icon_state = "vbox_0" }, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "nf" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/portable_atmospherics/canister/empty/phoron, @@ -652,7 +652,7 @@ "nW" = ( /obj/effect/floor_decal/asteroid, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "nY" = ( /obj/structure/lattice, /obj/item/stack/rods{ @@ -687,7 +687,7 @@ "oM" = ( /obj/item/trash/broken_electronics, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "pg" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel/airless, @@ -777,11 +777,11 @@ "qD" = ( /obj/effect/decal/remains/human, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "qH" = ( /obj/item/material/shard, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "qK" = ( /obj/structure/table/reinforced/steel, /obj/item/storage/backpack/medic, @@ -798,7 +798,7 @@ /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "rc" = ( /obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted, @@ -1038,7 +1038,7 @@ "wk" = ( /obj/item/material/shard, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "wO" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/wulumunushaseed{ @@ -1069,13 +1069,13 @@ /area/wrecked_nt_ship) "xi" = ( /turf/unsimulated/mineral/asteroid, -/area/space) +/area/wrecked_nt_ship/exterior) "xv" = ( /obj/item/material/shard/shrapnel{ icon_state = "splinterssmall" }, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "xy" = ( /obj/item/material/shard/shrapnel{ icon_state = "shrapnelsmall" @@ -1106,7 +1106,7 @@ "yh" = ( /obj/effect/floor_decal/industrial/hatch/red, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "yq" = ( /obj/structure/bed/stool/chair/folding, /turf/simulated/floor/tiled/steel/airless, @@ -1117,7 +1117,7 @@ }, /obj/structure/closet/crate/loot, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "yw" = ( /obj/structure/table/reinforced/steel, /obj/item/device/vending_refill/seeds, @@ -1165,7 +1165,7 @@ icon_state = "vbox_0" }, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "zT" = ( /obj/item/bluespace_crystal/artificial, /turf/simulated/floor/tiled/steel/airless, @@ -1199,13 +1199,13 @@ /area/wrecked_nt_ship) "AD" = ( /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "AT" = ( /obj/item/material/shard/shrapnel{ icon_state = "shrapnelmedium" }, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "Bh" = ( /obj/item/paper, /turf/simulated/floor/tiled/steel/airless, @@ -1231,7 +1231,7 @@ icon_state = "wooden_chair_item" }, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "BR" = ( /obj/machinery/constructable_frame/temp_deco, /turf/simulated/floor/airless, @@ -1265,7 +1265,7 @@ "CI" = ( /obj/item/melee/vaurca/rock, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "CN" = ( /obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ @@ -1296,7 +1296,7 @@ "Dr" = ( /obj/structure/table/reinforced/steel, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "Dz" = ( /obj/effect/decal/remains/human, /turf/simulated/floor/tiled/white/airless, @@ -1387,7 +1387,7 @@ "GH" = ( /obj/item/ore/glass, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "GK" = ( /obj/machinery/constructable_frame/temp_deco{ icon_state = "vbox_2" @@ -1422,7 +1422,7 @@ /obj/random/booze, /obj/effect/decal/cleanable/floor_damage/random_tiled_broken, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "Hi" = ( /obj/random/seed, /turf/simulated/floor/tiled/steel/airless, @@ -1436,7 +1436,7 @@ icon_state = "box_1" }, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "Hp" = ( /obj/structure/table/reinforced/steel, /obj/structure/window/reinforced/tinted{ @@ -1481,7 +1481,7 @@ "Ih" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "Ir" = ( /obj/item/shreddedp, /turf/simulated/floor/tiled/steel/airless, @@ -1493,7 +1493,7 @@ /area/wrecked_nt_ship) "II" = ( /turf/simulated/wall/r_wall, -/area/space) +/area/wrecked_nt_ship/exterior) "IM" = ( /obj/item/ammo_casing/a762/spent, /turf/simulated/floor/airless, @@ -1502,10 +1502,10 @@ /obj/structure/table/reinforced/steel, /obj/item/crowbar/red, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "IT" = ( /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "IU" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/simulated/floor/tiled/steel/airless, @@ -1582,7 +1582,7 @@ icon_state = "rods-1" }, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "Lh" = ( /obj/structure/table/reinforced/steel, /obj/item/stack/material/gold, @@ -1670,7 +1670,7 @@ "Nf" = ( /obj/machinery/artifact, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "Ni" = ( /obj/item/trash/uselessplastic, /obj/effect/decal/cleanable/dirt, @@ -1679,13 +1679,13 @@ "Nj" = ( /obj/structure/lattice, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "Nq" = ( /obj/item/stack/rods{ icon_state = "rods-1" }, /turf/unsimulated/mineral/asteroid, -/area/space) +/area/wrecked_nt_ship/exterior) "Nr" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled/steel/airless, @@ -1693,7 +1693,7 @@ "Ny" = ( /obj/structure/closet/crate/loot, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "ND" = ( /obj/item/stack/material/uranium, /turf/simulated/floor/airless, @@ -1723,7 +1723,7 @@ "OF" = ( /obj/effect/decal/remains/human, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "OG" = ( /obj/structure/table/steel, /obj/item/trash/grease, @@ -1733,7 +1733,7 @@ /obj/item/material/shard, /obj/structure/lattice, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "OM" = ( /obj/item/reagent_containers/blood/ripped, /turf/template_noop, @@ -1749,7 +1749,7 @@ "OR" = ( /obj/item/ore/glass, /turf/simulated/floor/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "OW" = ( /obj/structure/blocker, /turf/simulated/floor/tiled/steel/airless, @@ -1779,7 +1779,7 @@ icon_state = "shrapnelmedium" }, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "PA" = ( /obj/item/ore/glass, /turf/template_noop, @@ -1877,7 +1877,7 @@ /area/wrecked_nt_ship) "RX" = ( /turf/simulated/mineral/random, -/area/space) +/area/wrecked_nt_ship/exterior) "Se" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/airless, @@ -1961,13 +1961,13 @@ "Uf" = ( /obj/structure/flora/rock/pile, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "Uk" = ( /obj/effect/floor_decal/asteroid{ icon_state = "asteroid_dug_overlay" }, /turf/unsimulated/floor/asteroid/ash/rocky, -/area/space) +/area/wrecked_nt_ship/exterior) "Uo" = ( /obj/structure/curtain, /turf/simulated/floor/tiled/white/airless, @@ -1980,7 +1980,7 @@ "UB" = ( /obj/structure/trash_pile, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "UH" = ( /obj/structure/table/reinforced/steel, /obj/item/trash/cigbutt/roll, @@ -2044,7 +2044,10 @@ "Wl" = ( /obj/machinery/constructable_frame/temp_deco, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) +"Wo" = ( +/turf/template_noop, +/area/wrecked_nt_ship/exterior) "Wp" = ( /obj/item/trash/broken_electronics, /turf/simulated/floor/airless, @@ -2115,7 +2118,7 @@ "XR" = ( /obj/item/material/shard, /turf/simulated/floor/tiled/steel/airless, -/area/space) +/area/wrecked_nt_ship/exterior) "Yb" = ( /obj/effect/decal/remains/human, /obj/item/seeds/koisspore, @@ -28280,7 +28283,7 @@ Kn Kn Kn Kn -Kn +Wo RX RX RX @@ -28537,8 +28540,8 @@ Kn Kn Kn Kn -Kn -Kn +Wo +Wo RX RX RX From ba053c6f9f1ce984f27ee06d4c0a29045817b3fe Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Sun, 5 May 2024 17:03:53 -0600 Subject: [PATCH 03/12] airlock tweak on kata and spawn weight --- .../away/ships/kataphracts/kataphract_ship.dm | 2 +- .../ships/kataphracts/kataphract_ship.dmm | 101 ++++++++++++------ 2 files changed, 68 insertions(+), 35 deletions(-) diff --git a/maps/away/ships/kataphracts/kataphract_ship.dm b/maps/away/ships/kataphracts/kataphract_ship.dm index 9e49f9451fb..f63b6379eed 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dm +++ b/maps/away/ships/kataphracts/kataphract_ship.dm @@ -7,7 +7,7 @@ suffixes = list("kataphract_ship.dmm") ship_cost = 1 - spawn_weight = 1 + spawn_weight = 9 spawn_weight_sector_dependent = list(SECTOR_UUEOAESA = 1.5) sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_UUEOAESA, SECTOR_WEEPING_STARS) shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/kataphract_transport) diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index 44dc03be73e..479fef02b06 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -742,6 +742,10 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/window/reinforced{ + dir = 4; + icon_state = "rwindow" + }, /turf/simulated/floor/tiled, /area/shuttle/kataphract_shuttle/main_compartment) "cR" = ( @@ -1280,9 +1284,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 4 - }, /obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ @@ -1293,6 +1294,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/shuttle/kataphract_shuttle/main_compartment) "eH" = ( @@ -1389,26 +1391,13 @@ /area/kataphract_chapter/brig) "fc" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, /obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 8; - pixel_y = 6; - pixel_x = 20 - }, -/obj/machinery/airlock_sensor{ - pixel_x = 20; - dir = 8; - pixel_y = -6 - }, -/obj/machinery/light/small/emergency{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, /area/shuttle/kataphract_shuttle/main_compartment) "fd" = ( @@ -1553,16 +1542,16 @@ /area/kataphract_chapter/engineering) "fC" = ( /obj/machinery/atmospherics/pipe/manifold/visible/fuel{ - dir = 8 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 + dir = 6 }, /turf/simulated/wall/shuttle/space_ship/mercenary, /area/shuttle/kataphract_shuttle/main_compartment) "fD" = ( /obj/machinery/atmospherics/pipe/manifold/visible/fuel{ - dir = 4 + dir = 1 }, /turf/simulated/wall/shuttle/space_ship/mercenary, /area/shuttle/kataphract_shuttle/main_compartment) @@ -4531,6 +4520,13 @@ /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/tiled, /area/kataphract_chapter/atmospherics) +"tP" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/shuttle/kataphract_shuttle/main_compartment) "tS" = ( /obj/structure/lattice/catwalk, /turf/space, @@ -4806,6 +4802,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/kataphract_chapter/armoury) +"xE" = ( +/obj/structure/fuel_port/hydrogen{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/shuttle/kataphract_shuttle/main_compartment) "xK" = ( /obj/effect/floor_decal/spline/plain/yellow{ dir = 4 @@ -5374,6 +5376,10 @@ /obj/machinery/light, /turf/simulated/floor/wood, /area/kataphract_chapter/mess) +"Dl" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/shuttle/kataphract_shuttle/main_compartment) "Dx" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -5401,6 +5407,18 @@ /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/tiled/white, /area/kataphract_chapter/medical) +"DQ" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/map_effect/marker_helper/airlock/out, +/turf/simulated/floor/plating, +/area/shuttle/kataphract_shuttle/main_compartment) "DT" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -6159,7 +6177,7 @@ "Mh" = ( /obj/machinery/atmospherics/pipe/manifold/visible/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 + dir = 10 }, /turf/simulated/wall/shuttle/space_ship/mercenary, /area/shuttle/kataphract_shuttle/main_compartment) @@ -6916,9 +6934,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 6 }, -/obj/structure/fuel_port/hydrogen{ - pixel_x = -32 - }, /turf/simulated/floor/tiled, /area/shuttle/kataphract_shuttle/main_compartment) "Td" = ( @@ -7381,6 +7396,24 @@ }, /turf/simulated/floor/wood, /area/kataphract_chapter/office) +"Yz" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + pixel_y = 6; + pixel_x = 20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = -6 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/kataphract_shuttle/main_compartment) "YP" = ( /obj/structure/table/standard, /obj/structure/closet/walllocker/medical/secure{ @@ -35762,11 +35795,11 @@ bO yh Bi Bi +Bi fd RO CH iB -iB lo lo Wl @@ -36014,11 +36047,11 @@ dk dL ZX eE -fe +xE fC +tP eD iB -iB lo Pr aW @@ -36268,7 +36301,7 @@ JZ cl Tb Mh -Bi +DQ Bi lo lo @@ -36772,7 +36805,7 @@ lQ cl cQ gA -Bi +Yz Bi lo lo @@ -37021,12 +37054,12 @@ dN dN dN Bv +cl lB -fd fD +Dl eD iB -iB lo bb NP @@ -37274,11 +37307,11 @@ bO IU Bi Bi +Bi fe eD iB iB -iB lo lo Wl From e6ea2e1dae2f82977659803f986d6312450367c7 Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Sun, 5 May 2024 20:18:22 -0600 Subject: [PATCH 04/12] save --- .../ships/kataphracts/kataphract_ship.dmm | 131 +++++++++--------- 1 file changed, 68 insertions(+), 63 deletions(-) diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index 479fef02b06..dae109c11d4 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -4231,6 +4231,12 @@ /obj/effect/floor_decal/corner/yellow{ dir = 10 }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 1; + pixel_y = -21; + name = "Kataphract Shuttle docking port controller"; + docking_controller = "kataphract_dock" + }, /turf/simulated/floor/tiled, /area/kataphract_chapter/hangar) "ru" = ( @@ -4374,6 +4380,18 @@ /obj/effect/floor_decal/corner/yellow/full, /turf/simulated/floor/tiled, /area/kataphract_chapter/starentry) +"sx" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, +/obj/effect/map_effect/marker_helper/airlock/out, +/obj/machinery/airlock_sensor{ + pixel_x = 24; + pixel_y = 24 + }, +/turf/simulated/floor/airless, +/area/shuttle/kataphract_shuttle/main_compartment) "sB" = ( /obj/item/ship_ammunition/bruiser/real/canister{ pixel_x = -7 @@ -4520,13 +4538,6 @@ /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/tiled, /area/kataphract_chapter/atmospherics) -"tP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 - }, -/turf/simulated/wall/shuttle/space_ship/mercenary, -/area/shuttle/kataphract_shuttle/main_compartment) "tS" = ( /obj/structure/lattice/catwalk, /turf/space, @@ -4628,6 +4639,12 @@ }, /turf/simulated/floor/tiled, /area/kataphract_chapter/armoury) +"vF" = ( +/obj/structure/fuel_port/hydrogen{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/shuttle/kataphract_shuttle/main_compartment) "vX" = ( /obj/structure/closet/walllocker{ pixel_x = -32; @@ -4781,6 +4798,10 @@ }, /turf/simulated/floor/tiled/dark/full, /area/kataphract_chapter/cic) +"wU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/shuttle/kataphract_shuttle/main_compartment) "xd" = ( /obj/machinery/button/remote/blast_door{ dir = 6; @@ -4802,12 +4823,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/kataphract_chapter/armoury) -"xE" = ( -/obj/structure/fuel_port/hydrogen{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled, -/area/shuttle/kataphract_shuttle/main_compartment) "xK" = ( /obj/effect/floor_decal/spline/plain/yellow{ dir = 4 @@ -5324,17 +5339,11 @@ /turf/simulated/floor/tiled/dark, /area/kataphract_chapter/frankie) "CH" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, -/obj/effect/map_effect/marker_helper/airlock/out, -/obj/machinery/airlock_sensor{ - dir = 2; - pixel_y = 28; - pixel_x = 28 +/obj/machinery/atmospherics/pipe/simple/visible/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 }, -/turf/simulated/floor/airless, +/turf/simulated/wall/shuttle/space_ship/mercenary, /area/shuttle/kataphract_shuttle/main_compartment) "CL" = ( /obj/structure/toilet{ @@ -5376,10 +5385,6 @@ /obj/machinery/light, /turf/simulated/floor/wood, /area/kataphract_chapter/mess) -"Dl" = ( -/obj/machinery/atmospherics/pipe/simple/visible/fuel, -/turf/simulated/wall/shuttle/space_ship/mercenary, -/area/shuttle/kataphract_shuttle/main_compartment) "Dx" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -5407,18 +5412,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/tiled/white, /area/kataphract_chapter/medical) -"DQ" = ( -/obj/machinery/light/small/emergency{ - dir = 8 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/effect/map_effect/marker_helper/airlock/out, -/turf/simulated/floor/plating, -/area/shuttle/kataphract_shuttle/main_compartment) "DT" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -5728,6 +5721,18 @@ }, /turf/simulated/floor/tiled, /area/kataphract_chapter/main_ring) +"GK" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/map_effect/marker_helper/airlock/out, +/turf/simulated/floor/plating, +/area/shuttle/kataphract_shuttle/main_compartment) "GS" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 7 @@ -6522,6 +6527,24 @@ }, /turf/simulated/floor/wood, /area/kataphract_chapter/mess) +"Pk" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + pixel_y = 6; + pixel_x = 20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = -6 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/kataphract_shuttle/main_compartment) "Pr" = ( /obj/structure/reagent_dispensers/keg/xuizikeg, /obj/machinery/light{ @@ -7396,24 +7419,6 @@ }, /turf/simulated/floor/wood, /area/kataphract_chapter/office) -"Yz" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 8; - pixel_y = 6; - pixel_x = 20 - }, -/obj/machinery/airlock_sensor{ - pixel_x = 20; - dir = 8; - pixel_y = -6 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/kataphract_shuttle/main_compartment) "YP" = ( /obj/structure/table/standard, /obj/structure/closet/walllocker/medical/secure{ @@ -35798,7 +35803,7 @@ Bi Bi fd RO -CH +sx iB lo lo @@ -36047,9 +36052,9 @@ dk dL ZX eE -xE +vF fC -tP +CH eD iB lo @@ -36301,7 +36306,7 @@ JZ cl Tb Mh -DQ +GK Bi lo lo @@ -36805,7 +36810,7 @@ lQ cl cQ gA -Yz +Pk Bi lo lo @@ -37057,7 +37062,7 @@ Bv cl lB fD -Dl +wU eD iB lo From 05c505af12ed93dbc4c81be5149e2d3b8a8b1497 Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Mon, 6 May 2024 13:18:55 -0600 Subject: [PATCH 05/12] elyra and hegemony corvette stuff --- .../elyra/elyra_corvette/elyra_corvette.dmm | 27 ++++++++++++++++--- .../hegemony_corvette/hegemony_corvette.dmm | 14 +++++++--- .../ships/kataphracts/kataphract_ship.dmm | 24 +++++++++++++++-- 3 files changed, 57 insertions(+), 8 deletions(-) diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm index 3a3ee0d055b..f8b479e0357 100644 --- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm +++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm @@ -7312,11 +7312,32 @@ "OV" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/tank/jetpack/carbondioxide, +/obj/machinery/light/colored/decayed, +/obj/item/device/gps, +/obj/item/device/gps, +/obj/item/device/gps, +/obj/item/device/gps, +/obj/item/device/gps, +/obj/item/device/gps, +/obj/item/device/gps, +/obj/item/clothing/accessory/flagpatch/elyra, +/obj/item/clothing/accessory/flagpatch/elyra, +/obj/item/clothing/accessory/flagpatch/elyra, +/obj/item/clothing/accessory/flagpatch/elyra, +/obj/item/clothing/accessory/flagpatch/elyra, /obj/item/clothing/accessory/flagpatch/elyra, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, -/obj/item/device/gps, -/obj/machinery/light/colored/decayed, /turf/simulated/floor/tiled/dark/full, /area/ship/elyran_corvette/briefing) "OY" = ( diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm index d5b2dbd7db8..2f9296dc879 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm @@ -1083,7 +1083,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, /obj/machinery/door/airlock/external{ @@ -3148,7 +3148,7 @@ /obj/effect/landmark/entry_point/starboard{ name = "starboard, airlock" }, -/obj/machinery/atmospherics/pipe/manifold/visible/red{ +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 8 }, /obj/machinery/door/airlock/external{ @@ -4097,6 +4097,9 @@ shuttle_tag = "Hegemony Shuttle" }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/plating, /area/shuttle/hegemony) "xL" = ( @@ -6118,7 +6121,7 @@ /turf/simulated/floor/plating, /area/shuttle/hegemony) "Jb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/wall/shuttle/space_ship/mercenary, /area/shuttle/hegemony) "Je" = ( @@ -6963,6 +6966,9 @@ master_tag = "airlock_hegemony_generic" }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/hegemony_ship) "Ni" = ( @@ -8879,6 +8885,8 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/item/clothing/suit/armor/unathi/klax, +/obj/item/clothing/head/helmet/unathi/klax, /turf/simulated/floor/plating, /area/hegemony_ship/eva_storage) "YK" = ( diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index dae109c11d4..a8cb374a6de 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -1277,6 +1277,9 @@ /area/shuttle/kataphract_shuttle/main_compartment) "eE" = ( /obj/structure/extinguisher_cabinet/west, +/obj/structure/bed/stool/chair/shuttle{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/shuttle/kataphract_shuttle/main_compartment) "eF" = ( @@ -2689,10 +2692,10 @@ "kf" = ( /obj/structure/table/standard, /obj/item/reagent_containers/glass/bottle/inaprovaline, -/obj/item/reagent_containers/hypospray, /obj/item/storage/belt/medical/first_responder, /obj/item/storage/belt/medical, /obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/glass/bottle/inaprovaline, /obj/effect/floor_decal/corner/green{ dir = 5 @@ -5731,6 +5734,9 @@ dir = 1 }, /obj/effect/map_effect/marker_helper/airlock/out, +/obj/structure/bed/handrail{ + dir = 4 + }, /turf/simulated/floor/plating, /area/shuttle/kataphract_shuttle/main_compartment) "GS" = ( @@ -6543,6 +6549,9 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 8 }, +/obj/structure/bed/handrail{ + dir = 8 + }, /turf/simulated/floor/plating, /area/shuttle/kataphract_shuttle/main_compartment) "Pr" = ( @@ -6862,6 +6871,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/bed/handrail{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/kataphract_chapter/medical) "St" = ( @@ -6942,6 +6954,12 @@ }, /turf/simulated/floor/tiled, /area/kataphract_chapter/sparring_chamber) +"SU" = ( +/obj/structure/bed/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/kataphract_shuttle/main_compartment) "SV" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 4 @@ -7437,6 +7455,8 @@ /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/effect/floor_decal/corner/green/full, +/obj/item/reagent_containers/inhaler/pneumalin, +/obj/item/reagent_containers/inhaler/pneumalin, /turf/simulated/floor/tiled/white{ temperature = 278.15 }, @@ -37059,7 +37079,7 @@ dN dN dN Bv -cl +SU lB fD wU From caf99f9021796e194b588346f68823a6a7b03c4f Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Mon, 6 May 2024 14:21:54 -0600 Subject: [PATCH 06/12] area fix, dpra soul --- .../overgrown_mining_station.dmm | 5 +- .../ships/dpra/hailstorm/hailstorm_ship.dmm | 714 +++++++++++++----- .../ships/kataphracts/kataphract_ship.dmm | 17 +- 3 files changed, 532 insertions(+), 204 deletions(-) diff --git a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm index 3761316db4d..8df9cfaf81f 100644 --- a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm +++ b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm @@ -25,7 +25,8 @@ /area/overgrown_mining_station) "ae" = ( /turf/simulated/floor/tiled/asteroid/airless, -/turf/unsimulated/floor/asteroid/ash) +/turf/unsimulated/floor/asteroid/ash, +/area/overgrown_mining_station) "af" = ( /obj/machinery/door/airlock/mining{ dir = 1 @@ -39735,7 +39736,7 @@ SZ SZ SZ gV -SZ +gV gV gV gV diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm index c4c0e19fc63..cf56b4c97b8 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm @@ -17,6 +17,9 @@ /obj/item/ship_ammunition/francisca/frag{ pixel_y = 4 }, +/obj/machinery/door/window/brigdoor/southright{ + req_access = list(214) + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -36,6 +39,9 @@ /obj/item/ship_ammunition/francisca/frag{ pixel_y = 4 }, +/obj/machinery/door/window/brigdoor/southright{ + req_access = list(214) + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -59,6 +65,9 @@ /obj/item/ship_ammunition/francisca/frag{ pixel_y = 4 }, +/obj/machinery/door/window/brigdoor/southright{ + req_access = list(214) + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -81,6 +90,9 @@ /obj/item/ship_ammunition/francisca/frag{ pixel_y = 4 }, +/obj/machinery/door/window/brigdoor/southright{ + req_access = list(214) + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -100,6 +112,9 @@ /obj/item/ship_ammunition/francisca/frag{ pixel_y = 4 }, +/obj/machinery/door/window/brigdoor/southright{ + req_access = list(214) + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -123,6 +138,9 @@ /obj/item/ship_ammunition/francisca/frag{ pixel_y = 4 }, +/obj/machinery/door/window/brigdoor/southright{ + req_access = list(214) + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -176,6 +194,19 @@ temperature = 278.15 }, /area/hailstorm_ship/engineering) +"aw" = ( +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship) "ax" = ( /obj/machinery/door/airlock/command{ req_access = list(214); @@ -187,10 +218,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship/bridge) @@ -217,6 +249,7 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/dpra{ pixel_x = -6 }, +/obj/item/trash/plate, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -229,7 +262,7 @@ }, /area/hailstorm_ship/eva) "aH" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/emergency{ dir = 1 }, /obj/vehicle/bike/wasp_torpedo, @@ -244,6 +277,7 @@ dir = 1 }, /obj/item/device/flashlight/lamp, +/obj/item/trash/proteinbar, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -257,6 +291,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -314,6 +355,12 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck/second) +"bm" = ( +/obj/machinery/computer/ship/engines/terminal, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "bq" = ( /obj/machinery/atmospherics/unary/engine, /turf/simulated/floor/airless, @@ -358,7 +405,9 @@ /area/hailstorm_ship/eva) "bA" = ( /obj/structure/window/reinforced, -/turf/simulated/floor/tiled{ +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship) @@ -390,7 +439,7 @@ /obj/item/reagent_containers/glass/bucket{ pixel_y = 10 }, -/obj/machinery/light, +/obj/machinery/light/small/emergency, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -415,14 +464,17 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship/eva) @@ -450,14 +502,17 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship/engineering) @@ -467,10 +522,24 @@ icon_state = "0-4" }, /obj/machinery/power/smes/buildable/horizon_shuttle, +/obj/machinery/light/small/emergency{ + dir = 1 + }, /turf/simulated/floor/plating{ temperature = 278.15 }, /area/hailstorm_ship/atmospherics) +"bZ" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + dir = 4 + }, +/obj/effect/map_effect/marker/large_tank{ + name = "hailstorm_co2_star"; + master_tag = "hailstorm_co2_star" + }, +/obj/random/dirt_75, +/turf/simulated/floor/reinforced/carbon_dioxide, +/area/hailstorm_ship/engine) "ca" = ( /obj/structure/reagent_dispensers/keg/mead, /obj/effect/floor_decal/corner/white{ @@ -549,6 +618,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -620,14 +690,17 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship/barracks) @@ -654,14 +727,17 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship/crew) @@ -743,6 +819,7 @@ dir = 8 }, /obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/hailstorm_ship/engine) "dE" = ( @@ -756,10 +833,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship/gun_deck) @@ -780,8 +858,24 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/atmospherics) +"dR" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/item/trash/cigbutt, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship/gun_deck) "dV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 @@ -820,7 +914,9 @@ }, /area/hailstorm_ship/armory) "ey" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1 + }, /obj/machinery/door/blast/regular/open{ dir = 8; id = "hailstorm_bridge" @@ -879,6 +975,10 @@ dir = 4; status = 2 }, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 8 + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -920,6 +1020,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -968,10 +1069,15 @@ /turf/simulated/floor/reinforced/airless, /area/hailstorm_ship/gun_deck/second) "ft" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1 + }, /obj/effect/landmark/entry_point/starboard{ name = "starboard, crew section" }, +/obj/machinery/door/blast/regular/open{ + id = "hailstorm_crew" + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -1067,7 +1173,9 @@ /obj/machinery/pipedispenser, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/engineering) "gw" = ( /obj/structure/cable/green{ @@ -1139,13 +1247,16 @@ }, /area/shuttle/hailstorm_shuttle) "hd" = ( -/obj/machinery/atmospherics/binary/pump/high_power{ - dir = 8 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plating{ +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ temperature = 278.15 }, -/area/hailstorm_ship/engine) +/area/hailstorm_ship/gun_deck/second) "hE" = ( /obj/structure/cable/green{ d2 = 4; @@ -1158,6 +1269,7 @@ dir = 6; pixel_y = 0 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -1215,7 +1327,9 @@ }, /area/hailstorm_ship/gun_deck/second) "ig" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1 + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -1359,6 +1473,8 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -1408,13 +1524,8 @@ }, /area/hailstorm_ship/gun_deck) "jB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 5 - }, -/obj/machinery/meter, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/obj/machinery/atmospherics/pipe/manifold/visible/fuel, +/turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/engine) "jE" = ( /obj/structure/lattice/catwalk/indoor, @@ -1424,13 +1535,11 @@ /turf/simulated/floor/airless, /area/shuttle/hailstorm_shuttle) "jG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 10 - }, +/obj/random/dirt_75, /turf/simulated/floor/plating{ temperature = 278.15 }, -/area/hailstorm_ship/engine) +/area/hailstorm_ship/engineering) "jJ" = ( /obj/effect/floor_decal/industrial/outline/security, /obj/structure/closet/secure_closet/guncabinet{ @@ -1479,7 +1588,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -1513,6 +1624,13 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) +"kk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black, +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/shuttle/hailstorm_shuttle) "kr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 @@ -1533,12 +1651,25 @@ d2 = 2; icon_state = "1-2" }, +/obj/random/dirt_75, +/obj/machinery/button/remote/blast_door{ + id = "hailstorm_crew"; + name = "Crew Compartment Blastdoor"; + req_access = list(214); + pixel_x = 21; + dir = 4 + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, /area/hailstorm_ship/crew) "kz" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1 + }, +/obj/machinery/door/blast/regular/open{ + id = "hailstorm_crew" + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -1557,7 +1688,7 @@ "kI" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light, +/obj/machinery/light/small/emergency, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -1606,8 +1737,9 @@ }, /area/hailstorm_ship) "lj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 6 +/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -1628,6 +1760,19 @@ temperature = 278.15 }, /area/hailstorm_ship/bridge) +"ll" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship) "lJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black, /obj/structure/cable/green{ @@ -1762,7 +1907,9 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, /obj/effect/shuttle_landmark/hailstorm_ship/dock/aft, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/engine) "mO" = ( /obj/structure/window/reinforced{ @@ -1777,7 +1924,9 @@ /obj/effect/shuttle_landmark/hailstorm_shuttle/hangar{ dir = 8 }, -/turf/simulated/floor/tiled{ +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship) @@ -1807,12 +1956,10 @@ }, /area/hailstorm_ship/engineering) "nx" = ( -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 4 - }, /obj/structure/sign/painting_frame/nated{ pixel_y = -32 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -1840,7 +1987,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/small/emergency, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -1881,6 +2028,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -1895,6 +2043,7 @@ d2 = 8; icon_state = "1-8" }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -1910,14 +2059,17 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship/atmospherics) @@ -2020,6 +2172,10 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck/second) +"pE" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/hailstorm_ship/atmospherics) "pM" = ( /obj/structure/sign/flag/dpra/large/north, /turf/simulated/wall/shuttle/space_ship/mercenary, @@ -2053,13 +2209,10 @@ }, /area/hailstorm_ship/gun_deck/second) "qy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 6 - }, -/obj/machinery/meter, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 9 }, +/turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/engine) "qE" = ( /obj/effect/floor_decal/industrial/warning/cee, @@ -2198,6 +2351,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -2208,6 +2362,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/random/dirt_75, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2251,6 +2406,20 @@ temperature = 278.15 }, /area/hailstorm_ship/armory) +"td" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 9 + }, +/obj/machinery/vending/wallmed1{ + name = "Medical Supplies"; + pixel_x = 26; + pixel_y = -1; + req_access = null + }, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/shuttle/hailstorm_shuttle) "tv" = ( /obj/structure/cable/green{ d1 = 1; @@ -2266,12 +2435,16 @@ /obj/item/stack/material/tritium/full, /obj/item/stack/material/tritium/full, /obj/item/stack/material/tritium/full, +/obj/effect/decal/cleanable/greenglow, /turf/simulated/floor/plating{ temperature = 278.15 }, /area/hailstorm_ship/atmospherics) "tC" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/emergency, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2298,6 +2471,14 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) +"um" = ( +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 8 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "ux" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10; @@ -2325,6 +2506,7 @@ /obj/machinery/power/apc/high/east{ req_access = list(214) }, +/obj/effect/decal/cleanable/blood/drip/oil, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -2344,7 +2526,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock{ req_access = list(214); name = "Engine"; @@ -2352,6 +2534,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2373,7 +2556,11 @@ }, /area/hailstorm_ship) "vJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/black{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/meter{ + name = "Fuel Line Meter" + }, +/obj/machinery/light/small/emergency{ dir = 8 }, /turf/simulated/floor/plating{ @@ -2381,13 +2568,19 @@ }, /area/hailstorm_ship/engine) "vU" = ( -/obj/machinery/atmospherics/binary/pump/high_power{ +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating{ +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ temperature = 278.15 }, -/area/hailstorm_ship/engine) +/area/hailstorm_ship/gun_deck) "vY" = ( /obj/effect/map_effect/map_helper/ruler_tiles_3, /turf/template_noop, @@ -2406,6 +2599,7 @@ dir = 4 }, /obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/hailstorm_ship/engine) "wm" = ( @@ -2415,7 +2609,9 @@ dir = 10; pixel_y = 0 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/engineering) "wt" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -2432,12 +2628,16 @@ req_access = list(214) }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, +/obj/item/storage/belt/utility, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/atmospherics) "wz" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/emergency{ dir = 8 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -2501,6 +2701,13 @@ temperature = 278.15 }, /area/hailstorm_ship) +"xI" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/obj/random/dirt_75, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "xQ" = ( /obj/structure/cable/green{ d1 = 2; @@ -2514,6 +2721,7 @@ dir = 10; pixel_y = 0 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -2555,6 +2763,14 @@ temperature = 278.15 }, /area/hailstorm_ship/atmospherics) +"yC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/blood/drip/oil, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/shuttle/hailstorm_shuttle) "yD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -2622,19 +2838,27 @@ temperature = 278.15 }, /area/hailstorm_ship) +"zP" = ( +/obj/machinery/atmospherics/binary/pump/fuel/on{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "zV" = ( /obj/effect/floor_decal/corner/white{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/closet/walllocker/emerglocker/west, +/obj/item/crowbar/red, /turf/simulated/floor/tiled{ temperature = 278.15 }, /area/hailstorm_ship/barracks) "Ap" = ( -/obj/structure/closet/walllocker/emerglocker/west{ - pixel_x = 32 - }, /obj/machinery/power/smes/buildable/third_party_shuttle, /obj/structure/cable/green{ d2 = 2; @@ -2645,20 +2869,22 @@ }, /area/shuttle/hailstorm_shuttle) "Ax" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 10 - }, -/obj/machinery/meter, -/turf/simulated/floor/plating{ - temperature = 278.15 +/turf/simulated/wall, +/area/hailstorm_ship/engine) +"AK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 5 }, +/turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/engine) "AP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 5 +/obj/machinery/computer/general_air_control/large_tank_control/terminal{ + dir = 4; + name = "Carbon Dioxide Supply Monitor" }, -/obj/machinery/computer/ship/engines/terminal{ - dir = 4 +/obj/effect/map_effect/marker/large_tank{ + name = "hailstorm_co2_star"; + master_tag = "hailstorm_co2_star" }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -2702,7 +2928,8 @@ }, /area/hailstorm_ship/atmospherics) "CC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2766,16 +2993,18 @@ }, /area/hailstorm_ship) "DD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/black{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ + dir = 8; + frequency = 1441 }, -/obj/machinery/light/small{ - brightness_color = "#FA8282"; - dir = 4 +/obj/machinery/air_sensor{ + pixel_y = -16 }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/effect/map_effect/marker/large_tank{ + name = "hailstorm_co2_port"; + master_tag = "hailstorm_co2_port" }, +/turf/simulated/floor/reinforced/carbon_dioxide, /area/hailstorm_ship/engine) "DF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2797,6 +3026,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/random/dirt_75, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2841,7 +3071,8 @@ dir = 4 }, /obj/effect/map_effect/marker/airlock/docking/hailstorm_shuttle/shuttle_hangar, -/turf/simulated/floor/tiled{ +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship) @@ -2931,7 +3162,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/small/emergency, +/obj/random/dirt_75, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2952,7 +3184,9 @@ }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/engine) "Fx" = ( /obj/structure/ship_weapon_dummy, @@ -2973,10 +3207,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship) @@ -3008,6 +3243,14 @@ }, /turf/simulated/floor/reinforced/airless, /area/hailstorm_ship/gun_deck/second) +"Gj" = ( +/obj/machinery/atmospherics/binary/pump/fuel/on{ + dir = 4 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "Gk" = ( /obj/machinery/shipsensors/weak, /obj/structure/railing/mapped{ @@ -3018,7 +3261,7 @@ /turf/simulated/floor/airless, /area/shuttle/hailstorm_shuttle) "Gu" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/emergency, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3051,24 +3294,11 @@ }, /area/hailstorm_ship) "GS" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/vending/wallmed1{ - name = "Medical Supplies"; - pixel_x = 26; - pixel_y = -1; - req_access = null - }, -/turf/simulated/floor/tiled{ +/obj/random/dirt_75, +/turf/simulated/floor/plating{ temperature = 278.15 }, -/area/shuttle/hailstorm_shuttle) +/area/hailstorm_ship/engine) "GV" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -3096,6 +3326,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -3125,15 +3356,14 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/shuttle/hailstorm_shuttle) "Hx" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide{ - start_pressure = 8000.63 +/obj/machinery/atmospherics/unary/outlet_injector{ + dir = 8 }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/effect/map_effect/marker/large_tank{ + name = "hailstorm_co2_port"; + master_tag = "hailstorm_co2_port" }, +/turf/simulated/floor/reinforced/carbon_dioxide, /area/hailstorm_ship/engine) "HY" = ( /obj/effect/floor_decal/corner/black/full{ @@ -3188,6 +3418,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/item/trash/broken_electronics, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -3212,6 +3443,7 @@ dir = 6 }, /obj/machinery/firealarm/east, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -3231,6 +3463,15 @@ temperature = 278.15 }, /area/hailstorm_ship/barracks) +"Ja" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/item/trash/can/adhomian_can, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "Jp" = ( /obj/structure/cable/green{ d1 = 1; @@ -3300,6 +3541,7 @@ dir = 4 }, /obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/hailstorm_ship/engine) "Kd" = ( @@ -3408,6 +3650,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/storage/firstaid/adv, +/obj/item/storage/belt/medical/first_responder, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -3425,17 +3669,28 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck) -"Nb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/black{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 8 +"MK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 }, /turf/simulated/floor/plating{ temperature = 278.15 }, /area/hailstorm_ship/engine) +"Nb" = ( +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ + dir = 4 + }, +/obj/machinery/air_sensor{ + pixel_y = -16 + }, +/obj/effect/map_effect/marker/large_tank{ + name = "hailstorm_co2_star"; + master_tag = "hailstorm_co2_star" + }, +/obj/random/dirt_75, +/turf/simulated/floor/reinforced/carbon_dioxide, +/area/hailstorm_ship/engine) "Ni" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -3472,16 +3727,19 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, /area/hailstorm_ship) "NC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 9 +/obj/machinery/computer/general_air_control/large_tank_control/terminal{ + dir = 8; + name = "Carbon Dioxide Supply Monitor" }, -/obj/machinery/computer/ship/engines/terminal{ - dir = 8 +/obj/effect/map_effect/marker/large_tank{ + name = "hailstorm_co2_port"; + master_tag = "hailstorm_co2_port" }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -3498,10 +3756,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/noid, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship/gun_deck/second) @@ -3627,6 +3886,9 @@ dir = 4; status = 2 }, +/obj/structure/closet/walllocker/emerglocker/west{ + pixel_x = 32 + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -3649,7 +3911,9 @@ pixel_y = -10 }, /obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/engine) "PJ" = ( /obj/structure/table/rack, @@ -3668,10 +3932,24 @@ }, /area/hailstorm_ship/gun_deck) "PT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 9 +/obj/machinery/atmospherics/binary/pump/fuel/on{ + dir = 1 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) +"QA" = ( +/obj/machinery/light/small/emergency, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) +"QC" = ( +/obj/machinery/light/small/emergency, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 8 }, -/obj/machinery/meter, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -3725,7 +4003,9 @@ }, /area/hailstorm_ship/barracks) "Ry" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black, +/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ + dir = 8 + }, /turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/engine) "RA" = ( @@ -3765,6 +4045,12 @@ temperature = 278.15 }, /area/shuttle/hailstorm_shuttle) +"Ss" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship/eva) "Sv" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -3780,6 +4066,7 @@ dir = 8 }, /obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/hailstorm_ship/engine) "SK" = ( @@ -3787,10 +4074,24 @@ dir = 4; status = 2 }, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 8 + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, /area/hailstorm_ship/gun_deck/second) +"Ti" = ( +/obj/machinery/suit_cycler/offship/dpra, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship/eva) "Tq" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/tiled{ @@ -3798,11 +4099,25 @@ }, /area/shuttle/hailstorm_shuttle) "Tt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/black, -/turf/simulated/floor/plating{ +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ temperature = 278.15 }, -/area/hailstorm_ship/engine) +/area/hailstorm_ship) "Tu" = ( /turf/simulated/floor/tiled{ temperature = 278.15 @@ -3837,6 +4152,12 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) +"TT" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "Uh" = ( /obj/machinery/atmospherics/unary/engine, /obj/effect/landmark/entry_point/aft{ @@ -3852,7 +4173,8 @@ dir = 4 }, /obj/effect/map_effect/marker/airlock/docking/hailstorm_shuttle/shuttle_hangar, -/turf/simulated/floor/tiled{ +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full{ temperature = 278.15 }, /area/hailstorm_ship) @@ -3900,15 +4222,14 @@ dir = 4 }, /obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/hailstorm_ship/engine) "Vj" = ( -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 4 - }, /obj/structure/sign/painting_frame/nated{ pixel_y = -32 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -4074,7 +4395,9 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/engine) "WZ" = ( /obj/machinery/hologram/holopad/long_range, @@ -4085,12 +4408,10 @@ }, /area/hailstorm_ship) "Xk" = ( -/obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ - dir = 1 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ + dir = 4 }, +/turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/engine) "Xm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -4102,6 +4423,7 @@ req_access = list(214); pixel_y = 27 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -4130,7 +4452,9 @@ }, /area/hailstorm_ship/bridge) "XH" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1 + }, /obj/machinery/door/blast/regular/open{ dir = 8; id = "hailstorm_bridge" @@ -4210,7 +4534,9 @@ }, /area/hailstorm_ship) "ZQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/black{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/light/small/emergency{ dir = 4 }, /turf/simulated/floor/plating{ @@ -13821,11 +14147,11 @@ iB iB vY Hs -Ry +AK AP -qy +Ax Nb -Hx +bZ WG WG WG @@ -13983,11 +14309,11 @@ iB iB iB Uh -Ry -Tt -vU -jG -Xk +jB +cr +Ax +lj +lj WG av fK @@ -14145,11 +14471,11 @@ iB iB iB Hs -Ry +Xk ZQ PT -cr -cr +xI +zP WG EC mg @@ -14173,7 +14499,7 @@ Zj iT fQ ab -MH +dR ny qm lT @@ -14310,8 +14636,8 @@ in in in in -in -tC +Gj +QC WG fv Hm @@ -14471,12 +14797,12 @@ in in UW in -cr -cr +Ja +um cr WG VO -Hm +jG Jt Hm Pv @@ -14484,7 +14810,7 @@ bX VR Pv aF -Tu +Ss kI rH lZ @@ -14497,7 +14823,7 @@ oF ca fQ du -MH +vU UD eV rp @@ -14638,14 +14964,14 @@ EV cr WG la -Hm +jG rq Hm Pv dJ yx Pv -aF +Ti ai kA rH @@ -15120,8 +15446,8 @@ iB iB in in -in -tC +GS +QA WG WG bV @@ -15130,7 +15456,7 @@ WG Pv Pv oh -Pv +pE DS bR DS @@ -15281,8 +15607,8 @@ iB iB iB iB -iB in +TT cr Oa iU @@ -15301,7 +15627,7 @@ dk ph am Oa -Dx +Tt ZG sn sg @@ -15443,23 +15769,23 @@ iB iB iB iB -iB in +cr YA vA cw Ns Er -Er +ll yF Er Jp TD Er YG -Er +ll li -Er +ll YG GR FC @@ -15605,8 +15931,8 @@ vY iB iB iB -iB in +cr iK Oa fm @@ -15617,7 +15943,7 @@ zJ Wx Wx aN -Wx +aw Wx Wx Wd @@ -15768,7 +16094,7 @@ iB iB in in -in +GS Gu Oa Oa @@ -15929,7 +16255,7 @@ iB in in in -in +bm cr Xx in @@ -16092,7 +16418,7 @@ in cr cr cW -cr +GS Xx in iB @@ -16578,7 +16904,7 @@ in in in in -in +cr tC in iB @@ -16603,7 +16929,7 @@ DF QW CR ad -pC +hd cd FX Fx @@ -16739,9 +17065,9 @@ iB Hs Ry vJ -jB -cr -cr +PT +MK +Gj in iB Vw @@ -16899,11 +17225,11 @@ iB iB iB qV -Ry -Tt -hd +jB +cr +Ax +lj lj -Xk in iB zd @@ -17061,7 +17387,7 @@ iB iB iB Hs -Ry +qy NC Ax DD @@ -17072,7 +17398,7 @@ Vw Vw Vw Xm -La +yC La lJ Hi @@ -17237,7 +17563,7 @@ wQ ch tv og -La +kk Ig rx Vw @@ -17394,12 +17720,12 @@ iB iB bq Hu -wQ +td Pb Ap oq rA -GS +oq ce Uy Vw diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index a8cb374a6de..c9c117de0ee 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -4238,7 +4238,8 @@ dir = 1; pixel_y = -21; name = "Kataphract Shuttle docking port controller"; - docking_controller = "kataphract_dock" + docking_controller = "kataphract_dock"; + frequency = 1380 }, /turf/simulated/floor/tiled, /area/kataphract_chapter/hangar) @@ -4788,6 +4789,12 @@ }, /turf/simulated/floor/tiled, /area/kataphract_chapter/atmospherics) +"wR" = ( +/obj/structure/bed/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/kataphract_shuttle/main_compartment) "wT" = ( /obj/structure/table/reinforced/steel, /obj/item/folder/red, @@ -6954,12 +6961,6 @@ }, /turf/simulated/floor/tiled, /area/kataphract_chapter/sparring_chamber) -"SU" = ( -/obj/structure/bed/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/shuttle/kataphract_shuttle/main_compartment) "SV" = ( /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 4 @@ -37079,7 +37080,7 @@ dN dN dN Bv -SU +wR lB fD wU From d8ed52aff21068ebe08ae29e21f7166b2cc1c5f9 Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Mon, 6 May 2024 14:36:40 -0600 Subject: [PATCH 07/12] hailstorm stuff 2 --- .../overgrown_mining_station.dmm | 6 +- .../ships/dpra/hailstorm/hailstorm_ship.dmm | 594 +++++++++--------- 2 files changed, 303 insertions(+), 297 deletions(-) diff --git a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm index 8df9cfaf81f..b33949c1f0b 100644 --- a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm +++ b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm @@ -23,10 +23,6 @@ }, /turf/simulated/floor/wood/airless, /area/overgrown_mining_station) -"ae" = ( -/turf/simulated/floor/tiled/asteroid/airless, -/turf/unsimulated/floor/asteroid/ash, -/area/overgrown_mining_station) "af" = ( /obj/machinery/door/airlock/mining{ dir = 1 @@ -30957,7 +30953,7 @@ xu KS RC RC -ae +RC RC SZ RC diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm index cf56b4c97b8..b8e32eb4bc7 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm @@ -194,19 +194,6 @@ temperature = 278.15 }, /area/hailstorm_ship/engineering) -"aw" = ( -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/obj/random/dirt_75, -/obj/effect/floor_decal/industrial/outline_door/red{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline_straight/red, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/hailstorm_ship) "ax" = ( /obj/machinery/door/airlock/command{ req_access = list(214); @@ -355,12 +342,6 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck/second) -"bm" = ( -/obj/machinery/computer/ship/engines/terminal, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/hailstorm_ship/engine) "bq" = ( /obj/machinery/atmospherics/unary/engine, /turf/simulated/floor/airless, @@ -383,6 +364,19 @@ temperature = 278.15 }, /area/shuttle/hailstorm_shuttle) +"bw" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship) "bx" = ( /obj/item/device/radio, /obj/item/device/radio, @@ -529,17 +523,6 @@ temperature = 278.15 }, /area/hailstorm_ship/atmospherics) -"bZ" = ( -/obj/machinery/atmospherics/unary/outlet_injector{ - dir = 4 - }, -/obj/effect/map_effect/marker/large_tank{ - name = "hailstorm_co2_star"; - master_tag = "hailstorm_co2_star" - }, -/obj/random/dirt_75, -/turf/simulated/floor/reinforced/carbon_dioxide, -/area/hailstorm_ship/engine) "ca" = ( /obj/structure/reagent_dispensers/keg/mead, /obj/effect/floor_decal/corner/white{ @@ -636,6 +619,15 @@ temperature = 278.15 }, /area/shuttle/hailstorm_shuttle) +"cp" = ( +/obj/machinery/atmospherics/binary/pump/fuel/on{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "cr" = ( /turf/simulated/floor/plating{ temperature = 278.15 @@ -822,6 +814,12 @@ /obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/hailstorm_ship/engine) +"dC" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ + dir = 4 + }, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/hailstorm_ship/engine) "dE" = ( /obj/machinery/door/airlock/security{ name = "Gun Deck"; @@ -862,20 +860,6 @@ temperature = 278.15 }, /area/hailstorm_ship/atmospherics) -"dR" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/item/trash/cigbutt, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/hailstorm_ship/gun_deck) "dV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 @@ -901,6 +885,12 @@ temperature = 278.15 }, /area/hailstorm_ship/bridge) +"es" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 5 + }, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/hailstorm_ship/engine) "ex" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = list(214); @@ -1090,6 +1080,20 @@ temperature = 278.15 }, /area/hailstorm_ship/engineering) +"fy" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/item/trash/cigbutt, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship/gun_deck) "fC" = ( /obj/structure/table/standard, /obj/machinery/button/distress{ @@ -1129,6 +1133,20 @@ temperature = 278.15 }, /area/hailstorm_ship) +"fG" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship/gun_deck) "fH" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms"; @@ -1169,6 +1187,19 @@ temperature = 278.15 }, /area/hailstorm_ship/engineering) +"gl" = ( +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship) "gq" = ( /obj/machinery/pipedispenser, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -1247,16 +1278,11 @@ }, /area/shuttle/hailstorm_shuttle) "hd" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 9 }, -/area/hailstorm_ship/gun_deck/second) +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/hailstorm_ship/engine) "hE" = ( /obj/structure/cable/green{ d2 = 4; @@ -1417,6 +1443,20 @@ temperature = 278.15 }, /area/hailstorm_ship/engine) +"iL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 9 + }, +/obj/machinery/vending/wallmed1{ + name = "Medical Supplies"; + pixel_x = 26; + pixel_y = -1; + req_access = null + }, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/shuttle/hailstorm_shuttle) "iT" = ( /obj/structure/closet/cabinet, /obj/item/storage/box/drinkingglasses, @@ -1524,8 +1564,12 @@ }, /area/hailstorm_ship/gun_deck) "jB" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/fuel, -/turf/simulated/wall/shuttle/space_ship/mercenary, +/obj/machinery/atmospherics/binary/pump/fuel/on{ + dir = 1 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/engine) "jE" = ( /obj/structure/lattice/catwalk/indoor, @@ -1535,11 +1579,12 @@ /turf/simulated/floor/airless, /area/shuttle/hailstorm_shuttle) "jG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/random/dirt_75, -/turf/simulated/floor/plating{ +/turf/simulated/floor/tiled{ temperature = 278.15 }, -/area/hailstorm_ship/engineering) +/area/shuttle/hailstorm_shuttle) "jJ" = ( /obj/effect/floor_decal/industrial/outline/security, /obj/structure/closet/secure_closet/guncabinet{ @@ -1624,13 +1669,6 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) -"kk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/random/dirt_75, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/shuttle/hailstorm_shuttle) "kr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 @@ -1737,14 +1775,11 @@ }, /area/hailstorm_ship) "lj" = ( -/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 - }, +/obj/random/dirt_75, /turf/simulated/floor/plating{ temperature = 278.15 }, -/area/hailstorm_ship/engine) +/area/hailstorm_ship/engineering) "lk" = ( /obj/machinery/alarm/cold/north{ req_one_access = list(214) @@ -1760,19 +1795,6 @@ temperature = 278.15 }, /area/hailstorm_ship/bridge) -"ll" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/random/dirt_75, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/hailstorm_ship) "lJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black, /obj/structure/cable/green{ @@ -1807,6 +1829,12 @@ /obj/machinery/alarm/cold/east{ req_one_access = list(214) }, +/obj/item/clothing/accessory/holster/hip, +/obj/item/clothing/accessory/holster/hip, +/obj/item/clothing/accessory/holster/hip, +/obj/item/clothing/accessory/holster, +/obj/item/clothing/accessory/holster, +/obj/item/clothing/accessory/holster, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -1860,6 +1888,15 @@ /obj/effect/shuttle_landmark/nav_hailstorm_ship/nav4, /turf/template_noop, /area/space) +"mz" = ( +/obj/machinery/light/small/emergency, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "mD" = ( /obj/structure/cable/green{ d1 = 1; @@ -2172,10 +2209,6 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck/second) -"pE" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/wall/shuttle/space_ship/mercenary, -/area/hailstorm_ship/atmospherics) "pM" = ( /obj/structure/sign/flag/dpra/large/north, /turf/simulated/wall/shuttle/space_ship/mercenary, @@ -2209,10 +2242,13 @@ }, /area/hailstorm_ship/gun_deck/second) "qy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/fuel{ - dir = 9 +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/item/trash/can/adhomian_can, +/turf/simulated/floor/plating{ + temperature = 278.15 }, -/turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/engine) "qE" = ( /obj/effect/floor_decal/industrial/warning/cee, @@ -2406,20 +2442,6 @@ temperature = 278.15 }, /area/hailstorm_ship/armory) -"td" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 9 - }, -/obj/machinery/vending/wallmed1{ - name = "Medical Supplies"; - pixel_x = 26; - pixel_y = -1; - req_access = null - }, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/shuttle/hailstorm_shuttle) "tv" = ( /obj/structure/cable/green{ d1 = 1; @@ -2443,7 +2465,7 @@ "tC" = ( /obj/machinery/light/small/emergency, /obj/machinery/atmospherics/portables_connector/fuel{ - dir = 4 + dir = 8 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -2471,14 +2493,6 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) -"um" = ( -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/hailstorm_ship/engine) "ux" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10; @@ -2512,7 +2526,9 @@ }, /area/hailstorm_ship/gun_deck/second) "vp" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1 + }, /obj/effect/landmark/entry_point/fore{ name = "fore, bridge" }, @@ -2568,19 +2584,8 @@ }, /area/hailstorm_ship/engine) "vU" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/hailstorm_ship/gun_deck) +/turf/simulated/wall, +/area/hailstorm_ship/engine) "vY" = ( /obj/effect/map_effect/map_helper/ruler_tiles_3, /turf/template_noop, @@ -2701,9 +2706,8 @@ temperature = 278.15 }, /area/hailstorm_ship) -"xI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/obj/random/dirt_75, +"xt" = ( +/obj/effect/decal/cleanable/blood/oil/streak, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2763,14 +2767,6 @@ temperature = 278.15 }, /area/hailstorm_ship/atmospherics) -"yC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/random/dirt_75, -/obj/effect/decal/cleanable/blood/drip/oil, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/shuttle/hailstorm_shuttle) "yD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -2838,15 +2834,6 @@ temperature = 278.15 }, /area/hailstorm_ship) -"zP" = ( -/obj/machinery/atmospherics/binary/pump/fuel/on{ - dir = 8 - }, -/obj/random/dirt_75, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/hailstorm_ship/engine) "zV" = ( /obj/effect/floor_decal/corner/white{ dir = 9 @@ -2869,14 +2856,15 @@ }, /area/shuttle/hailstorm_shuttle) "Ax" = ( -/turf/simulated/wall, -/area/hailstorm_ship/engine) -"AK" = ( -/obj/machinery/atmospherics/pipe/simple/visible/fuel{ - dir = 5 +/obj/machinery/suit_cycler/offship/dpra, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light/small/emergency{ + dir = 1 }, -/turf/simulated/wall/shuttle/space_ship/mercenary, -/area/hailstorm_ship/engine) +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship/eva) "AP" = ( /obj/machinery/computer/general_air_control/large_tank_control/terminal{ dir = 4; @@ -2917,6 +2905,14 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) +"Ci" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "Cy" = ( /obj/structure/cable/green{ d1 = 4; @@ -3139,6 +3135,14 @@ temperature = 278.15 }, /area/hailstorm_ship/engineering) +"ED" = ( +/obj/machinery/atmospherics/binary/pump/fuel/on{ + dir = 4 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "EP" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -3176,6 +3180,14 @@ temperature = 278.15 }, /area/hailstorm_ship/engine) +"Fd" = ( +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 8 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "Fe" = ( /obj/machinery/door/airlock/external, /obj/effect/floor_decal/industrial/hatch/red, @@ -3243,14 +3255,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/hailstorm_ship/gun_deck/second) -"Gj" = ( -/obj/machinery/atmospherics/binary/pump/fuel/on{ - dir = 4 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/hailstorm_ship/engine) "Gk" = ( /obj/machinery/shipsensors/weak, /obj/structure/railing/mapped{ @@ -3357,12 +3361,13 @@ /area/shuttle/hailstorm_shuttle) "Hx" = ( /obj/machinery/atmospherics/unary/outlet_injector{ - dir = 8 + dir = 4 }, /obj/effect/map_effect/marker/large_tank{ - name = "hailstorm_co2_port"; - master_tag = "hailstorm_co2_port" + name = "hailstorm_co2_star"; + master_tag = "hailstorm_co2_star" }, +/obj/random/dirt_75, /turf/simulated/floor/reinforced/carbon_dioxide, /area/hailstorm_ship/engine) "HY" = ( @@ -3463,15 +3468,6 @@ temperature = 278.15 }, /area/hailstorm_ship/barracks) -"Ja" = ( -/obj/machinery/light/small/emergency{ - dir = 8 - }, -/obj/item/trash/can/adhomian_can, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/hailstorm_ship/engine) "Jp" = ( /obj/structure/cable/green{ d1 = 1; @@ -3512,6 +3508,12 @@ temperature = 278.15 }, /area/hailstorm_ship/eva) +"JM" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ + dir = 8 + }, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/hailstorm_ship/engine) "JO" = ( /obj/structure/bed/padded, /obj/item/bedsheet/brown, @@ -3561,6 +3563,12 @@ temperature = 278.15 }, /area/hailstorm_ship/eva) +"Ku" = ( +/obj/machinery/light/small/emergency, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "KP" = ( /obj/structure/cable/green{ d1 = 1; @@ -3669,14 +3677,6 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck) -"MK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/hailstorm_ship/engine) "Nb" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 4 @@ -3691,6 +3691,13 @@ /obj/random/dirt_75, /turf/simulated/floor/reinforced/carbon_dioxide, /area/hailstorm_ship/engine) +"Ng" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/obj/random/dirt_75, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "Ni" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -3745,6 +3752,17 @@ temperature = 278.15 }, /area/hailstorm_ship/engine) +"NL" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship/gun_deck/second) "NM" = ( /obj/machinery/door/airlock/security{ name = "Gun Deck"; @@ -3932,28 +3950,13 @@ }, /area/hailstorm_ship/gun_deck) "PT" = ( -/obj/machinery/atmospherics/binary/pump/fuel/on{ - dir = 1 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/hailstorm_ship/engine) -"QA" = ( -/obj/machinery/light/small/emergency, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/hailstorm_ship/engine) -"QC" = ( -/obj/machinery/light/small/emergency, -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8 - }, -/turf/simulated/floor/plating{ +/obj/machinery/atmospherics/pipe/simple/hidden/black, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/blood/drip/oil, +/turf/simulated/floor/tiled{ temperature = 278.15 }, -/area/hailstorm_ship/engine) +/area/shuttle/hailstorm_shuttle) "QL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -4003,9 +4006,7 @@ }, /area/hailstorm_ship/barracks) "Ry" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/manifold/visible/fuel, /turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/engine) "RA" = ( @@ -4045,12 +4046,6 @@ temperature = 278.15 }, /area/shuttle/hailstorm_shuttle) -"Ss" = ( -/obj/random/dirt_75, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/hailstorm_ship/eva) "Sv" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -4082,42 +4077,20 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck/second) -"Ti" = ( -/obj/machinery/suit_cycler/offship/dpra, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light/small/emergency{ - dir = 1 - }, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/hailstorm_ship/eva) "Tq" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1 + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, /area/shuttle/hailstorm_shuttle) "Tt" = ( -/obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled{ +/obj/machinery/computer/ship/engines/terminal, +/turf/simulated/floor/plating{ temperature = 278.15 }, -/area/hailstorm_ship) +/area/hailstorm_ship/engine) "Tu" = ( /turf/simulated/floor/tiled{ temperature = 278.15 @@ -4152,12 +4125,6 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) -"TT" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/hailstorm_ship/engine) "Uh" = ( /obj/machinery/atmospherics/unary/engine, /obj/effect/landmark/entry_point/aft{ @@ -4190,6 +4157,26 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck/second) +"Us" = ( +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship) "Uy" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -4369,6 +4356,12 @@ "WG" = ( /turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/engineering) +"WI" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled{ + temperature = 278.15 + }, +/area/hailstorm_ship/eva) "WL" = ( /obj/structure/cable/green{ d1 = 1; @@ -4408,10 +4401,13 @@ }, /area/hailstorm_ship) "Xk" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ +/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, +/obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, -/turf/simulated/wall/shuttle/space_ship/mercenary, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/engine) "Xm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -4466,6 +4462,16 @@ temperature = 278.15 }, /area/hailstorm_ship/bridge) +"XN" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + dir = 8 + }, +/obj/effect/map_effect/marker/large_tank{ + name = "hailstorm_co2_port"; + master_tag = "hailstorm_co2_port" + }, +/turf/simulated/floor/reinforced/carbon_dioxide, +/area/hailstorm_ship/engine) "YA" = ( /obj/structure/cable/green{ d1 = 2; @@ -4528,6 +4534,10 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) +"ZF" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/hailstorm_ship/atmospherics) "ZG" = ( /turf/simulated/floor/tiled{ temperature = 278.15 @@ -14147,11 +14157,11 @@ iB iB vY Hs -AK +es AP -Ax +vU Nb -bZ +Hx WG WG WG @@ -14309,11 +14319,11 @@ iB iB iB Uh -jB +Ry cr -Ax -lj -lj +vU +Xk +Xk WG av fK @@ -14471,11 +14481,11 @@ iB iB iB Hs -Xk +dC ZQ -PT -xI -zP +jB +Ng +cp WG EC mg @@ -14499,7 +14509,7 @@ Zj iT fQ ab -dR +fy ny qm lT @@ -14636,8 +14646,8 @@ in in in in -Gj -QC +ED +tC WG fv Hm @@ -14797,12 +14807,12 @@ in in UW in -Ja -um +qy +Fd cr WG VO -jG +lj Jt Hm Pv @@ -14810,7 +14820,7 @@ bX VR Pv aF -Ss +WI kI rH lZ @@ -14823,7 +14833,7 @@ oF ca fQ du -vU +fG UD eV rp @@ -14964,14 +14974,14 @@ EV cr WG la -jG +lj rq Hm Pv dJ yx Pv -Ti +Ax ai kA rH @@ -15447,7 +15457,7 @@ iB in in GS -QA +Ku WG WG bV @@ -15456,7 +15466,7 @@ WG Pv Pv oh -pE +ZF DS bR DS @@ -15608,7 +15618,7 @@ iB iB iB in -TT +xt cr Oa iU @@ -15627,7 +15637,7 @@ dk ph am Oa -Tt +Us ZG sn sg @@ -15776,16 +15786,16 @@ vA cw Ns Er -ll +bw yF Er Jp TD Er YG -ll +bw li -ll +bw YG GR FC @@ -15943,7 +15953,7 @@ zJ Wx Wx aN -aw +gl Wx Wx Wd @@ -16255,7 +16265,7 @@ iB in in in -bm +Tt cr Xx in @@ -16905,7 +16915,7 @@ in in in cr -tC +mz in iB bq @@ -16929,7 +16939,7 @@ DF QW CR ad -hd +NL cd FX Fx @@ -17063,11 +17073,11 @@ iB iB iB Hs -Ry +JM vJ -PT -MK -Gj +jB +Ci +ED in iB Vw @@ -17225,11 +17235,11 @@ iB iB iB qV -jB +Ry cr -Ax -lj -lj +vU +Xk +Xk in iB zd @@ -17387,18 +17397,18 @@ iB iB iB Hs -qy +hd NC -Ax +vU DD -Hx +XN in iB Vw Vw Vw Xm -yC +PT La lJ Hi @@ -17563,7 +17573,7 @@ wQ ch tv og -kk +jG Ig rx Vw @@ -17720,7 +17730,7 @@ iB iB bq Hu -td +iL Pb Ap oq From 76386dcc018adaafecf38d93e385c1094f743ffc Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Tue, 7 May 2024 00:52:10 -0600 Subject: [PATCH 08/12] hegemony corvette moving stuff around --- .../hegemony_corvette/hegemony_corvette.dmm | 84 +++++++++---------- .../ships/kataphracts/kataphract_ship.dmm | 14 ++-- 2 files changed, 46 insertions(+), 52 deletions(-) diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm index 2f9296dc879..b3713c3f516 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm @@ -744,7 +744,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, /area/hegemony_ship/engineering) "eI" = ( @@ -3570,11 +3569,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/hegemony_ship/engineering) -"uK" = ( -/obj/structure/dispenser/oxygen, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled, -/area/hegemony_ship/eva_storage) "uN" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 @@ -3744,7 +3738,6 @@ /turf/simulated/floor/plating, /area/hegemony_ship/trophy_room) "vB" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/structure/sign/flag/hegemony/large/north{ pixel_y = 32 @@ -5193,6 +5186,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/powered/pump, /turf/simulated/floor/plating, /area/hegemony_ship/atmos_distro) "DK" = ( @@ -5237,31 +5231,9 @@ /area/hegemony_ship/port_propulsion) "Ec" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/structure/closet{ - name = "engineering equipment" - }, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/glass/full, -/obj/item/clothing/gloves/yellow/specialu, -/obj/item/clothing/gloves/yellow/specialu, -/obj/item/stack/material/wood/full, -/obj/item/storage/box/lights/bulbs, /obj/machinery/light, -/obj/item/stack/liquidbags/half_full, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/clothing/accessory/storage/pouches/brown, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/pouches/brown, -/obj/item/clothing/head/welding, -/obj/item/clothing/head/welding, -/obj/item/clothing/glasses/welding, -/obj/item/clothing/glasses/welding, -/obj/item/gun/energy/plasmacutter, -/obj/item/gun/energy/plasmacutter, +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/hegemony_ship/eva_storage) "Ei" = ( @@ -5802,18 +5774,9 @@ /turf/simulated/floor/plating, /area/hegemony_ship) "Hc" = ( -/obj/item/device/healthanalyzer, -/obj/item/device/breath_analyzer, -/obj/item/clothing/mask/surgical, -/obj/item/storage/belt/medical/first_responder/combat/full, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/accessory/storage/pouches/white, -/obj/item/clothing/accessory/storage/white_vest, /obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/structure/closet{ - name = "healers equipment" - }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/hegemony_ship/eva_storage) "He" = ( @@ -6849,6 +6812,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, +/obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, /area/hegemony_ship/atmos_distro) "MZ" = ( @@ -7396,6 +7360,7 @@ d2 = 8; icon_state = "0-8" }, +/obj/item/storage/firstaid/radiation, /turf/simulated/floor/tiled/white, /area/hegemony_ship/medbay) "Qh" = ( @@ -7911,10 +7876,33 @@ /turf/simulated/floor/carpet/rubber, /area/hegemony_ship) "Ta" = ( +/obj/structure/closet{ + name = "engineering equipment" + }, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/stack/material/steel/full, +/obj/item/stack/material/glass/full, +/obj/item/clothing/gloves/yellow/specialu, +/obj/item/clothing/gloves/yellow/specialu, +/obj/item/stack/material/wood/full, +/obj/item/storage/box/lights/bulbs, +/obj/item/stack/liquidbags/half_full, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/clothing/accessory/storage/pouches/brown, +/obj/item/clothing/accessory/storage/brown_vest, +/obj/item/clothing/accessory/storage/brown_vest, +/obj/item/clothing/accessory/storage/pouches/brown, +/obj/item/clothing/head/welding, +/obj/item/clothing/head/welding, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/item/gun/energy/plasmacutter, +/obj/item/gun/energy/plasmacutter, /obj/machinery/light/colored/red{ dir = 4 }, -/obj/machinery/portable_atmospherics/powered/pump, /turf/simulated/floor/plating, /area/hegemony_ship/engineering) "Tb" = ( @@ -8357,7 +8345,7 @@ }, /obj/structure/closet/walllocker/medical{ pixel_x = 32; - name = "stabalization equipment" + name = "stabilization equipment" }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/loading/yellow{ @@ -8370,6 +8358,12 @@ /obj/item/storage/pill_bottle/mortaphenyl, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, +/obj/item/clothing/accessory/storage/pouches/white, +/obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/glasses/hud/health, +/obj/item/reagent_containers/inhaler/pneumalin, +/obj/item/reagent_containers/inhaler/pneumalin, +/obj/item/storage/belt/medical/first_responder/combat/full, /turf/simulated/floor/tiled/white, /area/hegemony_ship/medbay) "VG" = ( @@ -22515,7 +22509,7 @@ WH wo IE lP -uK +hn CX vm Hq diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index c9c117de0ee..22948c2a04d 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -4789,12 +4789,6 @@ }, /turf/simulated/floor/tiled, /area/kataphract_chapter/atmospherics) -"wR" = ( -/obj/structure/bed/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/shuttle/kataphract_shuttle/main_compartment) "wT" = ( /obj/structure/table/reinforced/steel, /obj/item/folder/red, @@ -6663,6 +6657,12 @@ }, /turf/simulated/floor/tiled, /area/kataphract_chapter/main_ring) +"QD" = ( +/obj/structure/bed/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/kataphract_shuttle/main_compartment) "QS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -37080,7 +37080,7 @@ dN dN dN Bv -wR +QD lB fD wU From 9e26f01b1e77d4451f73270e29a408389faaef9a Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Wed, 8 May 2024 15:53:13 -0600 Subject: [PATCH 09/12] button and tile fixes on coc and headmaster --- maps/away/ships/coc/coc_ranger/coc_ship.dmm | 5 +++ .../ships/pra/headmaster/headmaster_ship.dmm | 36 ++++++++----------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm index ab22eaa603b..6234c58d622 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm @@ -3330,6 +3330,11 @@ shuttle_tag = "Ranger Shuttle"; req_one_access = null }, +/obj/machinery/access_button{ + pixel_x = 12; + pixel_y = -28; + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/shuttle/ranger_shuttle) "nQz" = ( diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm index deed9b6f03d..c3e9c27c647 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm @@ -38,9 +38,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "aj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -445,7 +443,7 @@ /obj/effect/floor_decal/industrial/loading/yellow{ dir = 4 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "aZ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -730,7 +728,7 @@ /obj/machinery/light/small/emergency{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "bQ" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -760,9 +758,7 @@ /obj/machinery/ammunition_loader/grauwolf{ weapon_id = "Headmaster Grauwolf Flak Battery" }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "bV" = ( /obj/machinery/hologram/holopad/long_range, @@ -1576,7 +1572,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "ek" = ( /obj/machinery/computer/ship/helm/terminal, @@ -2951,7 +2947,7 @@ /obj/machinery/door/window{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "iS" = ( /obj/machinery/portable_atmospherics/powered/pump/filled, @@ -3709,7 +3705,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "lq" = ( /obj/structure/closet/secure_closet/guncabinet{ @@ -3973,7 +3969,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "mg" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -4730,7 +4726,7 @@ }, /area/headmaster_ship/captain_quarters) "qW" = ( -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "qY" = ( /obj/machinery/computer/ship/targeting/terminal, @@ -4949,9 +4945,7 @@ /mob/living/heavy_vehicle/premade/ripley/loader, /obj/machinery/mech_recharger, /obj/effect/floor_decal/industrial/outline/engineering, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "tq" = ( /obj/effect/floor_decal/corner/red{ @@ -4983,7 +4977,7 @@ "tw" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "ty" = ( /obj/structure/bed/stool/bar/padded/red, @@ -5251,7 +5245,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "xr" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -5712,7 +5706,7 @@ /obj/machinery/door/window{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "Co" = ( /obj/structure/cable{ @@ -6714,7 +6708,7 @@ dir = 1 }, /obj/machinery/light/small/emergency, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "Nb" = ( /obj/effect/floor_decal/corner/green{ @@ -7639,7 +7633,7 @@ }, /obj/item/device/multitool, /obj/item/hoist_kit, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/cooled, /area/headmaster_ship/gun_deck) "We" = ( /obj/structure/closet/crate/freezer/rations, From 49500f18a4208e03cd28f7b64d9bb831753db6e9 Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Wed, 8 May 2024 18:33:21 -0600 Subject: [PATCH 10/12] i'm going insane + antag stuff --- maps/aurora/aurora-1_centcomm.dmm | 678 +++++++++--------- maps/away/ships/coc/coc_ranger/coc_ship.dmm | 10 +- .../ships/kataphracts/kataphract_ship.dmm | 18 +- .../ships/pra/headmaster/headmaster_ship.dmm | 6 +- 4 files changed, 368 insertions(+), 344 deletions(-) diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 3475e8fb1df..855410e4c4d 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -14424,6 +14424,16 @@ /obj/item/device/camera, /obj/item/device/taperecorder, /obj/item/device/megaphone/red, +/obj/item/clothing/accessory/holster, +/obj/item/clothing/accessory/holster, +/obj/item/clothing/accessory/holster/armpit, +/obj/item/clothing/accessory/holster/armpit, +/obj/item/clothing/accessory/holster/thigh, +/obj/item/clothing/accessory/holster/thigh, +/obj/item/clothing/accessory/storage/pouches/black, +/obj/item/clothing/accessory/storage/pouches/black, +/obj/item/storage/backpack/duffel/syndie, +/obj/item/storage/backpack/duffel/syndie, /turf/unsimulated/floor{ icon_state = "tiled_preview" }, @@ -22873,9 +22883,6 @@ icon_state = "tiled_preview" }, /area/antag/mercenary) -"mbe" = ( -/turf/simulated/floor/holofloor/space, -/area/centcom/start) "mbj" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; @@ -24360,9 +24367,6 @@ icon_state = "carpet" }, /area/centcom/bar) -"mZh" = ( -/turf/simulated/floor/exoplanet/barren, -/area/centcom/shared_dream) "mZj" = ( /turf/unsimulated/mineral/asteroid, /area/antag/ninja) @@ -26006,9 +26010,6 @@ }, /turf/simulated/floor/plating, /area/merchant_station/warehouse) -"nXw" = ( -/turf/simulated/floor/grass, -/area/centcom/shared_dream) "nXL" = ( /obj/effect/decal/fake_object/light_source/invisible, /turf/unsimulated/floor/plating, @@ -29686,12 +29687,6 @@ }, /turf/unsimulated/floor, /area/centcom/control) -"qLM" = ( -/turf/simulated/floor/beach/water/pool{ - icon_state = "seashallow"; - name = "ocean" - }, -/area/centcom/shared_dream) "qMs" = ( /obj/structure/shuttle_part/cargo{ icon_state = "5,11"; @@ -31032,6 +31027,26 @@ /obj/item/clothing/mask/gas/vaurca/filter, /obj/item/clothing/mask/gas/vaurca/filter, /obj/item/clothing/mask/gas/vaurca/filter, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/mask/breath/offworlder/jagmask, +/obj/item/clothing/mask/breath/offworlder/jagmask, +/obj/item/clothing/mask/breath/offworlder/jagmask, +/obj/item/clothing/mask/breath/offworlder/jagmask, +/obj/item/clothing/mask/breath/offworlder/jagmask, +/obj/item/clothing/mask/breath/offworlder/jagmask, +/obj/item/rig/light/offworlder, +/obj/item/rig/light/offworlder, /turf/unsimulated/floor{ icon_state = "wood_preview" }, @@ -38134,9 +38149,6 @@ icon_state = "tiled_preview" }, /area/antag/mercenary) -"wGy" = ( -/turf/simulated/floor/snow, -/area/centcom/shared_dream) "wGA" = ( /obj/machinery/light/small{ dir = 4 @@ -53027,21 +53039,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -53284,21 +53296,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -53541,21 +53553,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -53798,21 +53810,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -54055,21 +54067,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -54312,21 +54324,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -54569,21 +54581,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -54826,21 +54838,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe nkX -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -55083,21 +55095,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -55340,21 +55352,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -55597,21 +55609,21 @@ aaM aaM aaM pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -55854,21 +55866,21 @@ aEj aEj aEj pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -56111,21 +56123,21 @@ aDU aDU aDU pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -56368,21 +56380,21 @@ kOG bTZ aDU pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -56625,21 +56637,21 @@ soj wEI aDU pbO -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe -mbe +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX +nkX pbO aaM aaM @@ -88362,8 +88374,8 @@ woD woD woD xSh -mZh -mZh +dnS +dnS pux xSh woD @@ -88619,7 +88631,7 @@ woD woD woD xSh -mZh +dnS xLv ccz xSh @@ -88877,9 +88889,9 @@ woD woD xSh xSh -mZh +dnS ofD -mZh +dnS xSh woD woD @@ -89135,8 +89147,8 @@ xSh xSh xSh xSh -mZh -mZh +dnS +dnS xSh woD woD @@ -89389,7 +89401,7 @@ xSh ofD xLv xLv -mZh +dnS xSh xSh xSh @@ -89647,7 +89659,7 @@ xLv xLv xLv xLv -mZh +dnS xSh woD woD @@ -89655,7 +89667,7 @@ woD xSh xSh iAP -wGy +iAP ykk iAP iAP @@ -89905,7 +89917,7 @@ xLv xLv xLv fqz -mZh +dnS xSh woD woD @@ -90162,7 +90174,7 @@ xLv xLv ofD vze -mZh +dnS xSh woD woD @@ -90419,8 +90431,8 @@ xLv xLv ofD fqz -mZh -mZh +dnS +dnS xSh woD woD @@ -90430,7 +90442,7 @@ iAP iAP dus iAP -wGy +iAP ykk iAP woD @@ -90675,9 +90687,9 @@ xLv xLv ofD pUe -mZh -mZh -mZh +dnS +dnS +dnS xSh woD iAP @@ -90932,9 +90944,9 @@ xLv ofD ofD qGj -mZh -mZh -mZh +dnS +dnS +dnS xSh woD iAP @@ -91183,15 +91195,15 @@ woD vjV xLv xSh -mZh +dnS xLv xLv ofD dnS -mZh -mZh -mZh -mZh +dnS +dnS +dnS +dnS xSh woD iAP @@ -91438,17 +91450,17 @@ aaM woD woD brN -mZh +dnS xSh xSh -mZh +dnS xLv xLv nYi -mZh -mZh -mZh -mZh +dnS +dnS +dnS +dnS xSh woD iAP @@ -91699,12 +91711,12 @@ xSh woD woD xSh -mZh +dnS xLv xLv dib -mZh -mZh +dnS +dnS xSh xSh xSh @@ -91960,8 +91972,8 @@ xSh xSh xLv xLv -mZh -mZh +dnS +dnS icZ waR hML @@ -92999,12 +93011,12 @@ hAC mTg gjN rSX -qLM -qLM -qLM -qLM -qLM -qLM +vxP +vxP +vxP +vxP +vxP +vxP woD woD aaM @@ -93241,7 +93253,7 @@ woD xSh xSh plz -nXw +plz qBY wrY plz @@ -93256,12 +93268,12 @@ kiw hAC hAC hgT -qLM -qLM -qLM -qLM -qLM -qLM +vxP +vxP +vxP +vxP +vxP +vxP woD woD aaM @@ -93513,12 +93525,12 @@ hAC nCw oEM hqg -qLM -qLM -qLM -qLM -qLM -qLM +vxP +vxP +vxP +vxP +vxP +vxP woD woD aaM @@ -93770,12 +93782,12 @@ hAC hAC rys jYZ -qLM -qLM -qLM -qLM vxP -qLM +vxP +vxP +vxP +vxP +vxP woD woD aaM @@ -94027,12 +94039,12 @@ hAC bye rys jYZ -qLM -qLM -qLM -qLM -qLM -qLM +vxP +vxP +vxP +vxP +vxP +vxP woD woD aaM @@ -94284,12 +94296,12 @@ hAC qnP rys jYZ -qLM -qLM -qLM -qLM vxP -qLM +vxP +vxP +vxP +vxP +vxP woD woD aaM @@ -94541,12 +94553,12 @@ hAC nCw rys jYZ -qLM -qLM -qLM -qLM -qLM -qLM +vxP +vxP +vxP +vxP +vxP +vxP woD woD aaM @@ -94785,7 +94797,7 @@ xSh plz plz plz -nXw +plz ieC kme woD @@ -94798,12 +94810,12 @@ teG mcI rys jYZ -qLM -qLM -qLM -qLM -qLM -qLM +vxP +vxP +vxP +vxP +vxP +vxP woD woD aaM @@ -95055,12 +95067,12 @@ hAC hAC lpa bjr -qLM -qLM -qLM -qLM -qLM -qLM +vxP +vxP +vxP +vxP +vxP +vxP woD woD aaM diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm index 6234c58d622..9a63db5e943 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm @@ -292,7 +292,7 @@ /turf/simulated/floor/plating, /area/ship/ranger_corvette/engine2) "bgA" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/effect/map_effect/marker_helper/airlock/out, /obj/structure/cable{ @@ -1694,6 +1694,12 @@ pixel_x = 24; pixel_y = 6 }, +/obj/effect/map_effect/marker/airlock/shuttle{ + name = "ranger_shuttle_dock2"; + master_tag = "ranger_shuttle_dock2"; + shuttle_tag = "Ranger Shuttle"; + req_one_access = null + }, /turf/simulated/floor/airless, /area/shuttle/ranger_shuttle) "gMK" = ( @@ -6276,7 +6282,7 @@ /obj/machinery/light/small/emergency{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/lattice/catwalk/indoor/grate, /obj/effect/map_effect/marker/airlock/shuttle{ name = "ranger_shuttle_dock2"; master_tag = "ranger_shuttle_dock2"; diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index 22948c2a04d..65c8b5035aa 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -4238,8 +4238,8 @@ dir = 1; pixel_y = -21; name = "Kataphract Shuttle docking port controller"; - docking_controller = "kataphract_dock"; - frequency = 1380 + frequency = 1380; + id_tag = "kataphract_dock" }, /turf/simulated/floor/tiled, /area/kataphract_chapter/hangar) @@ -4390,10 +4390,6 @@ }, /obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, /obj/effect/map_effect/marker_helper/airlock/out, -/obj/machinery/airlock_sensor{ - pixel_x = 24; - pixel_y = 24 - }, /turf/simulated/floor/airless, /area/shuttle/kataphract_shuttle/main_compartment) "sB" = ( @@ -5268,6 +5264,10 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/airlock_sensor{ + pixel_x = -28; + pixel_y = -8 + }, /turf/simulated/floor/plating, /area/shuttle/kataphract_shuttle/main_compartment) "BJ" = ( @@ -5457,6 +5457,12 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + pixel_y = 21; + name = "Kataphract Shuttle docking port controller"; + frequency = 1380; + id_tag = "kataphract_dock" + }, /turf/simulated/floor/tiled/full, /area/shuttle/kataphract_shuttle/main_compartment) "El" = ( diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm index c3e9c27c647..18dd3c98858 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm @@ -1263,6 +1263,9 @@ pixel_y = -21; dir = 1 }, +/obj/effect/shuttle_landmark/headmaster_shuttle/hangar{ + dir = 1 + }, /turf/simulated/floor, /area/headmaster_ship/hangar) "dp" = ( @@ -2531,9 +2534,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/shuttle_landmark/headmaster_shuttle/hangar{ - dir = 1 - }, /turf/simulated/floor/plating/cooled, /area/headmaster_ship/hangar) "hx" = ( From 4bd5ccb8a5c1d57319bd32f381c3a79b0192191f Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Wed, 8 May 2024 18:35:11 -0600 Subject: [PATCH 11/12] changelog --- .../Lavillastrangiato - moremapbugfixes.yml | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 html/changelogs/Lavillastrangiato - moremapbugfixes.yml diff --git a/html/changelogs/Lavillastrangiato - moremapbugfixes.yml b/html/changelogs/Lavillastrangiato - moremapbugfixes.yml new file mode 100644 index 00000000000..71061cd1a50 --- /dev/null +++ b/html/changelogs/Lavillastrangiato - moremapbugfixes.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Lavillastrangiato + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Adds many quality of life features to various offships." + - bugfix: "Adds missing buttons, bad tiles, and other missing things." From dbeffe5e34928b7b43d7954e9c53a8f2bddb822c Mon Sep 17 00:00:00 2001 From: lavillastrangiato Date: Thu, 9 May 2024 15:34:29 -0600 Subject: [PATCH 12/12] whoops actual antag stuff --- maps/aurora/aurora-1_centcomm.dmm | 30 ------------ maps/sccv_horizon/sccv_horizon-4_centcomm.dmm | 47 ++++++++++++++++++- 2 files changed, 46 insertions(+), 31 deletions(-) diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 855410e4c4d..396a472051e 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -14424,16 +14424,6 @@ /obj/item/device/camera, /obj/item/device/taperecorder, /obj/item/device/megaphone/red, -/obj/item/clothing/accessory/holster, -/obj/item/clothing/accessory/holster, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/thigh, -/obj/item/clothing/accessory/holster/thigh, -/obj/item/clothing/accessory/storage/pouches/black, -/obj/item/clothing/accessory/storage/pouches/black, -/obj/item/storage/backpack/duffel/syndie, -/obj/item/storage/backpack/duffel/syndie, /turf/unsimulated/floor{ icon_state = "tiled_preview" }, @@ -31027,26 +31017,6 @@ /obj/item/clothing/mask/gas/vaurca/filter, /obj/item/clothing/mask/gas/vaurca/filter, /obj/item/clothing/mask/gas/vaurca/filter, -/obj/item/clothing/accessory/offworlder/bracer, -/obj/item/clothing/accessory/offworlder/bracer, -/obj/item/clothing/accessory/offworlder/bracer, -/obj/item/clothing/accessory/offworlder/bracer, -/obj/item/clothing/accessory/offworlder/bracer, -/obj/item/clothing/accessory/offworlder/bracer, -/obj/item/clothing/accessory/offworlder/bracer/neckbrace, -/obj/item/clothing/accessory/offworlder/bracer/neckbrace, -/obj/item/clothing/accessory/offworlder/bracer/neckbrace, -/obj/item/clothing/accessory/offworlder/bracer/neckbrace, -/obj/item/clothing/accessory/offworlder/bracer/neckbrace, -/obj/item/clothing/accessory/offworlder/bracer/neckbrace, -/obj/item/clothing/mask/breath/offworlder/jagmask, -/obj/item/clothing/mask/breath/offworlder/jagmask, -/obj/item/clothing/mask/breath/offworlder/jagmask, -/obj/item/clothing/mask/breath/offworlder/jagmask, -/obj/item/clothing/mask/breath/offworlder/jagmask, -/obj/item/clothing/mask/breath/offworlder/jagmask, -/obj/item/rig/light/offworlder, -/obj/item/rig/light/offworlder, /turf/unsimulated/floor{ icon_state = "wood_preview" }, diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index e00650ce8ea..1f001055c1d 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -23711,6 +23711,11 @@ /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/rig/light/offworlder, /turf/unsimulated/floor, /area/antag/burglar) "bjA" = ( @@ -30606,7 +30611,19 @@ /obj/item/device/camera, /obj/item/device/taperecorder, /obj/item/device/megaphone/red, -/turf/unsimulated/floor, +/obj/item/clothing/accessory/holster, +/obj/item/clothing/accessory/holster, +/obj/item/clothing/accessory/holster/armpit, +/obj/item/clothing/accessory/holster/armpit, +/obj/item/clothing/accessory/holster/thigh, +/obj/item/clothing/accessory/holster/thigh, +/obj/item/clothing/accessory/storage/pouches/black, +/obj/item/clothing/accessory/storage/pouches/black, +/obj/item/storage/backpack/duffel/syndie, +/obj/item/storage/backpack/duffel/syndie, +/turf/unsimulated/floor{ + icon_state = "tiled_preview" + }, /area/antag/ninja) "bBR" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -34231,6 +34248,20 @@ /obj/item/clothing/mask/gas/vaurca/filter, /obj/item/clothing/mask/gas/vaurca/filter, /obj/item/clothing/mask/gas/vaurca/filter, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/rig/light/offworlder, +/obj/item/rig/light/offworlder, /turf/unsimulated/floor{ icon_state = "freezer" }, @@ -38893,6 +38924,20 @@ /obj/item/clothing/mask/gas/vaurca/filter, /obj/item/clothing/mask/gas/vaurca/filter, /obj/item/clothing/mask/gas/vaurca/filter, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer/neckbrace, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/rig/light/offworlder, +/obj/item/rig/light/offworlder, /turf/unsimulated/floor, /area/antag/raider) "ubF" = (