diff --git a/_maps/PentestMaps/Shuttles/nanotrasen/nanotrasen_cheyenne.dmm b/_maps/PentestMaps/Shuttles/nanotrasen/nanotrasen_cheyenne.dmm index cfbe09ef66b..9a767aea5f3 100644 --- a/_maps/PentestMaps/Shuttles/nanotrasen/nanotrasen_cheyenne.dmm +++ b/_maps/PentestMaps/Shuttles/nanotrasen/nanotrasen_cheyenne.dmm @@ -32,10 +32,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/junction/flip{ +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/hallway/aft) "aj" = ( @@ -178,7 +178,7 @@ /turf/open/floor/pod/light, /area/ship/hangar) "aL" = ( -/turf/closed/wall/r_wall, +/turf/closed/indestructible/plastitanium, /area/ship/medical) "aN" = ( /obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ @@ -469,9 +469,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/machinery/light/floor, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 @@ -578,14 +575,13 @@ /turf/open/floor/pod, /area/ship/hangar) "cb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23 +/obj/structure/window/reinforced/spawner/north, +/mob/living/simple_animal/pet/cat/cak{ + faction = list("playerNanotrasen") }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/obj/structure/bed/dogbed, +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "cd" = ( /obj/structure/window/plasma/reinforced/spawner/west, /turf/open/floor/engine/n2, @@ -748,10 +744,9 @@ /turf/open/floor/mineral/titanium/tiled/blue, /area/ship/medical) "cR" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/brown/half, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/obj/machinery/suit_storage_unit/industrial, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "cU" = ( /obj/machinery/door/airlock/public{ dir = 8; @@ -904,8 +899,6 @@ /turf/open/floor/plating, /area/ship/hangar) "dy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/ntspaceworks_big/two, /obj/effect/turf_decal/corner/opaque/beige/border{ dir = 1 }, @@ -913,10 +906,12 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/patterned, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plasteel/stairs, /area/ship/hangar) "dB" = ( -/obj/effect/turf_decal/corner/opaque/vired/half, /obj/machinery/camera{ dir = 1 }, @@ -925,6 +920,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/storage/eva) "dE" = ( @@ -1190,6 +1186,11 @@ /obj/structure/fluff/empty_terrarium, /mob/living/simple_animal/hostile/retaliate/frog, /obj/machinery/light/directional/west, +/mob/living/basic/mouse{ + desc = "This rat seems particularly old and crotchety."; + name = "Splinter"; + faction = list("playerNanotrasen") + }, /turf/open/floor/holofloor/grass, /area/ship/hallway/aft) "ff" = ( @@ -1356,11 +1357,9 @@ /turf/open/floor/plasteel/patterned, /area/ship/hangar) "fV" = ( -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/nsorange/three_quarters{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/brown/half, +/obj/effect/turf_decal/corner/opaque/nsorange/half{ + dir = 1 }, /turf/open/floor/plasteel, /area/ship/hallway/central) @@ -1427,7 +1426,7 @@ dir = 1 }, /obj/effect/landmark/start/quartermaster, -/turf/open/floor/plasteel, +/turf/open/floor/wood/ebony, /area/ship/cargo/office) "gm" = ( /obj/effect/turf_decal/corner/opaque/blue/border{ @@ -1575,12 +1574,11 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "gQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing, -/obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/sloth/paperwork, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/industrial/warning, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/cargo) "gR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1791,8 +1789,12 @@ /area/ship/engineering/engine) "hZ" = ( /obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/obj/machinery/firealarm/directional/north, -/obj/item/banner/cargo, +/obj/structure/window/reinforced/spawner{ + dir = 1 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/cargo) "ib" = ( @@ -1832,12 +1834,10 @@ /turf/open/floor/plasteel/white, /area/ship/crew/toilet) "im" = ( -/obj/effect/turf_decal/corner/opaque/nsorange/half{ - dir = 1 - }, +/obj/structure/window/reinforced/spawner/north, /obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "ip" = ( /turf/closed/wall/mineral/titanium, /area/ship/storage) @@ -1886,7 +1886,11 @@ /area/ship/hallway/central) "iz" = ( /obj/machinery/light/directional/west, -/turf/closed/wall/mineral/titanium/nodiagonal, +/obj/effect/turf_decal/corner/opaque/nsorange/three_quarters{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel, /area/ship/hallway/starboard) "iA" = ( /obj/effect/turf_decal/corner/opaque/ntblue/border{ @@ -1899,12 +1903,8 @@ /area/ship/medical) "iI" = ( /obj/structure/railing, -/obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/cargo) "iJ" = ( /obj/structure/closet/secure_closet/chemical, @@ -2006,9 +2006,6 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/vired/three_quarters{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -2096,7 +2093,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plasteel, +/turf/open/floor/wood/ebony, /area/ship/cargo/office) "jH" = ( /obj/machinery/light/directional/east, @@ -2144,7 +2141,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/window/reinforced, /obj/structure/flora/ausbushes/grassybush, /mob/living/simple_animal/pet/mothroach{ name = "Cuddlebug" @@ -2203,13 +2199,27 @@ /obj/item/toy/cards/deck/cas, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) -"kd" = ( -/obj/structure/cable{ - icon_state = "1-2" +"ka" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/east, +/obj/effect/turf_decal/techfloor{ + dir = 4 }, +/mob/living/simple_animal/sloth/paperwork, +/turf/open/floor/plasteel, +/area/ship/cargo) +"kd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/effect/turf_decal/corner/opaque/brown/half, +/obj/effect/turf_decal/corner/opaque/nsorange/half{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -18 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "kf" = ( @@ -2256,14 +2266,11 @@ /turf/open/floor/pod, /area/ship/hangar) "ko" = ( -/obj/effect/turf_decal/corner/opaque/nsorange{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/obj/effect/turf_decal/ntspaceworks_big/one, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "kq" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/railing/corner{ dir = 8 }, @@ -2279,12 +2286,10 @@ dir = 5 }, /obj/machinery/light/floor/hangar, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod, /area/ship/hangar) "ks" = ( -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -2293,8 +2298,6 @@ /obj/machinery/airalarm/directional/east, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/hallway/central) "kt" = ( @@ -2446,25 +2449,9 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "la" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/extinguisher_cabinet/directional/south{ - pixel_y = -30 - }, -/obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/rice, -/obj/item/reagent_containers/condiment/rice, -/obj/item/reagent_containers/condiment/sugar, -/obj/item/reagent_containers/condiment/sugar, -/obj/item/reagent_containers/condiment/soymilk, -/obj/item/reagent_containers/condiment/soymilk, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/milk, -/turf/open/floor/wood/ebony, -/area/ship/crew/canteen) +/obj/effect/turf_decal/ntspaceworks_big/four, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "ld" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -2568,12 +2555,8 @@ /turf/open/floor/carpet/royalblue, /area/ship/crew/crewtwo) "lE" = ( -/obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/obj/machinery/light_switch{ - pixel_y = 23 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/ntspaceworks_big/five, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/cargo) "lF" = ( /obj/structure/chair/comfy/shuttle{ @@ -2587,9 +2570,6 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "lG" = ( -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/blue/half{ dir = 4 }, @@ -2664,15 +2644,10 @@ /turf/open/floor/plasteel, /area/ship/science) "lV" = ( -/obj/effect/turf_decal/corner/opaque/nsorange/half{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner{ - dir = 8 - }, -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/obj/structure/window/reinforced/spawner/north, +/obj/structure/closet/secure_closet/hydroponics, +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "lZ" = ( /obj/machinery/cryopod{ dir = 8 @@ -2753,8 +2728,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/nsorange/three_quarters, +/obj/effect/turf_decal/corner/opaque/nsorange/half{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/starboard) "mu" = ( @@ -2820,9 +2796,8 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23 +/obj/machinery/door/airlock/external{ + name = "External Airlock" }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) @@ -2953,18 +2928,15 @@ /area/ship/crew/dorm) "nr" = ( /obj/structure/window/reinforced/spawner, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/obj/structure/janitorialcart, +/obj/item/mop, +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "nx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/external{ - name = "External Airlock" - }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner/opaque/nsorange/three_quarters, +/turf/open/floor/plasteel, /area/ship/hallway/starboard) "nz" = ( /obj/effect/turf_decal/corner/opaque/nsorange/half{ @@ -3234,8 +3206,9 @@ /area/ship/medical) "oK" = ( /obj/structure/window/reinforced/spawner, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/obj/machinery/hydroponics/constructable, +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "oO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -3327,13 +3300,18 @@ "pe" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/reagent_dispensers/watertank, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "pg" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/turf/open/floor/plasteel, +/obj/structure/window/reinforced/spawner{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/cargo) "pj" = ( /obj/structure/sign/warning/enginesafety, @@ -3371,9 +3349,6 @@ /obj/effect/turf_decal/corner/opaque/blue/half{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -3385,12 +3360,13 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/hallway/central) "px" = ( -/turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/obj/effect/turf_decal/industrial/warning, +/obj/structure/railing/corner, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "pA" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -3514,20 +3490,9 @@ /turf/open/floor/plasteel/tech, /area/ship/storage/eva) "qf" = ( -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/obj/effect/turf_decal/ntspaceworks_big/seven, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "qh" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) @@ -3731,12 +3696,9 @@ }, /area/ship/bridge) "qY" = ( -/obj/machinery/vending/wardrobe/jani_wardrobe, -/obj/effect/turf_decal/corner/opaque/nsorange/three_quarters{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "qZ" = ( /obj/effect/turf_decal/corner/opaque/blue/border{ dir = 5 @@ -3752,6 +3714,7 @@ pixel_x = -25 }, /obj/machinery/light/floor/hangar, +/obj/machinery/camera, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "rd" = ( @@ -3909,12 +3872,14 @@ /area/ship/crew/canteen) "rU" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/effect/turf_decal/corner/opaque/brown/half, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel, /area/ship/hallway/central) "rW" = ( @@ -3942,9 +3907,10 @@ "rZ" = ( /obj/structure/railing, /obj/machinery/light/directional/east, -/obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/siding/black/end{ + dir = 4 + }, +/turf/open/floor/circuit, /area/ship/cargo) "si" = ( /obj/machinery/light_switch{ @@ -4202,6 +4168,10 @@ /turf/open/floor/mineral/titanium/tiled/blue, /area/ship/medical) "sL" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "sO" = ( @@ -4517,14 +4487,11 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "tU" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/brown/half, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -18 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/obj/structure/table/reinforced, +/obj/item/circuitboard/computer/mech_bay_power_console, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "tV" = ( /obj/structure/window/reinforced/spawner{ dir = 8 @@ -4628,7 +4595,7 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/suit_storage_unit/industrial, +/obj/structure/table/reinforced, /turf/open/floor/plasteel/patterned, /area/ship/hangar) "ul" = ( @@ -4648,8 +4615,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/nsorange/three_quarters{ - dir = 1 +/obj/effect/turf_decal/corner/opaque/nsorange/half{ + dir = 8 }, /turf/open/floor/plasteel, /area/ship/hallway/starboard) @@ -4727,7 +4694,6 @@ /obj/effect/turf_decal/corner/opaque/blue/half{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/vired/half, /obj/structure/cable{ icon_state = "0-8" }, @@ -4736,6 +4702,7 @@ pixel_y = 22; pixel_x = 11 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/hallway/central) "uE" = ( @@ -4802,6 +4769,10 @@ /area/ship/hangar) "vc" = ( /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "ve" = ( @@ -4971,18 +4942,11 @@ }, /area/ship/engineering/engine) "vI" = ( -/obj/effect/turf_decal/corner/opaque/brown/half{ +/obj/structure/frame/computer{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/nsorange/half{ - dir = 4 - }, -/obj/machinery/light/directional/west, -/obj/machinery/camera{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "vJ" = ( /obj/effect/turf_decal/techfloor{ dir = 9 @@ -5031,16 +4995,10 @@ /area/ship/science) "vZ" = ( /obj/machinery/light/directional/east, -/obj/effect/turf_decal/corner/opaque/nsorange/half{ - dir = 4 - }, /obj/structure/window/reinforced/spawner, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/obj/machinery/hydroponics/constructable, +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "wb" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/yellow/end, @@ -5095,14 +5053,14 @@ /turf/open/floor/mineral/titanium/tiled/blue, /area/ship/medical) "wn" = ( -/obj/effect/turf_decal/corner/opaque/ntblue{ - dir = 1 +/obj/effect/turf_decal/siding/black/end{ + dir = 4 }, -/obj/effect/turf_decal/corner/opaque/brown/three_quarters, -/obj/item/kirbyplants/random, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/obj/machinery/mech_bay_recharge_port{ + dir = 8 + }, +/turf/open/floor/circuit, +/area/ship/cargo) "wt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -5215,16 +5173,15 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "wR" = ( -/obj/effect/turf_decal/ntspaceworks_big/four, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/corner/opaque/beige/border{ dir = 1 }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/spawner/random/salvage/half, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/banner/cargo, /turf/open/floor/plasteel/patterned, /area/ship/hangar) "wS" = ( @@ -5314,7 +5271,7 @@ /area/ship/engineering/engine) "xl" = ( /obj/machinery/light/directional/east, -/turf/open/floor/plasteel, +/turf/open/floor/wood/ebony, /area/ship/cargo/office) "xm" = ( /obj/machinery/computer/helm{ @@ -5359,17 +5316,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel, +/turf/open/floor/wood/ebony, /area/ship/cargo/office) "xy" = ( /obj/structure/window/reinforced/spawner{ dir = 8 }, -/obj/machinery/door/window/southleft{ - req_ship_access = 1 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "xA" = ( /obj/machinery/door/airlock/external{ name = "External Airlock" @@ -5671,12 +5625,8 @@ /turf/open/floor/holofloor/grass, /area/ship/medical) "yH" = ( -/obj/structure/extinguisher_cabinet/directional/north{ - pixel_y = 30 - }, -/obj/item/stack/sheet/cardboard, -/obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/ntspaceworks_big/eight, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/cargo) "yI" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -5685,7 +5635,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "yN" = ( -/turf/closed/wall/r_wall, +/turf/closed/indestructible/plastitanium, /area/ship/crew/crewfour) "yO" = ( /obj/effect/spawner/random/salvage/half, @@ -5741,9 +5691,6 @@ /turf/open/floor/circuit, /area/ship/engineering/communications) "yV" = ( -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -5760,7 +5707,6 @@ /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/hallway/central) "yW" = ( @@ -5771,14 +5717,12 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/vired, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/storage/eva) "zc" = ( @@ -6284,7 +6228,7 @@ name = "Quartermaster's Quarters"; req_access_txt = "41" }, -/turf/open/floor/plasteel, +/turf/open/floor/wood/ebony, /area/ship/cargo/office) "AO" = ( /obj/effect/turf_decal/corner/opaque/nsorange/half{ @@ -6344,8 +6288,8 @@ "Bh" = ( /obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/obj/machinery/computer/selling_pad_control, /obj/effect/turf_decal/industrial/outline, +/obj/structure/crate_shelf, /turf/open/floor/plasteel, /area/ship/cargo) "Bi" = ( @@ -6398,7 +6342,6 @@ /area/ship/engineering/engine) "Br" = ( /obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/obj/machinery/airalarm/directional/east, /obj/structure/chair/office{ dir = 8; name = "tactical swivel chair" @@ -6406,10 +6349,10 @@ /turf/open/floor/plasteel, /area/ship/cargo) "Bs" = ( -/obj/effect/turf_decal/corner/opaque/brown/half, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/obj/structure/table/reinforced, +/obj/item/radio/intercom/wideband/directional/north, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "Bt" = ( /obj/machinery/light/directional/west, /turf/open/floor/plasteel/dark, @@ -6422,9 +6365,6 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "BB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/ntspaceworks_big/seven, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -6435,6 +6375,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, /area/ship/hangar) "BC" = ( @@ -6561,9 +6503,7 @@ /obj/machinery/camera{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/obj/item/radio/intercom/wideband/directional/east, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/cargo) "BX" = ( /obj/structure/railing, @@ -6585,6 +6525,9 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen) "BZ" = ( +/obj/machinery/computer/telecomms/server{ + dir = 4 + }, /turf/open/floor/circuit, /area/ship/engineering/communications) "Ca" = ( @@ -6774,11 +6717,10 @@ /turf/open/floor/plasteel, /area/ship/hallway/port) "CV" = ( -/obj/structure/curtain/cloth/grey, /obj/item/bedsheet/qm, /obj/structure/bed, /obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel, +/turf/open/floor/wood/ebony, /area/ship/cargo/office) "CX" = ( /obj/effect/turf_decal/techfloor{ @@ -6796,7 +6738,7 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "Da" = ( -/turf/closed/wall/r_wall, +/turf/closed/indestructible/plastitanium, /area/ship/security/armory) "Dd" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -7030,9 +6972,14 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/fore) "Eb" = ( -/obj/machinery/camera, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/starboard) +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/east, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ship/cargo) "Em" = ( /obj/effect/turf_decal/corner/opaque/nsorange/half{ dir = 8 @@ -7145,15 +7092,9 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "EC" = ( -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/brown/half{ - dir = 4 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/obj/effect/turf_decal/ntspaceworks_big/six, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "ED" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/tank_dispenser, @@ -7167,6 +7108,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/corner/opaque/nsorange/half{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/port) "EG" = ( @@ -7187,15 +7131,20 @@ /area/ship/crew/crewfour) "EN" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, /obj/machinery/airalarm/directional/west, -/obj/structure/bed/dogbed, -/mob/living/simple_animal/pet/cat/cak{ - faction = list("playerNanotrasen") - }, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/structure/closet/secure_closet/freezer/kitchen, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "EQ" = ( @@ -7232,11 +7181,8 @@ "EV" = ( /obj/structure/bed, /obj/item/bedsheet/cmo, -/obj/structure/curtain/cloth{ - color = "#ADD8E6" - }, /obj/machinery/light/directional/north, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood/ebony, /area/ship/crew/crewfive) "EZ" = ( /obj/machinery/airalarm/directional/north, @@ -7397,14 +7343,14 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) "Fx" = ( -/obj/effect/turf_decal/corner/opaque/nsorange{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/corner/opaque/nsorange/half{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/aft) "Fz" = ( @@ -7482,8 +7428,10 @@ /area/ship/security/armory) "FO" = ( /obj/structure/railing, -/obj/effect/turf_decal/corner/opaque/yellow/diagonal, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/siding/black/end{ + dir = 8 + }, +/turf/open/floor/circuit, /area/ship/cargo) "FP" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -7522,7 +7470,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/window/reinforced, /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/holofloor/grass, /area/ship/hallway/central) @@ -7587,7 +7534,9 @@ /area/ship/cargo) "Gl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/corner/opaque/nsorange/half{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ship/hallway/aft) "Gn" = ( @@ -7630,7 +7579,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood/ebony, /area/ship/crew/crewfive) "Gu" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -7674,10 +7623,12 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "GA" = ( -/obj/effect/turf_decal/corner/opaque/brown/half, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/obj/effect/turf_decal/siding/black/end{ + dir = 8 + }, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/circuit, +/area/ship/cargo) "GM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -7783,8 +7734,6 @@ /turf/open/floor/plasteel/patterned, /area/ship/hangar) "Hj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/ntspaceworks_big/six, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, @@ -7796,6 +7745,7 @@ }, /obj/machinery/holopad, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, /area/ship/hangar) "Hk" = ( @@ -7963,9 +7913,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/nsorange/three_quarters{ - dir = 4 +/obj/effect/turf_decal/corner/opaque/nsorange/half{ + dir = 8 }, /turf/open/floor/plasteel, /area/ship/hallway/port) @@ -8079,12 +8028,13 @@ /area/ship/security) "IK" = ( /obj/structure/railing, -/obj/effect/turf_decal/corner/opaque/yellow/diagonal, +/obj/effect/turf_decal/industrial/warning{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 + dir = 9 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/cargo) "IM" = ( /obj/effect/turf_decal/corner/opaque/beige/border{ @@ -8175,7 +8125,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood/ebony, /area/ship/crew/crewfive) "Jp" = ( /obj/structure/cable{ @@ -8343,17 +8293,8 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "JW" = ( -/obj/effect/turf_decal/corner/opaque/nsorange/half{ - dir = 1 - }, -/obj/item/radio/intercom/directional/north, -/obj/vehicle/ridden/janicart{ - name = "Janicart Mk2"; - legs_required = 0 - }, -/obj/item/key/janitor, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "JX" = ( /obj/effect/turf_decal/corner/opaque/nsorange/three_quarters, /obj/effect/turf_decal/corner/opaque/bottlegreen{ @@ -8396,6 +8337,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/cargo) "Kf" = ( @@ -8737,8 +8681,11 @@ "Lu" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel/white, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23 + }, +/turf/open/floor/wood/ebony, /area/ship/crew/crewfive) "Lv" = ( /obj/structure/window/plasma/reinforced/spawner/north, @@ -8763,8 +8710,6 @@ /turf/open/floor/plasteel, /area/ship/cargo) "Lz" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/ntspaceworks_big/eight, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -8775,6 +8720,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, /area/ship/hangar) "LA" = ( @@ -8842,6 +8788,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/corner/opaque/nsorange{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/hallway/aft) "LN" = ( @@ -8931,6 +8880,8 @@ "LY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/airalarm/directional/east, +/obj/machinery/holopad, +/obj/item/disk/holodisk/lp/stations, /turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "LZ" = ( @@ -9028,6 +8979,10 @@ }, /obj/machinery/airalarm/directional/north, /obj/machinery/light/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/corner/opaque/ntblue{ + dir = 8 + }, /turf/open/floor/plasteel, /area/ship/hallway/central) "Mq" = ( @@ -9169,11 +9124,9 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "MT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/obj/effect/turf_decal/ntspaceworks_big/three, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "MV" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/firealarm/directional/south, @@ -9181,10 +9134,10 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen) "Nb" = ( -/obj/effect/turf_decal/corner/opaque/ntblue/three_quarters{ - dir = 4 +/obj/effect/turf_decal/corner/opaque/brown/half, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/brown, /turf/open/floor/plasteel, /area/ship/hallway/central) "Nc" = ( @@ -9198,9 +9151,6 @@ /obj/effect/turf_decal/corner/opaque/blue/half{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -9208,7 +9158,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/hallway/central) "Ni" = ( @@ -9223,8 +9172,7 @@ /area/ship/hallway/central) "Nn" = ( /obj/effect/turf_decal/corner/opaque/nsorange/three_quarters, -/obj/structure/janitorialcart, -/obj/item/mop, +/obj/machinery/vending/wardrobe/jani_wardrobe, /turf/open/floor/plasteel, /area/ship/hallway/aft) "Nt" = ( @@ -9321,15 +9269,13 @@ /turf/open/floor/plasteel, /area/ship/science) "NL" = ( -/obj/effect/turf_decal/corner/opaque/nsorange{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/brown/three_quarters{ - dir = 1 +/obj/structure/window/reinforced/spawner{ + dir = 8 }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/obj/structure/frame/machine, +/obj/effect/spawner/random/stockparts, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "NM" = ( /obj/effect/landmark/subship{ subship_template = /datum/map_template/shuttle/subshuttles/malp @@ -9573,7 +9519,6 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "OB" = ( -/obj/effect/turf_decal/ntspaceworks_big/five, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -9583,6 +9528,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, /area/ship/hangar) "OC" = ( @@ -9675,10 +9621,6 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "OR" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -18 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -9688,7 +9630,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood/ebony, /area/ship/crew/crewfive) "OT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -9703,12 +9645,9 @@ /turf/open/floor/plasteel/tech, /area/ship/storage/eva) "OV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/obj/effect/turf_decal/ntspaceworks_big/two, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/cargo) "OZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -9870,7 +9809,11 @@ /area/ship/hangar) "Pz" = ( /obj/machinery/light/directional/west, -/turf/closed/wall/mineral/titanium/nodiagonal, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/corner/opaque/nsorange/three_quarters{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/ship/hallway/port) "PB" = ( /obj/effect/turf_decal/corner/opaque/brown/three_quarters, @@ -9909,12 +9852,9 @@ /obj/item/clothing/neck/cloak/qm{ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) }, -/turf/open/floor/plasteel, +/turf/open/floor/wood/ebony, /area/ship/cargo/office) "PD" = ( -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -9925,7 +9865,6 @@ /obj/machinery/firealarm/directional/east, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/hallway/central) "PG" = ( @@ -10015,7 +9954,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/starboard) "Qh" = ( -/turf/closed/wall/r_wall, +/turf/closed/indestructible/plastitanium, /area/ship/security) "Qk" = ( /obj/effect/turf_decal/trimline/opaque/red/corner{ @@ -10027,6 +9966,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/tech, /area/ship/security) +"Qm" = ( +/obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 + }, +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "Qn" = ( /obj/machinery/door/window{ dir = 1 @@ -10104,13 +10052,14 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/fore) "Qz" = ( -/obj/effect/turf_decal/ntspaceworks_big/one, /obj/effect/turf_decal/corner/opaque/beige/border{ dir = 1 }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/structure/table/reinforced, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel/patterned, /area/ship/hangar) "QB" = ( @@ -10476,13 +10425,12 @@ /turf/open/floor/plasteel/patterned, /area/ship/hangar) "Sb" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/window/reinforced/spawner, +/obj/structure/curtain/cloth{ + color = "#ADD8E6" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/turf/open/floor/wood/ebony, +/area/ship/crew/crewfive) "Sh" = ( /obj/effect/turf_decal/trimline/opaque/red/line{ dir = 4 @@ -10508,9 +10456,9 @@ /turf/open/floor/pod, /area/ship/hangar) "Sk" = ( -/obj/structure/window/reinforced/fulltile, -/obj/structure/grille, -/turf/open/floor/plasteel, +/obj/structure/window/reinforced/spawner, +/obj/structure/curtain/cloth/grey, +/turf/open/floor/wood/ebony, /area/ship/cargo/office) "So" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, @@ -10552,13 +10500,9 @@ /area/ship/medical) "Sz" = ( /obj/structure/window/reinforced/spawner, -/mob/living/basic/mouse{ - desc = "This rat seems particularly old and crotchety."; - name = "Splinter"; - faction = list("playerNanotrasen") - }, -/turf/open/floor/plasteel, -/area/ship/hallway/aft) +/obj/structure/closet/crate/hydroponics, +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "SA" = ( /obj/effect/turf_decal/corner/opaque/nsorange/half{ dir = 8 @@ -10677,7 +10621,7 @@ }, /obj/machinery/suit_storage_unit/inherit, /obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood/ebony, /area/ship/crew/crewfive) "SU" = ( /obj/machinery/power/smes/shuttle/precharged{ @@ -10904,13 +10848,10 @@ /turf/open/floor/carpet/green, /area/ship/crew) "Tv" = ( -/obj/machinery/computer/telecomms/server{ - dir = 1 - }, /obj/machinery/camera{ dir = 1 }, -/turf/open/floor/circuit, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "Tw" = ( /obj/effect/turf_decal/corner/opaque/ntblue/border{ @@ -11078,12 +11019,14 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "Uc" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/corner/opaque/nsorange/half{ + dir = 1 }, +/obj/effect/turf_decal/corner/opaque/nsorange, /turf/open/floor/plasteel, -/area/ship/hallway/central) +/area/ship/hallway/port) "Ud" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -11139,9 +11082,6 @@ /turf/open/floor/plasteel/patterned, /area/ship/hangar) "Ui" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -11463,7 +11403,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood/ebony, /area/ship/crew/crewfive) "VE" = ( /obj/effect/turf_decal/trimline/opaque/red/end{ @@ -11601,8 +11541,6 @@ /turf/open/floor/plasteel/dark, /area/ship/storage/eva) "Wu" = ( -/obj/effect/turf_decal/ntspaceworks_big/three, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/corner/opaque/beige/border{ dir = 1 }, @@ -11610,7 +11548,11 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/patterned, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plasteel/stairs, /area/ship/hangar) "Wx" = ( /obj/machinery/door/airlock/external{ @@ -11765,7 +11707,6 @@ freq_listening = list(1353,1447,1459); network = "nt_commnet" }, -/obj/item/disk/holodisk/lp/stations, /turf/open/floor/circuit, /area/ship/engineering/communications) "Xd" = ( @@ -11782,10 +11723,7 @@ /obj/machinery/light_switch{ pixel_y = 23 }, -/obj/machinery/selling_pad, /obj/effect/turf_decal/industrial/outline, -/obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random/stockparts, /turf/open/floor/plasteel, /area/ship/cargo) "Xi" = ( @@ -11999,9 +11937,6 @@ /obj/effect/turf_decal/corner/opaque/blue/half{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -12010,7 +11945,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/hallway/central) "Yr" = ( @@ -12495,6 +12429,7 @@ pixel_y = 22; pixel_x = 11 }, +/obj/structure/table/reinforced, /turf/open/floor/plasteel, /area/ship/cargo) "ZV" = ( @@ -12948,7 +12883,7 @@ kB Wx vc Bu -px +Ew Pz HZ DA @@ -12974,7 +12909,7 @@ Am Ev uo iz -Eb +nT ra sL Ja @@ -12990,8 +12925,8 @@ kB Ew XN mb -cb Ts +Uc EF fH CH @@ -13001,7 +12936,7 @@ Er CQ CU Fx -Sb +Fx LM Jp JK @@ -13042,9 +12977,9 @@ no mh mh mh -lV -xy -fa +mh +mh +Cr hU eL bs @@ -13083,10 +13018,10 @@ Kh OH EN nD -mh im +JW Sz -fa +Cr Bo yI cA @@ -13124,11 +13059,11 @@ Zh Zh KV Zh -la -mh +Zh +JW JW oK -fa +Cr OP mg AR @@ -13164,11 +13099,11 @@ Zh Zh KV Yd -KV +Qm Zh Zh -mh -Cr +lV +JW nr Gl ai @@ -13209,10 +13144,10 @@ Mg pI bY Yr -mh +cb qY vZ -ko +Cr OP rB aD @@ -13552,8 +13487,8 @@ HQ YS Vr TC -TC -TC +ka +Eb hZ Ke OC @@ -13593,9 +13528,9 @@ vw JX iw fV -vI -NL TC +NL +xy pg IK uh @@ -13635,9 +13570,9 @@ Vd bd bO kd -OV -tU TC +tU +ko lE iI Qz @@ -13677,10 +13612,10 @@ Zj ZL eX jM -MT +TC Bs -Rq -Gj +OV +EC gQ dy Hj @@ -13712,18 +13647,18 @@ Yn pw Nf lG -qf +Nf dj jm yS fD TK Gb -MT +TC cR -Rq -Gj -FO +MT +qf +px Wu BB kn @@ -13761,9 +13696,9 @@ Hx bd Ui rU -Uc -GA TC +GA +la yH FO wR @@ -13803,9 +13738,9 @@ Fg Ni iw Nb -EC -wn TC +wn +vI BW rZ BN @@ -14219,7 +14154,7 @@ iK Dg Lu OR -Dg +Sb SW mv ja