diff --git a/maps/intrepid/intrepid1.dmm b/maps/intrepid/intrepid1.dmm index 34383cdee11..1fb1ef99ca6 100644 --- a/maps/intrepid/intrepid1.dmm +++ b/maps/intrepid/intrepid1.dmm @@ -1487,9 +1487,11 @@ /turf/simulated/floor/carpet/brown, /area/intrepid/department/medical/therapy) "bpB" = ( -/obj/machinery/jukebox/old, -/turf/simulated/floor/wood/walnut, -/area/intrepid/department/civillian/mess) +/obj/random/maintenance, +/obj/machinery/suit_cycler/mining, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/misc/maint/starboard) "bpK" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2175,7 +2177,7 @@ name = "Senator Quarters Window Blast Door button"; pixel_x = -25 }, -/obj/item/reagent_containers/food/drinks/glass2/coffeecup/STC, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/SCG, /turf/simulated/floor/tiled/techfloor, /area/intrepid/department/command/commandquarters/tgs) "bVS" = ( @@ -3032,12 +3034,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/valve/shutoff/scrubbers, -/obj/machinery/atmospherics/valve/shutoff/supply, -/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, -/area/intrepid/department/cargo/cargostorage) +/area/intrepid/misc/maint/starboard) "cHI" = ( /obj/effect/floor_decal/corner/research/border, /obj/machinery/light, @@ -3650,7 +3650,13 @@ /turf/simulated/floor/tiled/white, /area/intrepid/department/civillian/galleybackroom) "djU" = ( -/turf/simulated/wall/prepainted, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor, /area/intrepid/misc/maint/starboard) "djX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5132,15 +5138,15 @@ /obj/structure/disposalpipe/segment/bent{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /turf/simulated/floor, /area/intrepid/misc/maint/starboard) "emZ" = ( @@ -7605,13 +7611,9 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/commandquarters/co) "gAI" = ( -/obj/structure/table/standard, -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 +/obj/machinery/light{ + dir = 4 }, -/obj/item/paper_bin, -/obj/item/pen, /turf/simulated/floor/wood/walnut, /area/intrepid/department/civillian/mess) "gAL" = ( @@ -10043,6 +10045,9 @@ /turf/simulated/floor/tiled/dark, /area/intrepid/misc/hallway/portside) "iIg" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/intrepid/misc/maint/internalstarboard) "iIl" = ( @@ -11801,9 +11806,6 @@ c_tag = "Command - Command Hallway Amidships"; dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/intrepid/misc/hallway/center) "knx" = ( @@ -11985,7 +11987,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/airlock/maintenance, /turf/simulated/floor, /area/intrepid/misc/maint/portside) "kwB" = ( @@ -12480,7 +12481,6 @@ /area/intrepid/department/civillian/hydroponics) "kTC" = ( /obj/random_multi/single_item/piano, -/obj/effect/decal/cleanable/cobweb, /turf/simulated/floor, /area/intrepid/misc/maint/starboard) "kTJ" = ( @@ -12889,10 +12889,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/random/maintenance, /turf/simulated/floor, /area/intrepid/misc/maint/internalstarboard) "lnr" = ( @@ -13617,8 +13613,6 @@ c_tag = "Service - Upper Mess Hall"; dir = 8 }, -/obj/structure/table/standard, -/obj/item/sticky_pad/random, /turf/simulated/floor/wood/walnut, /area/intrepid/department/civillian/mess) "lTY" = ( @@ -15845,9 +15839,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor, /area/intrepid/misc/maint/starboard) "nCL" = ( @@ -18219,9 +18210,6 @@ /obj/machinery/ship_map{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/intrepid/misc/hallway/center) "pEa" = ( @@ -18582,10 +18570,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance, /turf/simulated/floor, /area/intrepid/misc/maint/starboard) "pOn" = ( @@ -19336,15 +19320,15 @@ dir = 1; icon_state = "pipe-c" }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /turf/simulated/floor, /area/intrepid/misc/maint/internalstarboard) "qsL" = ( @@ -21370,10 +21354,8 @@ /turf/simulated/floor, /area/intrepid/misc/maint/starboard) "sdB" = ( -/obj/random/maintenance, -/obj/machinery/suit_cycler/mining, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/effect/wallframe_spawn/no_grille, +/turf/simulated/floor, /area/intrepid/department/cargo/cargostorage) "sdI" = ( /obj/structure/table/rack, @@ -21459,10 +21441,7 @@ /turf/simulated/floor/carpet/purple, /area/intrepid/department/command/commandquarters/rd) "sgJ" = ( -/obj/structure/table/standard, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/jukebox/old, /turf/simulated/floor/wood/walnut, /area/intrepid/department/civillian/mess) "shd" = ( @@ -24117,9 +24096,6 @@ color = "#666666"; dir = 8 }, -/mob/living/simple_animal/hostile/retaliate/tegu/atlas{ - dir = 8 - }, /turf/simulated/floor/tiled/dark/monotile, /area/intrepid/department/command/bridge) "ulq" = ( @@ -24168,9 +24144,10 @@ /turf/simulated/floor/tiled/white, /area/intrepid/department/medical/morgue) "umd" = ( -/obj/item/stool/padded, -/turf/simulated/floor/wood/walnut, -/area/intrepid/department/civillian/mess) +/obj/machinery/suit_cycler/salvage, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/intrepid/misc/maint/starboard) "umm" = ( /obj/structure/bed/chair/office/comfy/black{ dir = 1 @@ -25150,9 +25127,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor, /area/intrepid/misc/maint/internalstarboard) "vgc" = ( @@ -26911,10 +26885,11 @@ /turf/simulated/floor/tiled/white, /area/space) "wKy" = ( -/obj/machinery/suit_cycler/salvage, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/techfloor/grid, -/area/intrepid/department/cargo/cargostorage) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/intrepid/misc/maint/starboard) "wKB" = ( /obj/machinery/vitals_monitor, /obj/effect/floor_decal/industrial/outline/yellow, @@ -27232,11 +27207,11 @@ /turf/simulated/floor, /area/intrepid/misc/maint/aft) "wWo" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 +/obj/machinery/door/firedoor{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/intrepid/misc/hallway/center) +/turf/simulated/floor, +/area/intrepid/misc/maint/portside) "wWw" = ( /obj/machinery/door/blast/shutters{ dir = 4; @@ -27357,9 +27332,11 @@ /turf/simulated/floor/tiled/white, /area/space) "xbg" = ( -/obj/structure/table/standard, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor, -/area/intrepid/misc/maint/portside) +/area/intrepid/misc/maint/starboard) "xbP" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 4 @@ -28139,6 +28116,9 @@ }, /obj/structure/table/standard, /obj/item/storage/box/cdeathalarm_kit, +/mob/living/simple_animal/hostile/retaliate/tegu/atlas{ + density = 0 + }, /turf/simulated/floor/tiled/dark, /area/intrepid/department/command/bridge) "xMk" = ( @@ -28593,12 +28573,14 @@ /turf/simulated/floor, /area/space) "ylH" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/atmospherics/valve/shutoff/scrubbers, +/obj/machinery/atmospherics/valve/shutoff/supply, +/turf/simulated/floor, /area/intrepid/department/cargo/cargostorage) "ylJ" = ( /obj/effect/floor_decal/solarpanel, @@ -40839,7 +40821,7 @@ adF fLr rXr vVc -xbg +fNC eVK biS mGf @@ -41012,7 +40994,7 @@ jiY eRc wkY emY -rsa +xbg rsa cpl msM @@ -41041,7 +41023,7 @@ adF fLr rXr vVc -xbg +fNC iqQ jOe rgY @@ -41214,7 +41196,7 @@ kRK oTl oTl nCs -rsa +wKy rsa cpl msM @@ -41416,7 +41398,7 @@ qgH hlM oTl nCs -rsa +wKy qKJ cpl msM @@ -41649,7 +41631,7 @@ rXr vVc vVc kwA -olh +wWo cao jMF aNE @@ -44226,7 +44208,7 @@ fRQ qNy gQJ gdk -bpB +cRN iod aUH aUH @@ -44832,7 +44814,7 @@ lRd uvA sbS iZe -umd +cRN cRN cRN pab @@ -51700,7 +51682,7 @@ msM sUD htq txh -eRv +bpB sdB kWu qeC @@ -51902,8 +51884,8 @@ qgh kKr aQj aTz -eRv -wKy +umd +sdB ccy pif cAI @@ -52306,7 +52288,7 @@ qLh bRG fvN jBI -eRv +iiX eRv tUv oag @@ -52340,7 +52322,7 @@ uoT oxV kmR pDy -wWo +dnj rLc jic stl @@ -52508,7 +52490,7 @@ vHs qgh aQj nDj -iiX +rsa eRv caf ccy