From 6268e9acd927c5a919edfa0d966601cb2cff2f41 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Feb 2024 15:03:07 +0100 Subject: [PATCH 01/15] adding a checkpoint and deleting old areas. --- code/game/area/BigRed.dm | 107 ++-- maps/map_files/BigRed/BigRed.dmm | 838 +++++++++++++++---------------- 2 files changed, 456 insertions(+), 489 deletions(-) diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm index 57e062195a3c..15122f01c8f6 100644 --- a/code/game/area/BigRed.dm +++ b/code/game/area/BigRed.dm @@ -1,4 +1,5 @@ //Areas for BigRed - Minijar +// old icon state no longer in use. ("hydro","heads_quarters") /area/bigred can_build_special = TRUE powernet_name = "ground" @@ -251,44 +252,50 @@ name = "\improper Corporate Saferoom" icon_state = "vault" -/area/bigred/uground/lambda_labs/ - minimap_color = MINIMAP_AREA_RESEARCH_CAVE -/area/bigred/uground/lambda_labs/airlock - name = "\improper Lambda Labs Airlock" - icon_state = "decontamination" - -/area/bigred/uground/lambda_labs/lobby - name = "\improper Lambda Labs Reception" - icon_state = "bluenew" - -/area/bigred/uground/lambda_labs/office - name = "\improper Lambda Labs Administration" - icon_state = "heads_quarters" +// all the lambda area bellow. -/area/bigred/uground/lambda_labs/laser_lab - name = "\improper Lambda Laser Laboratory" - icon_state = "toxmisc" +// Laboratory proper +/area/bigredv2/caves/lambda + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS + ceiling_muffle = FALSE + ambience_exterior = AMBIENCE_ALMAYER + sound_environment = SOUND_ENVIRONMENT_ROOM + soundscape_playlist = list() + minimap_color = MINIMAP_AREA_RESEARCH -/area/bigred/uground/lambda_labs/hydro_office - name = "\improper Lambda Labs Bio-Dome" - icon_state = "hydro" +/area/bigredv2/caves/lambda/virology + name = "\improper Lambda Virology" + icon_state = "lam_virology" -/area/bigred/uground/lambda_labs/hydro_lab - name = "\improper Lambda Labs Hydrophonics" - icon_state = "garden" +/area/bigredv2/caves/lambda/research + name = "\improper Lambda Research" + icon_state = "lam_research" -/area/bigred/uground/lambda_labs/fridge - name = "\improper Lambda Labs Refrigeration" - icon_state = "kitchen" +/area/bigredv2/caves/lambda/breakroom + name = "\improper Lambda Breakroom" + icon_state = "lam_break" -/area/bigred/uground/lambda_labs/maintenance - name = "\improper Unknown Area" - icon_state = "yellow" +/area/bigredv2/caves/lambda/xenobiology + name = "\improper Lambda Xenobiology" + icon_state = "lam_xeno" -/area/bigred/uground/lambda_labs/maintenance2 - name = "\improper Unknown Area" - icon_state = "blue" +// cave around the laboratory. +/area/bigredv2/caves_lambda + name = "\improper Lambda Lab Caves" + icon_state = "caves_lambda" + ceiling = CEILING_UNDERGROUND_BLOCK_CAS + sound_environment = SOUND_ENVIRONMENT_AUDITORIUM + ceiling_muffle = FALSE + ambience_exterior = AMBIENCE_CAVE + soundscape_playlist = SCAPE_PL_CAVE + base_muffle = MUFFLE_HIGH +// serve for the security checkpoint. +/area/bigredv2/outside/lambda_cave_cas + name = "\improper Lambda Lockdown Caves Entrance" + icon_state = "decontamination" + ceiling = CEILING_UNDERGROUND_ALLOW_CAS + minimap_color = MINIMAP_AREA_SEC //Big Red V2 /area/bigredv2 @@ -551,29 +558,6 @@ icon_state = "party" ceiling = CEILING_METAL -/area/bigredv2/caves/lambda - ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS - ceiling_muffle = FALSE - ambience_exterior = AMBIENCE_ALMAYER - sound_environment = SOUND_ENVIRONMENT_ROOM - soundscape_playlist = list() - -/area/bigredv2/caves/lambda/virology - name = "\improper Lambda Virology" - icon_state = "lam_virology" - -/area/bigredv2/caves/lambda/research - name = "\improper Lambda Research" - icon_state = "lam_research" - -/area/bigredv2/caves/lambda/breakroom - name = "\improper Lambda Breakroom" - icon_state = "lam_break" - -/area/bigredv2/caves/lambda/xenobiology - name = "\improper Lambda Xenobiology" - icon_state = "lam_xeno" - /area/bigredv2/outside/general_offices name = "\improper General Offices" icon_state = "storage" @@ -630,16 +614,6 @@ soundscape_playlist = SCAPE_PL_CAVE base_muffle = MUFFLE_HIGH -/area/bigredv2/caves_lambda - name = "\improper Lambda Lab Caves" - icon_state = "caves_lambda" - ceiling = CEILING_UNDERGROUND_BLOCK_CAS - sound_environment = SOUND_ENVIRONMENT_AUDITORIUM - ceiling_muffle = FALSE - ambience_exterior = AMBIENCE_CAVE - soundscape_playlist = SCAPE_PL_CAVE - base_muffle = MUFFLE_HIGH - /area/bigredv2/caves_north name = "\improper Northern Caves" icon_state = "caves_north" @@ -688,8 +662,3 @@ name = "\improper Filtration Lockdown Caves Entrance" icon_state = "garden" ceiling = CEILING_UNDERGROUND_ALLOW_CAS - -/area/bigredv2/outside/lambda_cave_cas - name = "\improper Lambda Lockdown Caves Entrance" - icon_state = "garden" - ceiling = CEILING_UNDERGROUND_ALLOW_CAS diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index cd01b5cb8040..8283dcd78f76 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -15051,18 +15051,13 @@ icon_state = "delivery" }, /area/bigredv2/outside/library) -"aRv" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_22" - }, -/area/bigredv2/outside/lambda_cave_cas) "aRw" = ( /obj/effect/landmark/crap_item, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ icon_state = "mars_cave_6" }, -/area/bigredv2/outside/lambda_cave_cas) +/area/bigredv2/caves_lambda) "aRx" = ( /obj/structure/machinery/teleport/station, /turf/open/floor{ @@ -15336,19 +15331,18 @@ /area/bigredv2/outside/e) "aSj" = ( /obj/effect/decal/remains/human, -/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ dir = 5; icon_state = "asteroidwarning" }, /area/bigredv2/outside/lambda_cave_cas) "aSk" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/mars_cave{ - icon_state = "mars_cave_8" + icon_state = "mars_cave_5" }, -/area/bigredv2/outside/lambda_cave_cas) +/area/bigredv2/caves_lambda) "aSl" = ( /obj/structure/machinery/light{ dir = 8 @@ -15796,16 +15790,6 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) -"aTo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/e) "aTp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -15858,6 +15842,9 @@ /area/bigredv2/caves_lambda) "aTx" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor{ dir = 1; icon_state = "asteroidwarning" @@ -15867,6 +15854,9 @@ /obj/structure/machinery/light{ dir = 1 }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor{ dir = 1; icon_state = "asteroidwarning" @@ -15875,11 +15865,14 @@ "aTz" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor{ dir = 1; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/lambda_cave_cas) +/area/bigredv2/caves_lambda) "aTC" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -16132,77 +16125,14 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/e) -"aUo" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 - }, -/turf/open/floor{ - dir = 10; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/e) "aUp" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) -"aUq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/e) -"aUr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/e) -"aUs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/e) -"aUu" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda"; - name = "Lambda Lockdown" - }, -/turf/open/floor{ - icon_state = "delivery" - }, -/area/bigredv2/outside/lambda_cave_cas) -"aUv" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/lambda_cave_cas) "aUw" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; id = "lambda"; @@ -16214,33 +16144,18 @@ /area/bigredv2/outside/lambda_cave_cas) "aUx" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" }, /area/bigredv2/outside/lambda_cave_cas) -"aUy" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) "aUA" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor{ icon_state = "asteroidwarning" }, -/area/bigredv2/outside/lambda_cave_cas) +/area/bigredv2/caves_lambda) "aUD" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -17200,10 +17115,12 @@ /turf/open/floor, /area/bigredv2/outside/office_complex) "aXt" = ( -/turf/open/mars_cave{ - icon_state = "mars_dirt_6" +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 }, -/area/bigredv2/outside/e) +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "aXu" = ( /obj/structure/machinery/computer/med_data, /turf/open/floor{ @@ -17376,10 +17293,12 @@ }, /area/bigredv2/outside/e) "aXX" = ( -/turf/open/mars_cave{ - icon_state = "mars_dirt_5" +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/light{ + dir = 8 }, -/area/bigredv2/outside/e) +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "aXY" = ( /turf/open/floor{ dir = 10; @@ -17513,9 +17432,6 @@ /area/bigredv2/outside/e) "aYw" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /turf/open/floor{ dir = 1; icon_state = "asteroidwarning" @@ -17531,15 +17447,8 @@ }, /area/bigredv2/outside/e) "aYy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/e) +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "aYA" = ( /obj/structure/closet/l3closet/virology, /turf/open/floor{ @@ -17853,14 +17762,6 @@ icon_state = "cult" }, /area/bigredv2/outside/chapel) -"aZI" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 6 - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/chapel) "aZJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -17868,14 +17769,6 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/filtration_plant) -"aZK" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/chapel) "aZL" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/maint/colony{ @@ -18089,16 +17982,6 @@ icon_state = "chapel" }, /area/bigredv2/outside/chapel) -"bas" = ( -/obj/structure/bed/chair/wood/normal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - dir = 1; - icon_state = "chapel" - }, -/area/bigredv2/outside/chapel) "bat" = ( /turf/open/floor{ dir = 4; @@ -18243,16 +18126,6 @@ icon_state = "chapel" }, /area/bigredv2/outside/chapel) -"baV" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/bed/chair/wood/normal{ - dir = 8 - }, -/turf/open/floor{ - dir = 8; - icon_state = "chapel" - }, -/area/bigredv2/outside/chapel) "baW" = ( /turf/open/floor{ icon_state = "chapel" @@ -27193,6 +27066,17 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"cBg" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ + name = "\improper Marshal Office Armory" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "cBq" = ( /obj/structure/machinery/camera/autoname{ dir = 1 @@ -27241,12 +27125,11 @@ }, /area/bigredv2/outside/marshal_office) "cGQ" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ dir = 6; icon_state = "asteroidwarning" }, -/area/bigredv2/caves) +/area/bigredv2/outside/lambda_cave_cas) "cGT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/power/apc{ @@ -27916,6 +27799,12 @@ icon_state = "mars_cave_16" }, /area/bigredv2/caves/mining) +"dFW" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "dHr" = ( /obj/effect/decal/cleanable/blood{ icon_state = "gib6"; @@ -27994,11 +27883,6 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves_lambda) -"dLe" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_5" - }, -/area/bigredv2/outside/lambda_cave_cas) "dNd" = ( /obj/item/stack/cable_coil/cut, /turf/open/mars_cave{ @@ -28381,6 +28265,11 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/eta) +"epu" = ( +/obj/structure/surface/table/reinforced, +/obj/item/device/camera, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "eql" = ( /turf/open/mars_cave{ icon_state = "mars_cave_9" @@ -29009,16 +28898,6 @@ icon_state = "mars_cave_22" }, /area/bigredv2/caves_east) -"foT" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/e) "fpa" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -8; @@ -29567,6 +29446,10 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/outside/lz1_north_cas) +"gfv" = ( +/obj/structure/window/framed/solaris/reinforced, +/turf/open/floor/plating, +/area/bigredv2/outside/lambda_cave_cas) "gfX" = ( /obj/structure/sign/safety/hazard{ pixel_y = -32 @@ -29632,6 +29515,12 @@ icon_state = "delivery" }, /area/bigredv2/outside/cargo) +"gkN" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/mars_cave{ + icon_state = "mars_cave_8" + }, +/area/bigredv2/outside/lambda_cave_cas) "glB" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/solaris/reinforced, @@ -29982,6 +29871,10 @@ }, /turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/mining) +"gSJ" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "gTJ" = ( /obj/structure/machinery/autolathe, /turf/open/floor/plating, @@ -30320,6 +30213,15 @@ icon_state = "dark" }, /area/bigredv2/caves/lambda/research) +"hwG" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/caves_lambda) "hxs" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/effect/landmark/objective_landmark/far, @@ -30503,6 +30405,10 @@ /turf/open/mars_cave, /area/bigredv2/caves/mining) "hLs" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor{ dir = 1; icon_state = "asteroidwarning" @@ -30607,6 +30513,11 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves/mining) +"hXM" = ( +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/e) "hYB" = ( /obj/structure/platform{ dir = 1 @@ -30847,6 +30758,14 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"inP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/e) "ioA" = ( /obj/item/tool/pickaxe{ pixel_y = -7 @@ -30944,7 +30863,9 @@ /area/bigredv2/caves/mining) "ixR" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" @@ -31083,6 +31004,9 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port_lz2) +"iHG" = ( +/turf/closed/wall/solaris, +/area/bigredv2/outside/lambda_cave_cas) "iIp" = ( /obj/effect/landmark/nightmare{ insert_tag = "chapel" @@ -31099,12 +31023,6 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) -"iKn" = ( -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/lambda_cave_cas) "iLs" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -31277,12 +31195,6 @@ icon_state = "dark" }, /area/bigredv2/outside/admin_building) -"iZi" = ( -/obj/structure/machinery/light, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lambda_cave_cas) "iZA" = ( /obj/structure/surface/rack, /turf/open/floor, @@ -31340,6 +31252,11 @@ icon_state = "mars_dirt_3" }, /area/bigredv2/outside/s) +"jeH" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/recharger, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "jeO" = ( /turf/open/mars{ icon_state = "mars_dirt_13" @@ -31466,6 +31383,9 @@ }, /turf/open/floor, /area/bigredv2/outside/dorms) +"jov" = ( +/turf/open/space/basic, +/area/space) "jph" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -31666,6 +31586,13 @@ icon_state = "mars_cave_16" }, /area/bigredv2/caves/mining) +"jFM" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "jGd" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -32246,6 +32173,15 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"kja" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/e) "kjr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, @@ -32627,14 +32563,6 @@ icon_state = "dark" }, /area/bigredv2/outside/engineering) -"kNP" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 - }, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) "kOv" = ( /obj/structure/largecrate/random, /turf/open/floor{ @@ -32764,9 +32692,6 @@ icon_state = "whitegreen" }, /area/bigredv2/outside/medical) -"kYd" = ( -/turf/closed/wall/solaris/reinforced/hull, -/area/bigredv2/outside/e) "kZG" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/bible/hefa, @@ -33143,6 +33068,15 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"lIB" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/e) "lID" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -33653,6 +33587,12 @@ "muP" = ( /turf/closed/wall/wood, /area/bigredv2/caves_research) +"muT" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/chapel) "mxf" = ( /turf/open/floor{ dir = 9; @@ -33898,6 +33838,14 @@ icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) +"mTJ" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ + name = "\improper Marshal Office Armory" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "mUy" = ( /turf/open/mars_cave{ icon_state = "mars_cave_7" @@ -34488,11 +34436,6 @@ icon_state = "dark" }, /area/bigredv2/outside/engineering) -"nVw" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_23" - }, -/area/bigredv2/outside/lambda_cave_cas) "nVx" = ( /turf/open/floor{ dir = 4; @@ -34922,6 +34865,16 @@ icon_state = "mars_cave_5" }, /area/bigredv2/outside/filtration_cave_cas) +"oyM" = ( +/obj/structure/bed/chair/wood/normal{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 4; + icon_state = "chapel" + }, +/area/bigredv2/outside/chapel) "ozf" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -34959,6 +34912,11 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves_virology) +"oCk" = ( +/obj/structure/window/framed/solaris/reinforced, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating, +/area/bigredv2/outside/lambda_cave_cas) "oDB" = ( /obj/structure/closet/l3closet, /obj/effect/landmark/objective_landmark/close, @@ -35657,6 +35615,15 @@ icon_state = "mars_cave_2" }, /area/bigredv2/outside/ne) +"pJq" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "pJt" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -36071,11 +36038,6 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) -"qkB" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_8" - }, -/area/bigredv2/caves) "qkC" = ( /obj/structure/fence, /turf/open/floor{ @@ -36733,6 +36695,11 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"rma" = ( +/obj/structure/surface/table/reinforced, +/obj/item/handcuffs, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "rml" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor, @@ -37801,12 +37768,6 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) -"sIh" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "lambda-cave-extratunnel" - }, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) "sIP" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -38021,15 +37982,6 @@ /obj/effect/decal/cleanable/dirt/greenglow, /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/engineering) -"tdn" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 6 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/caves_lambda) "tdp" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgib4" @@ -38479,6 +38431,15 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves_research) +"tFp" = ( +/obj/structure/bed/chair/wood/normal{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "chapel" + }, +/area/bigredv2/outside/chapel) "tFt" = ( /obj/structure/surface/table, /obj/structure/machinery/light, @@ -38807,6 +38768,10 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port_lz2) +"ufg" = ( +/obj/structure/surface/table/reinforced, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "ufu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, @@ -38988,7 +38953,6 @@ }, /area/bigredv2/caves_east) "uuo" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ icon_state = "mars_cave_18" }, @@ -39326,6 +39290,12 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/filtration_plant) +"uUs" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/lambda_cave_cas) "uUV" = ( /obj/structure/prop/server_equipment/yutani_server/broken, /turf/open/floor/greengrid, @@ -39366,6 +39336,10 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves_sw) +"vaS" = ( +/obj/structure/machinery/light, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "vbi" = ( /turf/open/floor{ dir = 5; @@ -39379,10 +39353,13 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) -"vcm" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +"vbI" = ( +/obj/structure/machinery/light{ + dir = 1 }, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) +"vcm" = ( /turf/open/floor{ icon_state = "asteroidwarning" }, @@ -39417,6 +39394,11 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) +"vdy" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/structure/surface/table/reinforced, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "vdS" = ( /obj/item/explosive/grenade/incendiary/molotov{ pixel_x = -10; @@ -40774,6 +40756,19 @@ icon_state = "warnplate" }, /area/bigredv2/outside/telecomm/warehouse) +"xdh" = ( +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda"; + name = "Lambda Lockdown" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "xej" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -41390,6 +41385,9 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) +"xXN" = ( +/turf/closed/wall/solaris/rock, +/area/bigredv2/outside/lambda_cave_cas) "xXP" = ( /obj/structure/prop/invuln/minecart_tracks/bumper, /turf/open/mars_cave{ @@ -73195,8 +73193,8 @@ aOb aQo aQl aqU -aTo -aUo +qhl +aVv aUk aKP aKP @@ -73412,8 +73410,8 @@ aPi aQp aQm aqU -aTp -aTk +qhl +hXM aUk aKP aKP @@ -73629,7 +73627,7 @@ aPj aQq aRs anT -aTp +qhl aUp aUk aKP @@ -73846,7 +73844,7 @@ anW anW anW anW -aTq +aDy aUp aUk aKP @@ -74063,8 +74061,8 @@ aEi aQr anW aTq -aTq -aTk +aDy +hXM aUk aKP aWL @@ -74280,7 +74278,7 @@ aEi aEi aqx aTq -aTq +aDy aUp aUk aKP @@ -74497,7 +74495,7 @@ aPk aEi aqx aTq -aTq +aDy aUp aQu aVr @@ -74714,7 +74712,7 @@ aPl aQs anW aTq -aTp +qhl aUp aQu aUk @@ -74931,8 +74929,8 @@ aPm aQt aRu nnK -aTt -aUq +inP +aUp aQu aUk aKP @@ -75148,8 +75146,8 @@ aPn aEi ocA aTq -aTp -aUr +qhl +aUp aQu aQu aOk @@ -75365,8 +75363,8 @@ aPo aQs anW aTq -aTq -aUs +kja +aTt aSf aSf aWM @@ -75582,8 +75580,8 @@ aPp aEi aqx aTq -aTq -foT +aDy +aTp aSg aSg aSg @@ -75799,7 +75797,7 @@ aEi aEi aqx aTq -aTq +aDy aUp aQu aVq @@ -76016,7 +76014,7 @@ aoc anW anW aTq -aTp +qhl aUp aUk aKP @@ -76233,7 +76231,7 @@ aSg aSg aSg aSg -aTp +qhl aUp aUk aKP @@ -76242,10 +76240,10 @@ aKP aSh aYx atb -aZI -bas -baV -bbG +nRT +bar +baU +bbF bar baU nRT @@ -76450,19 +76448,19 @@ aKP aKP aMR aQu -aTr +aYx aUp aQu aVr aKP aKP aSh -aYx -atd -bbF -bap -baT -bbF +lIB +aZh +muT +oyM +tFp +bbG bap baT nRT @@ -76667,16 +76665,16 @@ aKP aMR aQu aSi -aTq -foT +aDy +aTp aVv aQu aOk aOk aQu aYw -atd -bbF +aZi +nRT bar baU bbH @@ -76882,18 +76880,18 @@ aMR aOk aOk aQu -kYd -wNw -wNw -aUu -wNw -kYd -aQu aQu -aQu -aYw -atb -bbF +aTr +aDy +aTq +hXM +gfv +gfv +gfv +apI +mTJ +iHG +nRT bap baT bbF @@ -77096,21 +77094,21 @@ aao aao aao aao -apI -apI -apI -apI -hLs -iKn -aUv -iZi -kYd aQu aQu +aQu +aQu +aTr +aDy +aTq +hXM +gfv +ufg +epu aXX aYy -aZh -aZK +iHG +nRT bao baS bbF @@ -77318,15 +77316,15 @@ aao aao apI wNw -wNw +xdh aUw wNw apI -apI +jeH aXt -aXX -aTr -aZi +aYy +aYy +iHG nRT bat baW @@ -77538,12 +77536,12 @@ aSj ixR aUx cGQ -aao -aao -aXt -aXt -aTr -atb +gfv +ufg +aYy +aYy +aYy +iHG nRT aJy aJy @@ -77750,17 +77748,17 @@ aao aao aao aao -aao +xXN sYL aTx vcm -qkB -aao -aao -aao -aao -aTr -atb +sYL +gfv +aYy +aYy +aYy +aYy +iHG atb atb atb @@ -77967,17 +77965,17 @@ aao aao aao aao -aao -sYL +apI +cIq aTx vcm -sYL -aao -aao -aao -aao -aao -aao +hSs +apI +vbI +aYy +aYy +vaS +apI aao aao aao @@ -78184,17 +78182,17 @@ aao aao aao aao -aao +xXN sYL aTx vcm aVw -aao -aao -aao -aao -aao -aao +gfv +aYy +aYy +aYy +aYy +xXN aao aao aao @@ -78401,17 +78399,17 @@ eMX aao aao aao -gNH -cIq +sYL +gkN hLs -vcm -hSs -gNH -aao -aao -aao -aao -aao +uUs +gkN +oCk +vdy +gSJ +gSJ +gSJ +xXN aao aao aao @@ -78618,20 +78616,20 @@ eFh aao aao aao -aRv -nVw -hLs -vcm -qkB -aao -aao -aao -aao -aao +apI +wNw +xdh +wNw +wNw +apI +jeH +dFW +aYy +aYy +xXN aao -sON -sfI aao +gCE aao aao aao @@ -78836,17 +78834,17 @@ aao aao aao aao -sYL -hLs -vcm -aao -aao -aao -aao -aao +amG +pJq +aMT +tQw +gfv +ufg +rma +jFM +aYy +apI aao -sON -gCE gCE rAs rAs @@ -79053,16 +79051,16 @@ tQw aao aao aao -sYL -hLs -vcm -aao -aao -aao -aao -aao -aao -ecK +ujC +pJq +aMT +ujC +gfv +gfv +gfv +apI +cBg +apI gCE gCE gCE @@ -79273,12 +79271,12 @@ aao aSk aTz aUA -aao -aao -aao -aao -aao -sON +ujC +ujC +tQw +gCE +gCE +gCE gCE gCE gCE @@ -79487,15 +79485,15 @@ gXp gXp gXp aRw -dLe -hLs -vcm -aao -aao -aao -aao -aao -ecK +eFh +pJq +aMT +tQw +ujC +ujC +gCE +gCE +gCE gCE gCE gCE @@ -79705,14 +79703,14 @@ tQw tQw tQw eFh -aTw -aUy -amG -aao -aao -aao -aao -ecK +pJq +aMT +tQw +tQw +pIN +gCE +gCE +gCE gCE gCE gCE @@ -79922,14 +79920,14 @@ tQw tQw tQw eFh -aTw -aUy -wQC -eMX -aao -aao -aao -ecK +pJq +aMT +tQw +tQw +aWN +gCE +gCE +gCE gCE xuU qFY @@ -80140,12 +80138,12 @@ tQw tQw arK aTy -aUy -wQC -sNQ -aao -aao -sON +aMT +tQw +tQw +ujC +gCE +gCE gCE gCE gCE @@ -80356,12 +80354,12 @@ aOm aOm aOm aSl -aTv -aUy -amG -aao -aao -jgW +hwG +aMT +tQw +ujC +ujC +gCE gCE gCE gCE @@ -80573,12 +80571,12 @@ aOn aOn aOn aTv -tdn -kNP -wQC -gXp -qQn +hwG +aMT tQw +tQw +pIN +gCE gCE gCE gpg @@ -80792,10 +80790,10 @@ gXp aTw ocR uoj -wQC tQw -aWN tQw +aWN +gCE gCE ohD aao @@ -81011,9 +81009,9 @@ aTv aMT tQw tQw -pIN -xFZ -ohD +ujC +gCE +gCE aao aao aao @@ -81227,8 +81225,8 @@ aSm lMw aMT tQw -xFZ -ahy +tQw +ujC aao aao aao @@ -81443,10 +81441,10 @@ aao aao aSm aMV -sNQ +tQw +aao aao aao -sIh aao aao aao @@ -88844,7 +88842,7 @@ aab aaa aaa aaa -aaa +jov aaa aaa aaa @@ -89061,7 +89059,7 @@ aab aaa aaa aaa -aaa +jov aaa aaa aaa From a76c73f63c7d3f427c75aefc2910644007be2dbd Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Feb 2024 15:07:38 +0100 Subject: [PATCH 02/15] give lambda is own seperate powernet. --- code/game/area/BigRed.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm index 15122f01c8f6..0520b1a6386b 100644 --- a/code/game/area/BigRed.dm +++ b/code/game/area/BigRed.dm @@ -262,6 +262,7 @@ sound_environment = SOUND_ENVIRONMENT_ROOM soundscape_playlist = list() minimap_color = MINIMAP_AREA_RESEARCH + powernet_name = "lambda" /area/bigredv2/caves/lambda/virology name = "\improper Lambda Virology" From 3142e859601b4e00aa8e28106468091043111d6a Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Feb 2024 15:32:26 +0100 Subject: [PATCH 03/15] added functional padlock --- maps/map_files/BigRed/BigRed.dmm | 83 ++++++++++++++++++++++++++------ 1 file changed, 67 insertions(+), 16 deletions(-) diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 8283dcd78f76..eb193b7de072 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -16135,8 +16135,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; - id = "lambda"; - name = "Lambda Lockdown" + id = "lambda-exterior"; + name = "Lambda Checkpoint Exterior" }, /turf/open/floor{ icon_state = "delivery" @@ -28915,6 +28915,19 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/outside/space_port_lz2) +"ftX" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda-interior"; + name = "Lambda Checkpoint Interior" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "ftY" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_7" @@ -33745,6 +33758,15 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"mKL" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/door_control{ + id = "lambda-exterior"; + name = "Lambda Checkpoint Exterior"; + pixel_x = null + }, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "mKM" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_y = 6 @@ -35369,6 +35391,16 @@ icon_state = "mars_cave_6" }, /area/bigredv2/caves_research) +"pjK" = ( +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda-interior"; + name = "Lambda Checkpoint Interior" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/caves_north) "plx" = ( /obj/structure/machinery/power/apc{ dir = 4 @@ -37372,6 +37404,16 @@ icon_state = "asteroidwarning" }, /area/bigred/ground/garage_workshop) +"sit" = ( +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda-interior"; + name = "Lambda Checkpoint Interior" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "siu" = ( /turf/open/floor{ icon_state = "asteroidwarning" @@ -37959,6 +38001,15 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/n) +"taW" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/door_control{ + id = "lambda-interior"; + name = "Lambda Checkpoint Interior"; + pixel_x = null + }, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "tbS" = ( /obj/structure/morgue{ dir = 1 @@ -40556,8 +40607,8 @@ "wNw" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; - id = "lambda"; - name = "Lambda Lockdown" + id = "lambda-exterior"; + name = "Lambda Checkpoint Exterior" }, /turf/open/floor{ icon_state = "delivery" @@ -40757,14 +40808,14 @@ }, /area/bigredv2/outside/telecomm/warehouse) "xdh" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda"; - name = "Lambda Lockdown" - }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda-exterior"; + name = "Lambda Checkpoint Exterior" + }, /turf/open/floor{ icon_state = "delivery" }, @@ -73574,7 +73625,7 @@ aao tqS xWl xWl -xWl +pjK xWl xWl tqS @@ -77103,7 +77154,7 @@ aDy aTq hXM gfv -ufg +mKL epu aXX aYy @@ -78617,10 +78668,10 @@ aao aao aao apI -wNw -xdh -wNw -wNw +sit +ftX +sit +sit apI jeH dFW @@ -78839,7 +78890,7 @@ pJq aMT tQw gfv -ufg +taW rma jFM aYy From 15657b7abba258754d941725b148371f25d93387 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Feb 2024 16:00:33 +0100 Subject: [PATCH 04/15] system isn't made to have more than two powernet can't find out how to make it work can't just add a new powernet name and go with it... --- code/game/area/BigRed.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm index 0520b1a6386b..15122f01c8f6 100644 --- a/code/game/area/BigRed.dm +++ b/code/game/area/BigRed.dm @@ -262,7 +262,6 @@ sound_environment = SOUND_ENVIRONMENT_ROOM soundscape_playlist = list() minimap_color = MINIMAP_AREA_RESEARCH - powernet_name = "lambda" /area/bigredv2/caves/lambda/virology name = "\improper Lambda Virology" From db100ed25ea9e7a7d3dc2addbee92d41b1f3973a Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Feb 2024 16:34:18 +0100 Subject: [PATCH 05/15] make the room look better and remove buggy stuff.. --- maps/map_files/BigRed/BigRed.dmm | 327 ++++++++++++++++++++++--------- 1 file changed, 237 insertions(+), 90 deletions(-) diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index eb193b7de072..62ae7f42e94c 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -15332,15 +15332,16 @@ "aSj" = ( /obj/effect/decal/remains/human, /turf/open/floor{ - dir = 5; + dir = 1; icon_state = "asteroidwarning" }, /area/bigredv2/outside/lambda_cave_cas) "aSk" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/mars_cave{ - icon_state = "mars_cave_5" +/turf/open/floor{ + dir = 5; + icon_state = "asteroidwarning" }, /area/bigredv2/caves_lambda) "aSl" = ( @@ -15870,7 +15871,7 @@ }, /turf/open/floor{ dir = 1; - icon_state = "asteroidwarning" + icon_state = "asteroidfloor" }, /area/bigredv2/caves_lambda) "aTC" = ( @@ -16153,7 +16154,8 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/caves_lambda) "aUD" = ( @@ -16457,8 +16459,8 @@ dir = 4; icon_state = "gib6" }, -/turf/open/mars_cave{ - icon_state = "mars_cave_8" +/turf/open/floor{ + icon_state = "asteroidwarning" }, /area/bigredv2/outside/lambda_cave_cas) "aVx" = ( @@ -17297,7 +17299,10 @@ /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, /area/bigredv2/outside/lambda_cave_cas) "aXY" = ( /turf/open/floor{ @@ -17430,13 +17435,6 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) -"aYw" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/e) "aYx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -23346,6 +23344,14 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves/mining) +"bum" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "bun" = ( /turf/open/floor{ dir = 10; @@ -26536,6 +26542,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"bKH" = ( +/obj/structure/machinery/light, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/lambda_cave_cas) "bKY" = ( /obj/structure/fence, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -27124,12 +27136,6 @@ icon_state = "red" }, /area/bigredv2/outside/marshal_office) -"cGQ" = ( -/turf/open/floor{ - dir = 6; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lambda_cave_cas) "cGT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/power/apc{ @@ -27153,6 +27159,17 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/lz2_south_cas) +"cHv" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "cHy" = ( /obj/item/device/flashlight, /obj/effect/decal/cleanable/dirt, @@ -27188,8 +27205,9 @@ /obj/structure/machinery/light{ dir = 1 }, -/turf/open/mars_cave{ - icon_state = "mars_cave_23" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/lambda_cave_cas) "cIP" = ( @@ -27883,6 +27901,14 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves_lambda) +"dLo" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/mars_cave{ + icon_state = "mars_dirt_4" + }, +/area/bigredv2/outside/e) "dNd" = ( /obj/item/stack/cable_coil/cut, /turf/open/mars_cave{ @@ -28136,6 +28162,14 @@ icon_state = "asteroidfloor" }, /area/bigred/ground/garage_workshop) +"edd" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/mars_cave{ + icon_state = "mars_cave_2" + }, +/area/bigredv2/caves_east) "efK" = ( /obj/structure/machinery/computer/crew{ density = 0; @@ -28268,7 +28302,10 @@ "epu" = ( /obj/structure/surface/table/reinforced, /obj/item/device/camera, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, /area/bigredv2/outside/lambda_cave_cas) "eql" = ( /turf/open/mars_cave{ @@ -28354,6 +28391,12 @@ icon_state = "bcircuitoff" }, /area/bigredv2/caves/lambda/research) +"evN" = ( +/turf/open/floor{ + dir = 8; + icon_state = "redcorner" + }, +/area/bigredv2/outside/lambda_cave_cas) "evX" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -28844,6 +28887,13 @@ icon_state = "delivery" }, /area/bigredv2/caves) +"fls" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/lambda_cave_cas) "fmd" = ( /obj/structure/machinery/light{ dir = 1 @@ -29118,6 +29168,12 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves/mining) +"fJs" = ( +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_east) "fJH" = ( /turf/open/floor{ dir = 10; @@ -29530,8 +29586,9 @@ /area/bigredv2/outside/cargo) "gkN" = ( /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/mars_cave{ - icon_state = "mars_cave_8" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/lambda_cave_cas) "glB" = ( @@ -29871,6 +29928,15 @@ /obj/structure/cargo_container/horizontal/blue/top, /turf/open/mars, /area/bigredv2/outside/space_port_lz2) +"gQk" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "gSg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -30090,6 +30156,13 @@ }, /turf/open/floor/plating, /area/bigredv2/outside/bar) +"hiH" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + dir = 8; + icon_state = "redcorner" + }, +/area/bigredv2/outside/lambda_cave_cas) "hiP" = ( /obj/structure/sign/safety/one{ pixel_x = 16 @@ -30474,12 +30547,6 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"hSs" = ( -/obj/structure/machinery/light, -/turf/open/mars_cave{ - icon_state = "mars_cave_8" - }, -/area/bigredv2/outside/lambda_cave_cas) "hSP" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/mars_cave{ @@ -30931,6 +30998,11 @@ }, /turf/open/gm/river, /area/bigredv2/outside/engineering) +"iBs" = ( +/turf/open/floor{ + icon_state = "redcorner" + }, +/area/bigredv2/outside/lambda_cave_cas) "iCu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -31268,7 +31340,10 @@ "jeH" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/recharger, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, /area/bigredv2/outside/lambda_cave_cas) "jeO" = ( /turf/open/mars{ @@ -31604,7 +31679,10 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, /area/bigredv2/outside/lambda_cave_cas) "jGd" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -31685,6 +31763,12 @@ icon_state = "bcircuitoff" }, /area/bigredv2/caves/lambda/research) +"jKV" = ( +/turf/open/floor{ + dir = 6; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_east) "jMm" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -33722,6 +33806,14 @@ icon_state = "mars_cave_17" }, /area/bigredv2/outside/lz1_north_cas) +"mGW" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "mHp" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -33765,7 +33857,10 @@ name = "Lambda Checkpoint Exterior"; pixel_x = null }, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, /area/bigredv2/outside/lambda_cave_cas) "mKM" = ( /obj/effect/decal/cleanable/blood/drip{ @@ -34125,6 +34220,12 @@ icon_state = "mars_cave_6" }, /area/bigredv2/outside/filtration_cave_cas) +"nse" = ( +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/lambda_cave_cas) "ntX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -35018,6 +35119,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"oJh" = ( +/turf/open/floor{ + dir = 1; + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "oJO" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -8; @@ -35475,6 +35582,15 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves_north) +"prC" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ + dir = 1; + name = "\improper Marshal Office" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "psE" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ @@ -36655,6 +36771,15 @@ }, /turf/closed/wall/solaris/rock, /area/bigredv2/caves) +"reU" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + dir = 8; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/e) "rfe" = ( /obj/structure/platform/kutjevo/rock{ dir = 8 @@ -36730,7 +36855,10 @@ "rma" = ( /obj/structure/surface/table/reinforced, /obj/item/handcuffs, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, /area/bigredv2/outside/lambda_cave_cas) "rml" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, @@ -38008,7 +38136,10 @@ name = "Lambda Checkpoint Interior"; pixel_x = null }, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, /area/bigredv2/outside/lambda_cave_cas) "tbS" = ( /obj/structure/morgue{ @@ -38821,7 +38952,10 @@ /area/bigredv2/outside/space_port_lz2) "ufg" = ( /obj/structure/surface/table/reinforced, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, /area/bigredv2/outside/lambda_cave_cas) "ufu" = ( /obj/effect/decal/cleanable/dirt, @@ -39389,7 +39523,9 @@ /area/bigredv2/caves_sw) "vaS" = ( /obj/structure/machinery/light, -/turf/open/floor, +/turf/open/floor{ + icon_state = "red" + }, /area/bigredv2/outside/lambda_cave_cas) "vbi" = ( /turf/open/floor{ @@ -39404,12 +39540,6 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) -"vbI" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor, -/area/bigredv2/outside/lambda_cave_cas) "vcm" = ( /turf/open/floor{ icon_state = "asteroidwarning" @@ -39448,7 +39578,10 @@ "vdy" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/structure/surface/table/reinforced, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, /area/bigredv2/outside/lambda_cave_cas) "vdS" = ( /obj/item/explosive/grenade/incendiary/molotov{ @@ -40989,6 +41122,12 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) +"xpQ" = ( +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/lambda_cave_cas) "xqf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/objective_landmark/medium, @@ -41540,6 +41679,14 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/eta) +"ydM" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/caves_lambda) "yej" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -76718,12 +76865,12 @@ aQu aSi aDy aTp -aVv -aQu -aOk -aOk -aQu -aYw +aTu +reU +aTu +aTu +aTu +aTp aZi nRT bar @@ -76936,7 +77083,7 @@ aTr aDy aTq hXM -gfv +apI gfv gfv apI @@ -77148,7 +77295,7 @@ aao aQu aQu aQu -aQu +dLo aTr aDy aTq @@ -77374,7 +77521,7 @@ apI jeH aXt aYy -aYy +iBs iHG nRT bat @@ -77586,12 +77733,12 @@ uuo aSj ixR aUx -cGQ +vcm gfv ufg aYy aYy -aYy +iBs iHG nRT aJy @@ -77800,15 +77947,15 @@ aao aao aao xXN -sYL +nse aTx -vcm -sYL -gfv -aYy -aYy +xpQ +bKH +apI +gQk aYy aYy +iBs iHG atb atb @@ -78019,10 +78166,10 @@ aao apI cIq aTx +xpQ vcm -hSs -apI -vbI +prC +aYy aYy aYy vaS @@ -78234,15 +78381,15 @@ aao aao aao xXN -sYL +nse aTx -vcm +xpQ aVw -gfv -aYy -aYy +apI +oJh aYy aYy +evN xXN aao aao @@ -78453,13 +78600,13 @@ aao sYL gkN hLs +fls uUs -gkN oCk vdy gSJ gSJ -gSJ +hiH xXN aao aao @@ -78676,7 +78823,7 @@ apI jeH dFW aYy -aYy +evN xXN aao aao @@ -78885,10 +79032,10 @@ aao aao aao aao -amG -pJq -aMT -tQw +aTw +hwG +aTv +aTv gfv taW rma @@ -79102,11 +79249,11 @@ tQw aao aao aao -ujC -pJq -aMT -ujC -gfv +mGW +hwG +aTv +ydM +apI gfv gfv apI @@ -79322,13 +79469,13 @@ aao aSk aTz aUA -ujC -ujC -tQw -gCE -gCE -gCE -gCE +bum +cHv +aOn +fJs +fJs +jKV +edd gCE gCE gCE From 79dc78c07f0d8e221ea3c82102bbb3c39bedbd1a Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Feb 2024 17:01:54 +0100 Subject: [PATCH 06/15] smooth things even more... --- maps/map_files/BigRed/BigRed.dmm | 86 ++++++++++++++++---------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 62ae7f42e94c..ebfd8feecab6 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -13270,6 +13270,9 @@ }, /area/bigredv2/outside/e) "aMS" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/open/floor{ dir = 10; icon_state = "asteroidwarning" @@ -15841,16 +15844,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/caves_lambda) -"aTx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lambda_cave_cas) "aTy" = ( /obj/structure/machinery/light{ dir = 1 @@ -16460,7 +16453,8 @@ icon_state = "gib6" }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/lambda_cave_cas) "aVx" = ( @@ -17299,6 +17293,7 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/item/device/camera, /turf/open/floor{ dir = 9; icon_state = "redfull" @@ -18484,7 +18479,7 @@ "bbZ" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/cameras/wooden_tv{ - dir = 8 + dir = 4 }, /obj/structure/machinery/light{ dir = 4 @@ -26545,7 +26540,8 @@ "bKH" = ( /obj/structure/machinery/light, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/lambda_cave_cas) "bKY" = ( @@ -28301,7 +28297,9 @@ /area/bigredv2/outside/eta) "epu" = ( /obj/structure/surface/table/reinforced, -/obj/item/device/camera, +/obj/structure/machinery/computer/cameras/wooden_tv{ + dir = 4 + }, /turf/open/floor{ dir = 9; icon_state = "redfull" @@ -30497,7 +30495,7 @@ }, /turf/open/floor{ dir = 1; - icon_state = "asteroidwarning" + icon_state = "asteroidfloor" }, /area/bigredv2/outside/lambda_cave_cas) "hLS" = ( @@ -31679,6 +31677,7 @@ /obj/structure/machinery/light{ dir = 4 }, +/obj/item/handcuffs, /turf/open/floor{ dir = 9; icon_state = "redfull" @@ -35120,6 +35119,7 @@ }, /area/bigredv2/caves/mining) "oJh" = ( +/obj/structure/machinery/vending/security, /turf/open/floor{ dir = 1; icon_state = "red" @@ -36854,7 +36854,9 @@ /area/bigredv2/caves/mining) "rma" = ( /obj/structure/surface/table/reinforced, -/obj/item/handcuffs, +/obj/structure/machinery/computer/cameras/wooden_tv{ + dir = 8 + }, /turf/open/floor{ dir = 9; icon_state = "redfull" @@ -38952,6 +38954,7 @@ /area/bigredv2/outside/space_port_lz2) "ufg" = ( /obj/structure/surface/table/reinforced, +/obj/item/pizzabox/vegetable, /turf/open/floor{ dir = 9; icon_state = "redfull" @@ -39475,12 +39478,6 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/filtration_plant) -"uUs" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lambda_cave_cas) "uUV" = ( /obj/structure/prop/server_equipment/yutani_server/broken, /turf/open/floor/greengrid, @@ -39540,11 +39537,6 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) -"vcm" = ( -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lambda_cave_cas) "vct" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -39578,6 +39570,7 @@ "vdy" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/structure/surface/table/reinforced, +/obj/item/storage/donut_box, /turf/open/floor{ dir = 9; icon_state = "redfull" @@ -39837,6 +39830,15 @@ icon_state = "delivery" }, /area/bigredv2/caves/eta/xenobiology) +"vtR" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor{ + dir = 6; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "vuz" = ( /obj/structure/machinery/door_control{ id = "eta"; @@ -76428,7 +76430,7 @@ aSg aSg aSg aSg -aSg +aTq qhl aUp aUk @@ -76645,8 +76647,8 @@ aKP aKP aKP aMR -aQu -aYx +aTr +aDy aUp aQu aVr @@ -76862,7 +76864,7 @@ aKP aKP aMR aQu -aSi +aTr aDy aTp aTu @@ -77082,7 +77084,7 @@ aQu aTr aDy aTq -hXM +aTq apI gfv gfv @@ -77299,7 +77301,7 @@ dLo aTr aDy aTq -hXM +aTq gfv mKL epu @@ -77733,7 +77735,7 @@ uuo aSj ixR aUx -vcm +xpQ gfv ufg aYy @@ -77948,7 +77950,7 @@ aao aao xXN nse -aTx +ixR xpQ bKH apI @@ -78165,9 +78167,9 @@ aao aao apI cIq -aTx +ixR +xpQ xpQ -vcm prC aYy aYy @@ -78382,7 +78384,7 @@ aao aao xXN nse -aTx +ixR xpQ aVw apI @@ -78601,7 +78603,7 @@ sYL gkN hLs fls -uUs +fls oCk vdy gSJ @@ -80546,7 +80548,7 @@ uaB uaB uaB aMq -aMT +aTv aOm aOm aOm @@ -80763,7 +80765,7 @@ aJE aKQ aKQ hmm -aMT +aTv aOn aOn aOn @@ -80980,7 +80982,7 @@ aJF anI anI anI -aMV +vtR gXp gXp gXp From f75e92e90fe04eefb250837b8b75de9389514740 Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 21 Feb 2024 12:51:04 +0100 Subject: [PATCH 07/15] change some stuff --- maps/map_files/BigRed/BigRed.dmm | 172 +++++++++++++++++-------------- 1 file changed, 95 insertions(+), 77 deletions(-) diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index ebfd8feecab6..e83b1712825e 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -5257,7 +5257,9 @@ }, /area/bigredv2/outside/marshal_office) "apI" = ( -/turf/closed/wall/solaris/reinforced/hull, +/turf/open/floor{ + icon_state = "red" + }, /area/bigredv2/outside/lambda_cave_cas) "apJ" = ( /obj/structure/window/framed/solaris/reinforced, @@ -17288,17 +17290,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) -"aXX" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/item/device/camera, -/turf/open/floor{ - dir = 9; - icon_state = "redfull" - }, -/area/bigredv2/outside/lambda_cave_cas) "aXY" = ( /turf/open/floor{ dir = 10; @@ -28158,14 +28149,6 @@ icon_state = "asteroidfloor" }, /area/bigred/ground/garage_workshop) -"edd" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/mars_cave{ - icon_state = "mars_cave_2" - }, -/area/bigredv2/caves_east) "efK" = ( /obj/structure/machinery/computer/crew{ density = 0; @@ -29427,6 +29410,9 @@ icon_state = "whitegreenfull" }, /area/bigredv2/outside/hydroponics) +"fYm" = ( +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/chapel) "fYH" = ( /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/caves/mining) @@ -30157,8 +30143,7 @@ "hiH" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ - dir = 8; - icon_state = "redcorner" + icon_state = "red" }, /area/bigredv2/outside/lambda_cave_cas) "hiP" = ( @@ -31088,7 +31073,7 @@ }, /area/bigredv2/outside/space_port_lz2) "iHG" = ( -/turf/closed/wall/solaris, +/turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/lambda_cave_cas) "iIp" = ( /obj/effect/landmark/nightmare{ @@ -31672,17 +31657,6 @@ icon_state = "mars_cave_16" }, /area/bigredv2/caves/mining) -"jFM" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/item/handcuffs, -/turf/open/floor{ - dir = 9; - icon_state = "redfull" - }, -/area/bigredv2/outside/lambda_cave_cas) "jGd" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -31750,6 +31724,11 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves_north) +"jKu" = ( +/obj/limb/arm/l_arm, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "jKI" = ( /obj/structure/platform_decoration/shiva{ dir = 8 @@ -31763,6 +31742,9 @@ }, /area/bigredv2/caves/lambda/research) "jKV" = ( +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor{ dir = 6; icon_state = "asteroidwarning" @@ -37931,6 +37913,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"sHk" = ( +/obj/structure/surface/table/reinforced, +/obj/item/handcuffs, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "sHz" = ( /obj/item/ore{ pixel_x = 9; @@ -38033,6 +38023,15 @@ icon_state = "mars_cave_19" }, /area/bigredv2/outside/lz2_south_cas) +"sTv" = ( +/obj/structure/surface/table/reinforced, +/obj/item/device/camera, +/obj/structure/machinery/light/small, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "sUQ" = ( /obj/structure/machinery/photocopier, /turf/open/floor/wood, @@ -39518,12 +39517,6 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves_sw) -"vaS" = ( -/obj/structure/machinery/light, -/turf/open/floor{ - icon_state = "red" - }, -/area/bigredv2/outside/lambda_cave_cas) "vbi" = ( /turf/open/floor{ dir = 5; @@ -39926,6 +39919,15 @@ icon_state = "mars_cave_9" }, /area/bigredv2/outside/n) +"vBK" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + dir = 10; + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "vBT" = ( /obj/structure/surface/table/reinforced, /obj/structure/transmitter/colony_net/rotary{ @@ -40352,6 +40354,15 @@ icon_state = "podhatchfloor" }, /area/bigredv2/outside/engineering) +"wiX" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + dir = 6; + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "wjW" = ( /obj/structure/platform/shiva{ dir = 1 @@ -40368,6 +40379,13 @@ icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/research) +"wku" = ( +/obj/effect/landmark/corpsespawner/security, +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "wlE" = ( /obj/item/stack/cable_coil/cut, /turf/open/mars_cave{ @@ -77085,12 +77103,12 @@ aTr aDy aTq aTq -apI +iHG gfv gfv -apI mTJ iHG +iHG nRT bap baT @@ -77305,8 +77323,8 @@ aTq gfv mKL epu -aXX aYy +vBK iHG nRT bao @@ -77514,16 +77532,16 @@ aao aao aao aao -apI +iHG wNw xdh aUw wNw -apI +iHG jeH aXt -aYy -iBs +jKu +apI iHG nRT bat @@ -77740,9 +77758,9 @@ gfv ufg aYy aYy -iBs +apI iHG -nRT +fYm aJy aJy nRT @@ -77953,13 +77971,13 @@ nse ixR xpQ bKH -apI +iHG gQk +wku aYy -aYy -iBs -iHG -atb +evN +sTv +fYm atb atb atb @@ -78165,7 +78183,7 @@ aao aao aao aao -apI +iHG cIq ixR xpQ @@ -78174,7 +78192,7 @@ prC aYy aYy aYy -vaS +aYy apI aao aao @@ -78387,12 +78405,12 @@ nse ixR xpQ aVw -apI +iHG oJh aYy aYy -evN -xXN +iBs +sHk aao aao aao @@ -78609,7 +78627,7 @@ vdy gSJ gSJ hiH -xXN +iHG aao aao aao @@ -78816,16 +78834,16 @@ eFh aao aao aao -apI +iHG sit ftX sit sit -apI +iHG jeH dFW aYy -evN +apI xXN aao aao @@ -79041,9 +79059,9 @@ aTv gfv taW rma -jFM aYy -apI +wiX +iHG aao gCE rAs @@ -79255,12 +79273,12 @@ mGW hwG aTv ydM -apI +iHG gfv gfv -apI cBg -apI +iHG +iHG gCE gCE gCE @@ -79477,7 +79495,7 @@ aOn fJs fJs jKV -edd +gCE gCE gCE gCE @@ -89478,7 +89496,7 @@ aaa aaa aaa aaa -aaa +jov aaa aaa aaa @@ -89695,15 +89713,15 @@ aaa aaa aaa aaa +jov aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa +jov +jov +jov aaa aaa aaa @@ -89918,9 +89936,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +jov +jov +jov aaa aaa aaa From c04c19043dd4945a5140a5c8829cf8dd72300490 Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 21 Feb 2024 12:57:33 +0100 Subject: [PATCH 08/15] re added the extra tunnel nightmare insert since my change are smaller than i planned... From b0c0d12ca099687c640c5d875ed7b13ad2746737 Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 21 Feb 2024 13:08:38 +0100 Subject: [PATCH 09/15] revert nightmare please work pleading eyes From da78e252376b06f661e4c12592204f211f858e7e Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 21 Feb 2024 13:17:00 +0100 Subject: [PATCH 10/15] fFpfjOJGOJogp --- maps/map_files/BigRed/BigRed.dmm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index e83b1712825e..fc7e622a8a33 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -32586,6 +32586,12 @@ icon_state = "darkred2" }, /area/bigredv2/caves/eta/research) +"kKH" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "lambda-cave-extratunnel" + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "kMk" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor{ @@ -81662,7 +81668,7 @@ aMV tQw aao aao -aao +kKH aao aao aao From 518f3ff31b325ab9c5046db4ec10fee4f2a0ff98 Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 21 Feb 2024 13:46:54 +0100 Subject: [PATCH 11/15] change naming of doors --- maps/map_files/BigRed/BigRed.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index fc7e622a8a33..78536e1de96d 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -27070,7 +27070,7 @@ dir = 4 }, /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ - name = "\improper Marshal Office Armory" + name = "\improper Lambda Checkpoint" }, /turf/open/floor{ icon_state = "delivery" @@ -33944,7 +33944,7 @@ /area/bigredv2/outside/admin_building) "mTJ" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ - name = "\improper Marshal Office Armory" + name = "\improper Lambda Checkpoint" }, /turf/open/floor{ icon_state = "delivery" @@ -35573,7 +35573,7 @@ "prC" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ dir = 1; - name = "\improper Marshal Office" + name = "\improper Lambda Checkpoint" }, /turf/open/floor{ icon_state = "delivery" From 884c06eac657faecbd9cbec66926750c6fdb2b26 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 22 Feb 2024 18:40:54 +0100 Subject: [PATCH 12/15] add apc move vendor --- maps/map_files/BigRed/BigRed.dmm | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 78536e1de96d..ffd46471ce2b 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -29410,9 +29410,6 @@ icon_state = "whitegreenfull" }, /area/bigredv2/outside/hydroponics) -"fYm" = ( -/turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/chapel) "fYH" = ( /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/caves/mining) @@ -35107,7 +35104,10 @@ }, /area/bigredv2/caves/mining) "oJh" = ( -/obj/structure/machinery/vending/security, +/obj/structure/machinery/power/apc{ + dir = 1; + start_charge = 0 + }, /turf/open/floor{ dir = 1; icon_state = "red" @@ -40994,6 +40994,12 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/filtration_plant) +"xfb" = ( +/obj/structure/machinery/vending/security, +/turf/open/floor{ + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "xfx" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -77766,7 +77772,7 @@ aYy aYy apI iHG -fYm +iHG aJy aJy nRT @@ -77972,7 +77978,7 @@ aao aao aao aao -xXN +aao nse ixR xpQ @@ -77983,7 +77989,7 @@ wku aYy evN sTv -fYm +iHG atb atb atb @@ -78199,7 +78205,7 @@ aYy aYy aYy aYy -apI +xfb aao aao aao @@ -78406,7 +78412,7 @@ aao aao aao aao -xXN +aao nse ixR xpQ From 9ca53a37409a5edba5ec0808d118c20f844b25c9 Mon Sep 17 00:00:00 2001 From: Julien Date: Sat, 24 Feb 2024 09:25:49 +0100 Subject: [PATCH 13/15] fix computer --- maps/map_files/BigRed/BigRed.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index ffd46471ce2b..d56cc68bcc8a 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -18470,7 +18470,7 @@ "bbZ" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/cameras/wooden_tv{ - dir = 4 + dir = 8 }, /obj/structure/machinery/light{ dir = 4 From 9c5d5fee079662aa85ba723cbffbc8349e2ca207 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 26 Feb 2024 09:34:35 +0100 Subject: [PATCH 14/15] move field vehicle --- maps/map_files/BigRed/BigRed.dmm | 71 +++++++++++++++----------------- 1 file changed, 33 insertions(+), 38 deletions(-) diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index d56cc68bcc8a..8cbac69b23a0 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -16134,6 +16134,7 @@ id = "lambda-exterior"; name = "Lambda Checkpoint Exterior" }, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ icon_state = "delivery" }, @@ -17117,6 +17118,7 @@ dir = 8; pixel_y = 3 }, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor, /area/bigredv2/outside/lambda_cave_cas) "aXu" = ( @@ -26535,6 +26537,15 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/lambda_cave_cas) +"bKU" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/recharger, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "bKY" = ( /obj/structure/fence, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -28868,13 +28879,6 @@ icon_state = "delivery" }, /area/bigredv2/caves) -"fls" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/lambda_cave_cas) "fmd" = ( /obj/structure/machinery/light{ dir = 1 @@ -29565,13 +29569,6 @@ icon_state = "delivery" }, /area/bigredv2/outside/cargo) -"gkN" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lambda_cave_cas) "glB" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/solaris/reinforced, @@ -29931,10 +29928,6 @@ }, /turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/mining) -"gSJ" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor, -/area/bigredv2/outside/lambda_cave_cas) "gTJ" = ( /obj/structure/machinery/autolathe, /turf/open/floor/plating, @@ -30471,7 +30464,6 @@ /turf/open/mars_cave, /area/bigredv2/caves/mining) "hLs" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -31724,6 +31716,7 @@ "jKu" = ( /obj/limb/arm/l_arm, /obj/effect/decal/cleanable/blood/drip, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor, /area/bigredv2/outside/lambda_cave_cas) "jKI" = ( @@ -33914,6 +33907,10 @@ /obj/structure/machinery/computer/atmos_alert, /turf/open/floor, /area/bigredv2/caves) +"mRJ" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/lambda_cave_cas) "mSn" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor{ @@ -35019,11 +35016,6 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves_virology) -"oCk" = ( -/obj/structure/window/framed/solaris/reinforced, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor/plating, -/area/bigredv2/outside/lambda_cave_cas) "oDB" = ( /obj/structure/closet/l3closet, /obj/effect/landmark/objective_landmark/close, @@ -38033,6 +38025,7 @@ /obj/structure/surface/table/reinforced, /obj/item/device/camera, /obj/structure/machinery/light/small, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ dir = 9; icon_state = "redfull" @@ -39567,7 +39560,6 @@ }, /area/bigredv2/outside/engineering) "vdy" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, /obj/structure/surface/table/reinforced, /obj/item/storage/donut_box, /turf/open/floor{ @@ -40769,6 +40761,7 @@ id = "lambda-exterior"; name = "Lambda Checkpoint Exterior" }, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ icon_state = "delivery" }, @@ -40975,6 +40968,7 @@ id = "lambda-exterior"; name = "Lambda Checkpoint Exterior" }, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ icon_state = "delivery" }, @@ -40996,6 +40990,7 @@ /area/bigredv2/outside/filtration_plant) "xfb" = ( /obj/structure/machinery/vending/security, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ icon_state = "red" }, @@ -77544,17 +77539,17 @@ aao aao aao aao -iHG +mRJ wNw xdh aUw wNw -iHG -jeH +mRJ +bKU aXt jKu -apI -iHG +hiH +mRJ nRT bat baW @@ -77771,7 +77766,7 @@ ufg aYy aYy apI -iHG +mRJ iHG aJy aJy @@ -78630,15 +78625,15 @@ aao aao aao sYL -gkN +nse hLs -fls -fls -oCk +xpQ +xpQ +gfv vdy -gSJ -gSJ -hiH +aYy +aYy +apI iHG aao aao From b770e35cb32003030dd12f2f0aa0c9b055abb8f6 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sun, 31 Mar 2024 14:54:04 +0100 Subject: [PATCH 15/15] Update code/game/area/BigRed.dm --- code/game/area/BigRed.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm index 15122f01c8f6..8675655fe949 100644 --- a/code/game/area/BigRed.dm +++ b/code/game/area/BigRed.dm @@ -252,7 +252,7 @@ name = "\improper Corporate Saferoom" icon_state = "vault" -// all the lambda area bellow. +// Lambda areas below: // Laboratory proper /area/bigredv2/caves/lambda