diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm index 629b2e2a2a6..f3bc83c4ab2 100644 --- a/maps/stellardelight/stellar_delight3.dmm +++ b/maps/stellardelight/stellar_delight3.dmm @@ -569,10 +569,10 @@ }, /area/tcommsat/chamber) "cn" = ( -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "2-8" }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "4-8" }, /obj/effect/floor_decal/fancy_shuttle{ @@ -663,6 +663,12 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/starboarddock) +"cz" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/ai_cyborg_station) "cA" = ( /obj/structure/bed/chair{ dir = 8 @@ -1052,6 +1058,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "el" = ( @@ -1808,6 +1817,9 @@ /obj/machinery/door/airlock/angled_bay/double/glass{ name = "glass airlock" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/aft) "gW" = ( @@ -2023,7 +2035,7 @@ /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck3/aftstarroom) "hR" = ( -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "1-8" }, /obj/effect/floor_decal/fancy_shuttle{ @@ -2149,10 +2161,10 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portaft) "iw" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "1-2" }, /obj/effect/floor_decal/fancy_shuttle{ @@ -2677,9 +2689,6 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "kz" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 6; pixel_x = 7; @@ -2695,6 +2704,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 10 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/shuttle/sdboat/aft{ base_turf = /turf/simulated/floor/reinforced/airless @@ -2982,13 +2994,13 @@ /area/maintenance/stellardelight/deck3/forestarroomb) "lB" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/door/airlock/glass, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "sdboat" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/shuttle/sdboat/aft{ base_turf = /turf/simulated/floor/reinforced/airless @@ -3135,9 +3147,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "md" = ( @@ -3396,6 +3405,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "na" = ( @@ -3919,6 +3931,9 @@ /area/ai_cyborg_station) "oO" = ( /obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/portdock) "oP" = ( @@ -4826,7 +4841,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "4-8" }, /obj/effect/floor_decal/fancy_shuttle{ @@ -4843,9 +4858,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "sa" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/effect/map_helper/airlock/door/int_door, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_external, @@ -4855,6 +4867,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/shuttle/sdboat/aft{ base_turf = /turf/simulated/floor/reinforced/airless @@ -4951,9 +4966,6 @@ /area/ai) "ss" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; frequency = 1380; @@ -4973,6 +4985,9 @@ pixel_y = 32; req_one_access = list(13) }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/portdock) "st" = ( @@ -5121,6 +5136,12 @@ /obj/random/drinkbottle, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portfore) +"sZ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/maintenance/stellardelight/deck3/portaft) "tb" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -5237,6 +5258,9 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "tH" = ( @@ -5409,6 +5433,9 @@ dir = 8; pixel_x = -24 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "ul" = ( @@ -5777,6 +5804,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "vI" = ( @@ -5861,7 +5891,7 @@ /turf/simulated/floor/bluegrid, /area/ai_cyborg_station) "vX" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, /obj/effect/map_helper/airlock/atmos/chamber_pump, @@ -6287,6 +6317,9 @@ pixel_y = -32 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "xB" = ( @@ -6352,6 +6385,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "xP" = ( @@ -6405,7 +6441,7 @@ pixel_x = 17; pixel_y = 27 }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "2-8" }, /obj/effect/floor_decal/fancy_shuttle{ @@ -6579,6 +6615,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/portdock) +"yH" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/ai_cyborg_station) "yI" = ( /obj/item/weapon/folder{ pixel_x = -4 @@ -6979,9 +7021,11 @@ dir = 1 }, /obj/machinery/power/apc{ - pixel_y = -28 + pixel_y = -28; + req_access = null; + req_one_access = list(11, 67) }, -/obj/structure/cable, +/obj/structure/cable/green, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "sdboat" }, @@ -7092,6 +7136,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/stellardelight/deck2/starboard) "Aq" = ( @@ -7304,7 +7351,7 @@ pixel_x = -29; pixel_y = 30 }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "4-8" }, /obj/effect/floor_decal/fancy_shuttle{ @@ -7475,9 +7522,6 @@ /area/crew_quarters/heads/cmo) "BA" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; frequency = 1380; @@ -7494,6 +7538,9 @@ pixel_y = 32; req_one_access = list(13) }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/portdock) "BB" = ( @@ -7641,7 +7688,7 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "0-4" }, /obj/effect/floor_decal/fancy_shuttle{ @@ -7874,6 +7921,9 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/stellardelight/deck2/starboard) "CJ" = ( @@ -7976,6 +8026,12 @@ }, /turf/simulated/open, /area/crew_quarters/bar) +"De" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/ai_cyborg_station) "Df" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8984,6 +9040,9 @@ pixel_x = -32; plane = -34 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "Hh" = ( @@ -9339,6 +9398,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Iu" = ( @@ -9457,6 +9519,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "IS" = ( @@ -9505,6 +9570,12 @@ }, /turf/simulated/floor/airless, /area/maintenance/stellardelight/deck3/portcent) +"IZ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck3/aft) "Ja" = ( /obj/machinery/door/airlock/angled_bay/external/glass{ frequency = 1379; @@ -9766,6 +9837,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "JS" = ( @@ -9838,6 +9912,9 @@ /obj/machinery/camera/network/halls{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Kg" = ( @@ -9856,9 +9933,7 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_x = 32 }, -/obj/machinery/power/shield_generator/charged{ - power_coefficient = 0.33 - }, +/obj/machinery/power/shield_generator/charged, /obj/structure/cable, /turf/simulated/floor, /area/stellardelight/deck2/central) @@ -9870,9 +9945,11 @@ dir = 8 }, /obj/machinery/power/apc{ - pixel_y = -28 + pixel_y = -28; + req_access = null; + req_one_access = list(11, 67) }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "0-4" }, /obj/effect/floor_decal/fancy_shuttle{ @@ -10025,6 +10102,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "KM" = ( @@ -10058,6 +10138,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "KU" = ( @@ -10101,6 +10184,9 @@ "Le" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/flora/pottedplant/minitree, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Lf" = ( @@ -10248,7 +10334,7 @@ /turf/simulated/floor/wood, /area/stellardelight/deck3/cafe) "LO" = ( -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "1-2" }, /obj/effect/floor_decal/fancy_shuttle{ @@ -10398,7 +10484,7 @@ /turf/simulated/floor/tiled/dark, /area/lawoffice) "Mo" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -10481,6 +10567,9 @@ /area/maintenance/stellardelight/deck3/starboardcent) "Mx" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "My" = ( @@ -10489,6 +10578,12 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) +"MA" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/maintenance/stellardelight/deck3/portaft) "MB" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -10620,6 +10715,9 @@ dir = 4 }, /obj/effect/floor_decal/arrivals, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "MV" = ( @@ -10642,7 +10740,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portaft) "MX" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, /obj/effect/floor_decal/fancy_shuttle{ @@ -10745,6 +10843,9 @@ /obj/structure/sign/nanotrasen{ pixel_x = -32 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "Nm" = ( @@ -11100,6 +11201,9 @@ "Ou" = ( /obj/item/device/radio/beacon, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Ov" = ( @@ -11151,6 +11255,12 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/stellardelight/deck3/cafe) +"OA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/ai_cyborg_station) "OC" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/angled_bay/hatch{ @@ -11397,9 +11507,6 @@ /area/ai_upload) "Pl" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/door/airlock/glass{ name = "Starstuff Cockpit"; req_one_access = list(67) @@ -11407,6 +11514,9 @@ /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "sdboat" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/shuttle/sdboat/fore{ base_turf = /turf/simulated/floor/reinforced/airless @@ -11469,6 +11579,9 @@ /obj/machinery/camera/network/halls{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "PB" = ( @@ -11589,7 +11702,7 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Qe" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -11700,6 +11813,9 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "QB" = ( @@ -12163,6 +12279,9 @@ pixel_y = -32 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Sm" = ( @@ -12177,9 +12296,6 @@ }, /area/tcommsat/chamber) "Sn" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -12189,6 +12305,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "Sp" = ( @@ -12522,6 +12641,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "TE" = ( @@ -13243,12 +13365,12 @@ /obj/machinery/power/smes/buildable{ charge = 500000 }, -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "sdboat" }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/tiled, /area/shuttle/sdboat/aft{ base_turf = /turf/simulated/floor/reinforced/airless @@ -13599,6 +13721,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "XD" = ( @@ -13896,6 +14021,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "YB" = ( @@ -14005,6 +14133,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "YS" = ( @@ -14049,6 +14180,9 @@ dir = 4 }, /obj/effect/floor_decal/shuttles/right, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "Zj" = ( @@ -25559,13 +25693,13 @@ th th ct th -th +De Le TB -pc -pc -pc -pc +IZ +IZ +IZ +IZ YR YR xO @@ -25701,7 +25835,7 @@ Gk sQ uT wo -th +yH jP BC en @@ -25843,7 +25977,7 @@ Gk Ge vb xj -th +yH WZ LP zy @@ -25985,7 +26119,7 @@ Gk tQ Vt wd -th +yH Ed Cc Ed @@ -26121,13 +26255,13 @@ Gk Gk Gk Gk -Gk -Gk -Gk -th -th -th -th +MA +sZ +sZ +OA +OA +OA +cz ow ok ow diff --git a/maps/stellardelight/stellar_delight_things.dm b/maps/stellardelight/stellar_delight_things.dm index 1b2e056ee6c..90c50ddf4f0 100644 --- a/maps/stellardelight/stellar_delight_things.dm +++ b/maps/stellardelight/stellar_delight_things.dm @@ -34,7 +34,7 @@ /obj/item/weapon/paper/sdshield name = "ABOUT THE SHIELD GENERATOR" - info = "