diff --git a/modular_chomp/maps/cetus/cetus-1.dmm b/modular_chomp/maps/cetus/cetus-1.dmm index 990f435282..1193215013 100644 --- a/modular_chomp/maps/cetus/cetus-1.dmm +++ b/modular_chomp/maps/cetus/cetus-1.dmm @@ -75,6 +75,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/cetus/meteor/aftstar) +"aal" = ( +/obj/structure/table/bench/wooden, +/obj/structure/fans/tiny, +/turf/simulated/floor/outdoors/rocks/cetus, +/area/crew_quarters/cetus/meteor/atrium) "aam" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/maintenance_panel{ @@ -89,6 +94,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/cetus/meteor/aftstar) +"aan" = ( +/obj/structure/fans/tiny, +/turf/simulated/floor/outdoors/rocks/cetus, +/area/crew_quarters/cetus/meteor/atrium) "aao" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -1643,6 +1652,10 @@ /area/engineering/cetus/jointsubstation) "aIl" = ( /obj/effect/floor_decal/rust, +/obj/structure/sink/kitchen{ + dir = 8; + pixel_x = -13 + }, /turf/simulated/floor/tiled/hydro, /area/maintenance/ab_Hydroponics) "aIm" = ( @@ -6447,6 +6460,10 @@ "dnv" = ( /obj/structure/table/darkglass, /obj/random/mainttoyloot, +/obj/item/reagent_containers/glass/rag{ + pixel_y = 16; + pixel_x = -12 + }, /turf/simulated/floor/lino, /area/maintenance/ab_StripBar) "dny" = ( @@ -29214,6 +29231,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/vending/security_armory_armor, /turf/simulated/floor/tiled/milspec/raised, /area/security/cetus/meteor/armory) "pkC" = ( @@ -43279,6 +43297,10 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/reagent_containers/glass/rag{ + pixel_y = -10; + pixel_x = -5 + }, /turf/simulated/floor/lino, /area/crew_quarters/cetus/meteor/bar) "whp" = ( @@ -44015,6 +44037,10 @@ /obj/structure/table/woodentable, /obj/item/packageWrap, /obj/item/tool/screwdriver, +/obj/item/reagent_containers/glass/rag{ + pixel_y = 16; + pixel_x = -12 + }, /turf/simulated/floor/tiled, /area/crew_quarters/cetus/meteor/bar) "wzo" = ( @@ -46411,6 +46437,10 @@ dir = 1; pixel_y = -27 }, +/obj/structure/sink/kitchen{ + pixel_y = -15; + dir = 1 + }, /turf/simulated/floor/tiled/old_tile/white, /area/maintenance/ab_Kitchen) "xGZ" = ( @@ -101496,7 +101526,7 @@ tId ruy eVo gpb -cfT +aan gpb vvH rur @@ -101753,9 +101783,9 @@ qjJ hUm vvH tEv -gpb +aal skG -gpb +aal vvH vvH moc @@ -102012,7 +102042,7 @@ tId vvH aKf gpb -cfT +aan jQE mgT vvH diff --git a/modular_chomp/maps/cetus/cetus-2.dmm b/modular_chomp/maps/cetus/cetus-2.dmm index 089d926342..a13c083e01 100644 --- a/modular_chomp/maps/cetus/cetus-2.dmm +++ b/modular_chomp/maps/cetus/cetus-2.dmm @@ -506,6 +506,21 @@ }, /turf/simulated/floor/tiled/techmaint, /area/medical/medsci) +"aaY" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/window/maintenance_panel{ + dir = 8 + }, +/obj/structure/window/maintenance_panel, +/obj/structure/window/maintenance_panel{ + dir = 4 + }, +/obj/structure/window/maintenance_panel{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/universal, +/turf/simulated/floor/plating, +/area/maintenance/cetus/twofp) "abm" = ( /obj/structure/railing/overhang/hazard, /obj/structure/closet/emcloset, @@ -8571,7 +8586,7 @@ name = "Medical Hardsuits"; req_one_access = list(5) }, -/obj/item/rig/medical, +/obj/item/rig/medical/equipped, /turf/simulated/floor/tiled/techmaint, /area/ai_monitored/storage/eva) "cNf" = ( @@ -12334,7 +12349,7 @@ name = "Security Hardsuits"; req_one_access = list(1) }, -/obj/item/rig/hazard, +/obj/item/rig/hazard/equipped, /turf/simulated/floor/tiled/techmaint, /area/ai_monitored/storage/eva) "edl" = ( @@ -31770,6 +31785,7 @@ }, /obj/machinery/light, /obj/structure/closet/secure_closet/research_director, +/obj/item/aicard, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/sc/hor) "kPZ" = ( @@ -66381,7 +66397,7 @@ /turf/simulated/floor/tiled, /area/expoutpost/stationshuttle) "wxO" = ( -/obj/machinery/computer/cloning{ +/obj/machinery/computer/transhuman/resleeving{ dir = 1 }, /turf/simulated/floor/bluegrid, @@ -104368,7 +104384,7 @@ pTs sty sty eZn -iue +aaY aab txP txP diff --git a/modular_chomp/maps/cetus/cetus-3.dmm b/modular_chomp/maps/cetus/cetus-3.dmm index 2dd9b23f38..9f709eb78c 100644 --- a/modular_chomp/maps/cetus/cetus-3.dmm +++ b/modular_chomp/maps/cetus/cetus-3.dmm @@ -362,6 +362,14 @@ /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/plating, /area/maintenance/cetus/shallow/fp) +"aaS" = ( +/obj/structure/table/standard, +/obj/random/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/neutral, +/area/maintenance/cetus/shallow/derelict/hallway) "aaZ" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -13540,6 +13548,15 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 10 + }, /turf/simulated/floor/tiled/neutral, /area/maintenance/cetus/shallow/derelict/hallway) "hWb" = ( @@ -16462,16 +16479,15 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/random/obstruction, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 4 + }, /turf/simulated/floor/tiled/neutral, /area/maintenance/cetus/shallow/derelict/hallway) "jOC" = ( @@ -17450,6 +17466,12 @@ dir = 4 }, /obj/machinery/light/small/fluorescent, +/obj/machinery/turretid/stun{ + check_synth = 1; + name = "AI Entry Hall turret control"; + pixel_x = -30; + control_area = "\improper AI Core Entry Hall" + }, /turf/simulated/floor/tiled/techfloor, /area/ai_monitored/aihall) "krU" = ( @@ -18447,9 +18469,6 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 10 - }, /obj/random/maintenance, /obj/item/clothing/head/fishing, /obj/structure/cable{ @@ -18461,10 +18480,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/table/standard, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 4 + }, /turf/simulated/floor/tiled/neutral, /area/maintenance/cetus/shallow/derelict/hallway) "kTR" = ( @@ -20738,6 +20760,7 @@ /obj/machinery/alarm{ pixel_y = 22 }, +/obj/item/aicard, /turf/simulated/floor/plating, /area/tcomm/tcomstorage) "mdF" = ( @@ -28579,6 +28602,20 @@ name = "Station Intercom (General)"; pixel_y = 21 }, +/obj/item/stack/material/log{ + amount = 5; + pixel_y = -1; + pixel_x = -4 + }, +/obj/item/stack/material/log{ + amount = 5; + pixel_y = -1; + pixel_x = 4 + }, +/obj/item/stack/material/log{ + amount = 5; + pixel_y = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/sc/sd) "qJf" = ( @@ -37517,6 +37554,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/item/aicard, /turf/simulated/floor/tiled/white{ color = "#8bbbd5" }, @@ -38896,6 +38934,20 @@ dir = 8; icon_state = "pipe-c" }, +/obj/item/stack/material/log{ + amount = 5; + pixel_y = -1; + pixel_x = -4 + }, +/obj/item/stack/material/log{ + amount = 5; + pixel_y = -1; + pixel_x = 4 + }, +/obj/item/stack/material/log{ + amount = 5; + pixel_y = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/cetus/Galleryf2) "wJe" = ( @@ -87708,7 +87760,7 @@ qev gFE nIu nIG -nIG +aaS vVe kYo pLH