diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 86aa962e82af..0a8483f718fb 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -202,9 +202,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) @@ -366,7 +363,7 @@ dir = 4; pixel_y = -7; pixel_x = -23; - id = "kiloengine" + id = "danielengine" }, /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -523,9 +520,6 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/terminal{ - dir = 1 - }, /turf/open/floor/wood/birch, /area/ship/crew) "ok" = ( @@ -565,9 +559,6 @@ /obj/item/clothing/suit/fire/atmos, /obj/item/clothing/mask/gas/atmos, /obj/item/clothing/head/hardhat/atmos, -/obj/structure/closet/wall/directional/east{ - name = "Atmospheric locker" - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -626,9 +617,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -640,9 +628,6 @@ icon_state = "0-2" }, /obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/power/terminal{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -814,7 +799,7 @@ /obj/structure/cable{ icon_state = "0-1" }, -/obj/machinery/power/terminal, +/obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plating, /area/ship/engineering/engine) "yR" = ( @@ -1009,9 +994,6 @@ icon_state = "0-1" }, /obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/circuit, @@ -1080,9 +1062,6 @@ icon_state = "0-1" }, /obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/power/terminal{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -1104,7 +1083,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters{ - id = "kiloengine"; + id = "danielengine"; name = "Engine Shutters"; dir = 8 }, @@ -1233,8 +1212,15 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "OP" = ( -/obj/machinery/power/apc, -/turf/closed/wall/r_wall, +/obj/machinery/door/poddoor/shutters{ + id = "DanielGarage" + }, +/obj/structure/fans/tiny, +/obj/docking_port/mobile{ + dir = 2; + name = "Daniel" + }, +/turf/open/floor/plating, /area/ship/engineering/engine) "OT" = ( /obj/structure/salvageable/circuit_imprinter, @@ -1242,9 +1228,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/terminal{ - dir = 1 - }, /turf/open/floor/plating, /area/ship/maintenance/central) "PF" = ( @@ -1373,7 +1356,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters{ - id = "kiloengine"; + id = "danielengine"; name = "Engine Shutters"; dir = 8 }, @@ -1500,7 +1483,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters{ - id = "kiloengine"; + id = "danielengine"; name = "Engine Shutters"; dir = 4 }, @@ -1564,9 +1547,6 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/terminal{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) @@ -1574,6 +1554,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/railing{ + name = "Railing (my 12 gauge shotgun loaded with slugs) that stops the non stop evercoming horde of pure evil and dasterdlyness (girlscouts) from breaching my defences (my lawn) to stop them from giving me their profane weapons of heathen conversion (cookies)" + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Zz" = ( @@ -1669,7 +1652,7 @@ qQ vj VM yD -OP +tK wy "} (7,1,1) = {" @@ -1703,8 +1686,8 @@ tK wy "} (9,1,1) = {" -wy -aL +Nk +OP NI NI NI @@ -1928,7 +1911,7 @@ mn wy "} (24,1,1) = {" -Nk +wy Gl ca PF diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm index 7e96d8f93b53..2e7bd2b6f42c 100644 --- a/_maps/shuttles/independent/independent_lagoon.dmm +++ b/_maps/shuttles/independent/independent_lagoon.dmm @@ -4987,7 +4987,7 @@ /turf/open/floor/wood, /area/ship/bridge) "HA" = ( -/obj/structure/table/reinforced, +/obj/docking_port/mobile, /obj/machinery/recharger, /obj/item/paper{ default_raw_text = "Reminder that passengers are NOT permitted to carry weapons on board.";