From 6d76516c3730b493067524f88821a88a8e8c944b Mon Sep 17 00:00:00 2001 From: c4xmaniac2 <133173804+c4xmaniac2@users.noreply.github.com> Date: Mon, 18 Sep 2023 20:03:43 -0400 Subject: [PATCH] LV Intel Update (#4378) # About the pull request Rebalances intel distribution on LV by moving 1/3 of the total intel into the caves. Part is in SW, Central, and Temple. Nightmare inserts have been updated to account for the changes to the intel distribution. # Explain why it's good for the game Marines can no longer get a nuke without going into caves. Done at the request of Morrow. # Testing Photographs and Procedure My super robust and well tested method was to delete every 3rd intel I saw and move it to the caves. Went harder on close intel and science than yellow/red. Should be good enough. Some of the central cave inserts were hard to eyeball for the intel changes, but I'm pretty confident that they should be standardized. # Changelog :cl: balance: Moved 1/3 of all intel into the cave systems. maptweak: 1/3 of all Intel has been redistributed into the caves. maptweak: Nightmare inserts on the colony side and in the caves of LV now have their intel distribution standardized. /:cl: --------- Co-authored-by: Morrow --- maps/map_files/LV624/LV624.dmm | 204 +++++++++++------- maps/map_files/LV624/armory/10.cheese.dmm | 1 - maps/map_files/LV624/armory/10.extra.dmm | 1 - maps/map_files/LV624/armory/10.looted.dmm | 1 - .../LV624/cargospecial/cargospecial3_gear.dmm | 1 - maps/map_files/LV624/centralcaves/10.T.dmm | 10 +- maps/map_files/LV624/centralcaves/10.qc.dmm | 8 +- maps/map_files/LV624/gym/20.pool.dmm | 3 - maps/map_files/LV624/gym/30.alternate.dmm | 7 +- maps/map_files/LV624/hydro/30.destroyed.dmm | 24 +-- maps/map_files/LV624/maintemple/1.intact.dmm | 36 +++- maps/map_files/LV624/maintemple/2.flooded.dmm | 48 ++++- maps/map_files/LV624/medbay/10.destroyed.dmm | 8 +- .../LV624/medbay/30.larvasurgery.dmm | 1 - maps/map_files/LV624/science/10.yautja.dmm | 7 +- .../LV624/science/40.fullylocked.dmm | 10 +- maps/map_files/LV624/standalone/clfship.dmm | 6 + 17 files changed, 238 insertions(+), 138 deletions(-) diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 7aaff922baa9..2c2e9a3f339f 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -2764,7 +2764,6 @@ /obj/item/clothing/glasses/hud/health, /obj/effect/landmark/crap_item, /obj/item/reagent_container/spray/cleaner, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ icon_state = "whitebluefull" }, @@ -4104,7 +4103,6 @@ /area/lv624/lazarus/research) "avu" = ( /obj/structure/closet/lasertag/red, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ dir = 4; icon_state = "whitepurplecorner" @@ -4154,12 +4152,6 @@ dir = 8 }, /obj/structure/surface/table, -/obj/item/storage/box/disks{ - layer = 2.9; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ icon_state = "white" }, @@ -4375,7 +4367,6 @@ /area/lv624/lazarus/research) "awq" = ( /obj/item/clothing/glasses/regular, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ icon_state = "white" }, @@ -5248,7 +5239,6 @@ /area/lv624/lazarus/fitness) "azm" = ( /obj/structure/closet/boxinggloves, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ dir = 4; icon_state = "whitepurplecorner" @@ -5380,7 +5370,6 @@ /area/lv624/lazarus/fitness) "azM" = ( /obj/structure/closet/secure_closet/hydroponics, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ dir = 4; icon_state = "whitepurplecorner" @@ -5426,7 +5415,6 @@ }, /obj/structure/machinery/light, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ dir = 5; icon_state = "whitepurple" @@ -6200,7 +6188,6 @@ /obj/item/tool/crowbar, /obj/item/clothing/gloves/yellow, /obj/item/stack/medical/bruise_pack, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ icon_state = "bluecorner" }, @@ -6403,7 +6390,6 @@ /obj/structure/surface/table, /obj/item/weapon/gun/pistol/holdout, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating{ icon_state = "platebot" }, @@ -7261,7 +7247,6 @@ /obj/structure/surface/table, /obj/item/trash/cheesie, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ dir = 5; icon_state = "whitepurple" @@ -8866,7 +8851,6 @@ /obj/item/ammo_magazine/pistol/highpower, /obj/item/ammo_magazine/pistol/highpower, /obj/item/ammo_magazine/pistol/highpower, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ icon_state = "cult" }, @@ -12041,7 +12025,6 @@ /obj/item/device/analyzer, /obj/item/device/multitool, /obj/item/device/assembly/prox_sensor, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ icon_state = "dark" }, @@ -12155,7 +12138,6 @@ dir = 4 }, /obj/effect/landmark/objective_landmark/close, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ dir = 1; icon_state = "redcorner" @@ -12166,7 +12148,6 @@ /obj/structure/machinery/light/small{ dir = 8 }, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor/wood{ icon_state = "wood-broken4" }, @@ -12224,7 +12205,6 @@ /area/lv624/lazarus/engineering) "aZI" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ icon_state = "dark" }, @@ -12413,6 +12393,7 @@ dir = 8; health = 80 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" @@ -12703,6 +12684,7 @@ dir = 4; health = 80 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "bOg" = ( @@ -12999,11 +12981,9 @@ /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_central_jungle) "czq" = ( -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor{ - icon_state = "dark" - }, -/area/lv624/lazarus/corporate_dome) +/obj/effect/landmark/objective_landmark/science, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) "czu" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, /turf/open/gm/grass/grass1, @@ -13468,6 +13448,13 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/medbay) +"dID" = ( +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "dIO" = ( /turf/open/gm/dirt{ icon_state = "desert0" @@ -13614,7 +13601,6 @@ "dZH" = ( /obj/structure/filingcabinet, /obj/structure/machinery/light, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ icon_state = "whiteblue" }, @@ -13788,6 +13774,10 @@ icon_state = "cult" }, /area/lv624/ground/caves/south_west_caves) +"euh" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_west_caves) "euW" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/tool/candle, @@ -13799,6 +13789,13 @@ /obj/structure/flora/jungle/plantbot1, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) +"ewg" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "exf" = ( /turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_west_jungle) @@ -13858,7 +13855,6 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ dir = 9; icon_state = "green" @@ -14157,7 +14153,6 @@ /area/lv624/ground/colony/telecomm/sw_lz2) "fsa" = ( /obj/structure/surface/table, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ dir = 8; icon_state = "barber" @@ -14283,7 +14278,6 @@ /area/lv624/lazarus/quartstorage) "fFM" = ( /obj/structure/surface/rack, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ dir = 8; icon_state = "vault" @@ -14450,6 +14444,13 @@ "gdx" = ( /turf/open/gm/coast/north, /area/lv624/ground/barrens/west_barrens) +"gdy" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "gef" = ( /obj/item/stack/sheet/wood{ amount = 2 @@ -14654,6 +14655,10 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) +"gIe" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) "gKg" = ( /obj/item/clothing/head/hardhat/orange, /turf/open/floor/plating{ @@ -15724,6 +15729,13 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_central_jungle) +"jKX" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "jLc" = ( /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/coast/beachcorner/north_east, @@ -15807,6 +15819,7 @@ /obj/item/stack/sheet/mineral/sandstone{ amount = 50 }, +/obj/effect/landmark/objective_landmark/far, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "jRm" = ( @@ -17742,7 +17755,6 @@ /area/lv624/ground/caves/sand_temple) "oyT" = ( /obj/structure/closet/toolcloset, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating{ dir = 1; icon_state = "asteroidfloor" @@ -18016,6 +18028,13 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/colony/south_nexus_road) +"pbG" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/lv624/ground/caves/sand_temple) "pca" = ( /obj/effect/landmark/nightmare{ insert_tag = "nexuscenter" @@ -18101,6 +18120,10 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) +"pmt" = ( +/obj/effect/landmark/objective_landmark/science, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_west_caves) "pmz" = ( /turf/open/gm/dirt{ icon_state = "desert2" @@ -18134,6 +18157,10 @@ }, /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_central_jungle) +"pqa" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "prd" = ( /obj/structure/flora/jungle/vines/light_2, /turf/open/floor{ @@ -19186,6 +19213,10 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"rYI" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/gm/river, +/area/lv624/ground/caves/west_caves) "rZL" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/rifle/mar40, @@ -19348,7 +19379,6 @@ "sxY" = ( /obj/structure/surface/rack, /obj/item/moneybag, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/greengrid, /area/lv624/lazarus/corporate_dome) "syc" = ( @@ -19999,12 +20029,9 @@ }, /area/lv624/lazarus/crashed_ship_containers) "tYx" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor{ - dir = 9; - icon_state = "brown" - }, -/area/lv624/lazarus/comms) +/obj/effect/landmark/objective_landmark/medium, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) "tZa" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/coast/beachcorner/south_east, @@ -20156,12 +20183,9 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/caves/south_east_caves) "uns" = ( -/obj/item/stack/sheet/wood{ - amount = 2 - }, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/vault, -/area/lv624/lazarus/quartstorage) +/obj/effect/landmark/objective_landmark/medium, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_east_caves) "unT" = ( /turf/open/gm/dirt, /area/lv624/ground/colony/telecomm/tcommdome/south) @@ -20323,6 +20347,12 @@ /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) +"uOK" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + icon_state = "cult" + }, +/area/lv624/ground/caves/south_west_caves) "uRb" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/grass/grass1, @@ -20458,6 +20488,10 @@ icon_state = "dark" }, /area/lv624/lazarus/corporate_dome) +"vef" = ( +/obj/effect/landmark/objective_landmark/science, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "veo" = ( /obj/item/ammo_casing/bullet{ icon_state = "cartridge_3_1" @@ -20776,6 +20810,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"vZT" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_west_caves) "wbK" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, @@ -21074,6 +21112,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) +"wNp" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "wNB" = ( /obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ @@ -21401,7 +21443,6 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/tool/crowbar, /obj/item/reagent_container/spray/cleaner, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ dir = 9; icon_state = "whiteyellow" @@ -21532,12 +21573,9 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) "xTa" = ( -/obj/structure/largecrate/random, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/plating{ - icon_state = "platebot" - }, -/area/lv624/lazarus/robotics) +/obj/effect/landmark/objective_landmark/close, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) "xTT" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/south_west_jungle) @@ -21607,6 +21645,10 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/river/east_river) +"ygp" = ( +/obj/structure/surface/rack, +/turf/open/floor/greengrid, +/area/lv624/lazarus/secure_storage) "yhd" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) @@ -23401,7 +23443,7 @@ afV afV nBh nBh -nBh +uOK afV nBh nBh @@ -23643,7 +23685,7 @@ nBh afV ane ane -ahF +euh ahF ane ane @@ -24535,7 +24577,7 @@ mdQ gwP gwP gwP -gwP +pqa ane afV afV @@ -24771,7 +24813,7 @@ afV afV afV afV -nBh +uOK eVH nBh nBh @@ -25213,7 +25255,7 @@ gwP gwP gwP gwP -gwP +vef mdQ mdQ mdQ @@ -27488,7 +27530,7 @@ gwP gwP gwP gwP -gwP +wNp mdQ acp acp @@ -27504,7 +27546,7 @@ ane ane ahF ahF -ahF +vZT ahF ahF ahF @@ -28883,7 +28925,7 @@ ane ane ane afV -ahF +pmt ahF ahF ahF @@ -29553,7 +29595,7 @@ ane ahF ahF ahH -ahF +pmt uWJ uWJ ahF @@ -29648,11 +29690,11 @@ aTf aUj aUQ aUQ -vUO +ygp aUQ gte aUQ -iml +ygp aUQ aUQ aYs @@ -30912,7 +30954,7 @@ gwP aes aez aez -aez +rYI acp ane ane @@ -31584,7 +31626,7 @@ gwP gwP gwP gwP -gwP +pqa acp xZE gwP @@ -31830,7 +31872,7 @@ ane afV ahF ahF -ahF +vZT ahF ahF ahF @@ -33037,7 +33079,7 @@ axj avH aBp aBR -xTa +aCk ado aXX aXX @@ -33054,7 +33096,7 @@ kWH kWH kWH kWH -czq +kWH kWH kWH vdy @@ -34553,7 +34595,7 @@ eGD ufG eGD eGD -eGD +gIe ufG eGD ufG @@ -36358,7 +36400,7 @@ eGD eGD eGD eGD -eGD +xTa abS abS abS @@ -37510,7 +37552,7 @@ eGD eGD eGD eGD -eGD +xTa abS abS abS @@ -38313,7 +38355,7 @@ aQn aQn aQn aTh -tYx +aQn aQn aQn aQn @@ -40250,7 +40292,7 @@ eGD eGD eGD eGD -eGD +xTa abS abS wVk @@ -43208,7 +43250,7 @@ abS abS abS abS -eGD +xTa eGD eGD eGD @@ -45008,7 +45050,7 @@ acf abl abl abl -abl +czq uxU uxU abl @@ -47295,7 +47337,7 @@ uxU uxU abl abl -abl +tYx acf acf acf @@ -51428,7 +51470,7 @@ ahv slW uFA nPk -urR +pbG nUs uFA aeg @@ -52798,7 +52840,7 @@ pEV mhZ mhZ mhZ -pEV +dID kbr jFc rYA @@ -53104,7 +53146,7 @@ ati wWs ati aDE -uns +atE asN aFG aFZ @@ -54140,7 +54182,7 @@ jMS jMS fTM fTM -fTM +uns whU whU whU @@ -60089,7 +60131,7 @@ afS izX rwB agX -aut +jKX jFc rJd boe @@ -60323,7 +60365,7 @@ kSH boe rJd aeg -hcN +ewg twN uOi ufW @@ -60776,7 +60818,7 @@ ahv ahv ahv afS -hcN +gdy afS aeg uOi diff --git a/maps/map_files/LV624/armory/10.cheese.dmm b/maps/map_files/LV624/armory/10.cheese.dmm index 760329c216dd..26bfd92837f3 100644 --- a/maps/map_files/LV624/armory/10.cheese.dmm +++ b/maps/map_files/LV624/armory/10.cheese.dmm @@ -110,7 +110,6 @@ /obj/item/ammo_magazine/pistol/highpower, /obj/item/ammo_magazine/pistol/highpower, /obj/item/ammo_magazine/pistol/highpower, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ icon_state = "cult" }, diff --git a/maps/map_files/LV624/armory/10.extra.dmm b/maps/map_files/LV624/armory/10.extra.dmm index 612cf5c34ea1..f9c0f47729c5 100644 --- a/maps/map_files/LV624/armory/10.extra.dmm +++ b/maps/map_files/LV624/armory/10.extra.dmm @@ -125,7 +125,6 @@ /obj/item/explosive/grenade/flashbang, /obj/item/explosive/grenade/flashbang, /obj/item/ammo_magazine/shotgun/beanbag, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ icon_state = "cult" }, diff --git a/maps/map_files/LV624/armory/10.looted.dmm b/maps/map_files/LV624/armory/10.looted.dmm index 09d0371c7c39..478a3db3ea48 100644 --- a/maps/map_files/LV624/armory/10.looted.dmm +++ b/maps/map_files/LV624/armory/10.looted.dmm @@ -79,7 +79,6 @@ }, /area/lv624/lazarus/main_hall) "l" = ( -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ icon_state = "platingdmg3" }, diff --git a/maps/map_files/LV624/cargospecial/cargospecial3_gear.dmm b/maps/map_files/LV624/cargospecial/cargospecial3_gear.dmm index d89618cb3041..c695b0717a0c 100644 --- a/maps/map_files/LV624/cargospecial/cargospecial3_gear.dmm +++ b/maps/map_files/LV624/cargospecial/cargospecial3_gear.dmm @@ -43,7 +43,6 @@ /obj/structure/surface/rack, /obj/item/clothing/accessory/storage/black_vest/brown_vest, /obj/item/clothing/accessory/storage/black_vest/brown_vest, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ dir = 8; icon_state = "vault" diff --git a/maps/map_files/LV624/centralcaves/10.T.dmm b/maps/map_files/LV624/centralcaves/10.T.dmm index c9b62878872c..7433f2f6131d 100644 --- a/maps/map_files/LV624/centralcaves/10.T.dmm +++ b/maps/map_files/LV624/centralcaves/10.T.dmm @@ -68,6 +68,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) +"C" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) "G" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, @@ -154,7 +158,7 @@ w f A V -V +C l l l @@ -207,7 +211,7 @@ l l l l -V +C V V V @@ -674,7 +678,7 @@ V V G V -V +C l l l diff --git a/maps/map_files/LV624/centralcaves/10.qc.dmm b/maps/map_files/LV624/centralcaves/10.qc.dmm index 67c707f60afa..1e84fde00653 100644 --- a/maps/map_files/LV624/centralcaves/10.qc.dmm +++ b/maps/map_files/LV624/centralcaves/10.qc.dmm @@ -54,6 +54,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) +"x" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) "y" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/barrens/west_barrens) @@ -459,7 +463,7 @@ C C g C -C +x l l l @@ -660,7 +664,7 @@ l l l l -C +x C C C diff --git a/maps/map_files/LV624/gym/20.pool.dmm b/maps/map_files/LV624/gym/20.pool.dmm index 92bba9a7dcff..be863f49c556 100644 --- a/maps/map_files/LV624/gym/20.pool.dmm +++ b/maps/map_files/LV624/gym/20.pool.dmm @@ -101,7 +101,6 @@ /area/lv624/lazarus/fitness) "li" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ dir = 4; icon_state = "whitepurplecorner" @@ -209,7 +208,6 @@ }, /obj/structure/surface/table, /obj/item/storage/box/cups, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ dir = 4; icon_state = "whitepurplecorner" @@ -354,7 +352,6 @@ /obj/item/clothing/mask/snorkel, /obj/item/clothing/mask/snorkel, /obj/item/clothing/mask/snorkel, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ dir = 4; icon_state = "whitepurplecorner" diff --git a/maps/map_files/LV624/gym/30.alternate.dmm b/maps/map_files/LV624/gym/30.alternate.dmm index 8762e50bc905..79d0887c2219 100644 --- a/maps/map_files/LV624/gym/30.alternate.dmm +++ b/maps/map_files/LV624/gym/30.alternate.dmm @@ -69,11 +69,10 @@ /obj/structure/surface/rack, /obj/item/clothing/shoes/black, /obj/item/clothing/shoes/orange{ + name = "running shoes"; pixel_x = -5; - pixel_y = -9; - name = "running shoes" + pixel_y = -9 }, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ dir = 4; icon_state = "whitepurplecorner" @@ -373,7 +372,6 @@ "DH" = ( /obj/structure/closet/lasertag/blue, /obj/item/tool/crowbar, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ dir = 4; icon_state = "whitepurplecorner" @@ -646,7 +644,6 @@ id = "lv_gym_1"; name = "treadmill" }, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ dir = 4; icon_state = "whitepurplecorner" diff --git a/maps/map_files/LV624/hydro/30.destroyed.dmm b/maps/map_files/LV624/hydro/30.destroyed.dmm index a1c9ebcf3dbb..84e9ebb5c814 100644 --- a/maps/map_files/LV624/hydro/30.destroyed.dmm +++ b/maps/map_files/LV624/hydro/30.destroyed.dmm @@ -64,7 +64,6 @@ /area/lv624/ground/colony/south_medbay_road) "ft" = ( /obj/item/clothing/gloves/marine/veteran/pmc{ - name = "damaged WY PMC gloves"; armor_bio = 10; armor_bomb = 10; armor_bullet = 15; @@ -72,7 +71,8 @@ armor_internaldamage = 15; armor_laser = 15; armor_melee = 15; - armor_rad = 10 + armor_rad = 10; + name = "damaged WY PMC gloves" }, /turf/open/floor{ icon_state = "platingdmg1" @@ -171,10 +171,10 @@ }, /obj/effect/spawner/gibspawner/robot, /obj/item/limb/head/synth{ - pixel_x = 9; - pixel_y = 3; + desc = "This appears to be the head of a synthetic, though it it is so destroyed there is no way in hell anyone is going to bring it back to even basic functionality."; name = "shattered synthetic head"; - desc = "This appears to be the head of a synthetic, though it it is so destroyed there is no way in hell anyone is going to bring it back to even basic functionality." + pixel_x = 9; + pixel_y = 3 }, /obj/item/robot_parts/arm/l_arm, /turf/open/floor{ @@ -368,10 +368,6 @@ icon_state = "platingdmg1" }, /area/lv624/lazarus/hydroponics) -"DN" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/plating, -/area/lv624/lazarus/hydroponics) "Ed" = ( /obj/item/stack/sheet/metal, /turf/open/floor{ @@ -571,7 +567,6 @@ /obj/item/ammo_magazine/smg/fp9000, /obj/item/ammo_magazine/smg/fp9000, /obj/item/clothing/gloves/marine/veteran/pmc{ - name = "damaged WY PMC gloves"; armor_bio = 10; armor_bomb = 10; armor_bullet = 15; @@ -580,6 +575,7 @@ armor_laser = 15; armor_melee = 15; armor_rad = 10; + name = "damaged WY PMC gloves"; pixel_y = 9 }, /turf/open/floor/plating, @@ -591,8 +587,6 @@ /area/lv624/lazarus/hydroponics) "RT" = ( /obj/item/clothing/shoes/veteran/pmc{ - slowdown = 0.5; - name = "scuffed shoes"; armor_bio = 15; armor_bomb = 5; armor_bullet = 15; @@ -601,8 +595,10 @@ armor_laser = 5; armor_melee = 15; desc = "The height of fashion, but these look to be woven with protective fiber. This pair seems heavily damaged, especially around the soles..."; + name = "scuffed shoes"; pixel_x = -14; - pixel_y = -10 + pixel_y = -10; + slowdown = 0.5 }, /turf/open/floor{ dir = 9; @@ -874,7 +870,7 @@ bd aO QR mK -DN +Wg TC Wg TC diff --git a/maps/map_files/LV624/maintemple/1.intact.dmm b/maps/map_files/LV624/maintemple/1.intact.dmm index 27e4f42b6152..9289d3454327 100644 --- a/maps/map_files/LV624/maintemple/1.intact.dmm +++ b/maps/map_files/LV624/maintemple/1.intact.dmm @@ -130,6 +130,7 @@ desc = "An old hide from a fearsome creature."; name = "hunter hide" }, +/obj/effect/landmark/objective_landmark/far, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "dE" = ( @@ -311,6 +312,13 @@ icon_state = "multi_tiles" }, /area/lv624/ground/caves/sand_temple) +"fQ" = ( +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "fV" = ( /obj/structure/prop/brazier/torch, /turf/closed/wall/rock/brown, @@ -404,6 +412,7 @@ name = "sacred ceremonial dagger"; pixel_x = 9 }, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "hA" = ( @@ -507,6 +516,7 @@ color = "#6b675e" }, /obj/item/restraints, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata{ color = "#5e5d5d"; icon_state = "multi_tiles" @@ -1148,6 +1158,25 @@ icon_state = "multi_tiles" }, /area/lv624/ground/caves/sand_temple) +"BY" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/item/hunting_trap{ + desc = "A bizarre alien device used for trapping and killing prey."; + name = "Alien Mine" + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "Cr" = ( /obj/effect/decal/cleanable/blood{ basecolor = "#20d450"; @@ -1445,6 +1474,7 @@ /obj/item/XenoItem/AntiAcid{ pixel_x = 4 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "LF" = ( @@ -1710,6 +1740,7 @@ color = "#6b675e" }, /obj/item/stack/yautja_rope, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple/powered) "SF" = ( @@ -1746,6 +1777,7 @@ amount = 50; pixel_y = 7 }, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" @@ -2374,7 +2406,7 @@ gL Jc Jc Jc -gL +fQ wS oi qf @@ -3332,7 +3364,7 @@ ZX ZX GT OC -KB +BY mv mv mv diff --git a/maps/map_files/LV624/maintemple/2.flooded.dmm b/maps/map_files/LV624/maintemple/2.flooded.dmm index f375b61213ce..bcbf6a54774c 100644 --- a/maps/map_files/LV624/maintemple/2.flooded.dmm +++ b/maps/map_files/LV624/maintemple/2.flooded.dmm @@ -39,6 +39,7 @@ dir = 8; health = 80 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "aN" = ( @@ -332,6 +333,13 @@ /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) +"jc" = ( +/obj/structure/platform_decoration/mineral/sandstone/runed{ + dir = 1 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "jZ" = ( /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, @@ -347,6 +355,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "lI" = ( @@ -784,6 +793,7 @@ dir = 4; health = 80 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "wt" = ( @@ -1137,6 +1147,13 @@ "EJ" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/caves/sand_temple) +"EL" = ( +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "EM" = ( /obj/structure/showcase{ color = "#95948B"; @@ -1302,6 +1319,13 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) +"Ip" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/effect/landmark/objective_landmark/far, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "Ix" = ( /obj/structure/barricade/handrail/strata, /obj/structure/barricade/handrail/strata{ @@ -1798,6 +1822,20 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) +"Xr" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/lv624/ground/caves/sand_temple) +"XQ" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "XV" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -2006,7 +2044,7 @@ GT Jm rL Dg -Ge +Xr we rL xO @@ -2260,7 +2298,7 @@ gL Jc Jc Jc -gL +EL wS if qf @@ -2848,7 +2886,7 @@ ma wU po MB -Yu +jc py yc dA @@ -3641,7 +3679,7 @@ GT SW Ai Br -UX +XQ Mq Zi mv @@ -3728,7 +3766,7 @@ GT GT GT OC -UX +Ip OC xO FS diff --git a/maps/map_files/LV624/medbay/10.destroyed.dmm b/maps/map_files/LV624/medbay/10.destroyed.dmm index 34dbd1981cf0..88e17a3aeee0 100644 --- a/maps/map_files/LV624/medbay/10.destroyed.dmm +++ b/maps/map_files/LV624/medbay/10.destroyed.dmm @@ -300,12 +300,6 @@ /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) -"AB" = ( -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor{ - icon_state = "whitebluefull" - }, -/area/lv624/lazarus/medbay) "Be" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, @@ -806,7 +800,7 @@ Il yU QR QR -AB +YJ vm uV fX diff --git a/maps/map_files/LV624/medbay/30.larvasurgery.dmm b/maps/map_files/LV624/medbay/30.larvasurgery.dmm index a47a2cd2ed62..b67b5e7bf1c5 100644 --- a/maps/map_files/LV624/medbay/30.larvasurgery.dmm +++ b/maps/map_files/LV624/medbay/30.larvasurgery.dmm @@ -480,7 +480,6 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ dir = 8; icon_state = "whiteblue" diff --git a/maps/map_files/LV624/science/10.yautja.dmm b/maps/map_files/LV624/science/10.yautja.dmm index d0dfdca90fc7..c77bacd35202 100644 --- a/maps/map_files/LV624/science/10.yautja.dmm +++ b/maps/map_files/LV624/science/10.yautja.dmm @@ -184,9 +184,9 @@ }, /obj/effect/landmark/crap_item, /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; - phone_id = "Research Dome" + phone_id = "Research Dome"; + pixel_y = 24 }, /turf/open/floor{ dir = 5; @@ -326,7 +326,6 @@ /area/lv624/lazarus/research) "aQ" = ( /obj/item/clothing/glasses/regular, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ icon_state = "white" }, @@ -456,7 +455,6 @@ /obj/structure/surface/table, /obj/item/explosive/grenade/spawnergrenade/smartdisc, /obj/item/explosive/grenade/spawnergrenade/smartdisc, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ dir = 5; icon_state = "whitepurple" @@ -528,7 +526,6 @@ "LE" = ( /obj/structure/surface/table, /obj/effect/landmark/crap_item, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ dir = 5; icon_state = "whitepurple" diff --git a/maps/map_files/LV624/science/40.fullylocked.dmm b/maps/map_files/LV624/science/40.fullylocked.dmm index 3ba311757b73..8e523f6c7e9c 100644 --- a/maps/map_files/LV624/science/40.fullylocked.dmm +++ b/maps/map_files/LV624/science/40.fullylocked.dmm @@ -329,7 +329,6 @@ /obj/structure/surface/table, /obj/structure/machinery/cell_charger, /obj/item/tool/crowbar, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ dir = 5; icon_state = "whitepurple" @@ -367,7 +366,6 @@ /area/lv624/lazarus/research) "bm" = ( /obj/structure/surface/table, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ icon_state = "freezerfloor" }, @@ -438,9 +436,9 @@ /area/lv624/lazarus/research) "oe" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; - phone_id = "Research Dome" + phone_id = "Research Dome"; + pixel_y = 24 }, /turf/open/floor{ dir = 5; @@ -603,7 +601,7 @@ ab "} (7,1,1) = {" ac -bn +Tz aq ay ay @@ -715,7 +713,7 @@ bb ay ab bn -bn +Tz aj ac bE diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm index e69c2de5bcb8..4c53a79e90d7 100644 --- a/maps/map_files/LV624/standalone/clfship.dmm +++ b/maps/map_files/LV624/standalone/clfship.dmm @@ -455,6 +455,7 @@ /area/lv624/lazarus/crashed_ship) "lv" = ( /obj/item/stack/rods, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ icon_state = "platingdmg1" }, @@ -669,6 +670,7 @@ phone_color = "yellow"; phone_id = "Engineering" }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/almayer{ icon_state = "orangecorner" }, @@ -1059,6 +1061,7 @@ /obj/item/tank/oxygen/red, /obj/item/storage/bag/trash, /obj/item/tool/screwdriver, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor{ icon_state = "platingdmg1" }, @@ -1250,6 +1253,7 @@ pixel_x = -3; pixel_y = 4 }, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/lv624/lazarus/crashed_ship) "GQ" = ( @@ -1275,6 +1279,7 @@ /obj/item/ammo_magazine/pistol/heavy, /obj/item/ammo_magazine/pistol/heavy, /obj/item/clothing/accessory/storage/webbing, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/almayer{ dir = 5; icon_state = "green" @@ -1954,6 +1959,7 @@ "Xa" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/regular, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/almayer{ dir = 1; icon_state = "emerald"