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 01/15] 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" From cd97b3607591c8d20dbb56434c0f60cbf927a45e Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:20:09 +0100 Subject: [PATCH 02/15] Automatic changelog for PR #4378 [ci skip] --- html/changelogs/AutoChangeLog-pr-4378.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4378.yml diff --git a/html/changelogs/AutoChangeLog-pr-4378.yml b/html/changelogs/AutoChangeLog-pr-4378.yml new file mode 100644 index 000000000000..b2c237cf85a4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4378.yml @@ -0,0 +1,6 @@ +author: "c4xmaniac2" +delete-after: True +changes: + - 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." \ No newline at end of file From 30bbac459902acb5b59c0f0a56f689dd2d439d5c Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:04:08 +0100 Subject: [PATCH 03/15] Fixes the tradeband scanner. (#4423) # About the pull request So it turns out I never gave the tradeband scanner the trait for itself... # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Fixes the CMB tradeband scanner not being able to do it's job. /:cl: --- code/game/objects/items/devices/scanners.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 1deee0f2ef8a..38ff8859ef97 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -465,3 +465,4 @@ FORENSIC SCANNER w_class = SIZE_SMALL flags_atom = FPRINT flags_equip_slot = SLOT_WAIST + inherent_traits = list(TRAIT_TOOL_TRADEBAND) From 712431112a4289d48f1849903812acebac8b5758 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:34:20 +0100 Subject: [PATCH 04/15] Automatic changelog for PR #4423 [ci skip] --- html/changelogs/AutoChangeLog-pr-4423.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4423.yml diff --git a/html/changelogs/AutoChangeLog-pr-4423.yml b/html/changelogs/AutoChangeLog-pr-4423.yml new file mode 100644 index 000000000000..85d0ba5afce0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4423.yml @@ -0,0 +1,4 @@ +author: "realforest2001" +delete-after: True +changes: + - bugfix: "Fixes the CMB tradeband scanner not being able to do it's job." \ No newline at end of file From cc84139e39fa3ae41ab9fbc88ce99b5145067385 Mon Sep 17 00:00:00 2001 From: Hopekz Date: Mon, 18 Sep 2023 19:10:51 -0500 Subject: [PATCH 05/15] New facehugger strain: Watcher (#3726) Super easy to understand: The watcher loses the ability to hide in exchange for letting them see further. I don't have a sprite for this at the moment and probably won't for this PR so I have made them stand out by making them more orange because I think marines being able to see if a hugger is a Watcher might be important. ![image](https://github.com/cmss13-devs/cmss13/assets/24533979/583b12f7-fef3-4da7-a989-14661cf98f5f) Currently they see 2 extra tiles like the runner but in testmerging I think it may change to 3 tiles (view range 10 instead of view range 9) unless I hit the perfect sweet spot already. **EDIT: This number is now 3** **the way I see it watcher is designed for 2 main playstyles:** 1: Backlining to try to get someone not paying attention or busy (right behind marine frontline like medics doing medic stuff or someone resupplying/playing with inventory) or deep in the backline to try to find someone vulnerable. 2: Hanging around the xeno side frontline with increased situational awareness to be exactly where you need to be for xeno assisted caps. For example as a watcher during the TM I have an easier time watching a warrior fling someone and capitalizing a hug off a fling because I don't have to go out until the fling happens etc update: ------ The activation of the view range now works similar to the runner; it is toggle-able ![dreamseeker_tyE3nVA9V0](https://github.com/cmss13-devs/cmss13/assets/24533979/b232b076-8f0b-4a83-abbc-fe4c84a72d21) Fixed exploit that allowed watchers to hide despite not having the ability. Update 2: -------- The watcher now does not take weeds over time. Essentially implemented this: ![Discord_9s19Vo2olV](https://github.com/cmss13-devs/cmss13/assets/24533979/0f2d3121-2c3d-4751-b8e9-263df9a9a697) **Why:** The damage over time is meant so that the hugger cannot hide under some unweeded item the whole round to hug some random unsuspecting marine. The watcher cannot hide and is meant to be a backlining caste. This allows the watcher to stalk people outside of weeds and wait for the perfect opportunity to hug when their target is distracted or busy. Update 3: -------- Added my codersprite to the watcher. These were created by me so hopefully a spriter or my spriter replaces these with a better one if they suck. ![dreamseeker_O6I1iXuo21](https://github.com/cmss13-devs/cmss13/assets/24533979/55ddf0cb-a23a-448a-9afa-d8d987fa3d03) :cl: Hopek add: New facehugger strain: Watcher. The Watcher loses their ability to hide in exchange to see further and the ability to no longer take damage outside of weeds. /:cl: --------- Co-authored-by: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> --- code/__DEFINES/mobs.dm | 4 ++ .../carbon/xenomorph/castes/Facehugger.dm | 38 ++++++++++++++++-- icons/mob/xenos/facehugger.dmi | Bin 6962 -> 13481 bytes 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index c0886ab871f9..1bd030313a43 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -310,6 +310,10 @@ // Queen strain flags #define QUEEN_NORMAL "Normal" +// Facehugger strain flags +#define FACEHUGGER_NORMAL "Normal" +#define FACEHUGGER_WATCHER "Watcher" + // Drone strain flags #define DRONE_NORMAL "Normal" #define DRONE_HEALER "Healer" diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index ac03389994c9..4e5cce0c6c30 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -67,13 +67,13 @@ PF.flags_can_pass_all = PASS_ALL^PASS_OVER_THROW_ITEM /mob/living/carbon/xenomorph/facehugger/Life(delta_time) + if(stat != DEAD && !lying && !(mutation_type == FACEHUGGER_WATCHER) && !(locate(/obj/effect/alien/weeds) in get_turf(src))) + adjustBruteLoss(1) + return ..() if(!client && !aghosted && away_timer > XENO_FACEHUGGER_LEAVE_TIMER) // Become a npc once again new /obj/item/clothing/mask/facehugger(loc, hivenumber) qdel(src) - return - if(stat != DEAD && !lying && !(locate(/obj/effect/alien/weeds) in get_turf(src))) - adjustBruteLoss(1) return ..() /mob/living/carbon/xenomorph/facehugger/update_icons(is_pouncing) @@ -217,3 +217,35 @@ . += "Lifetime Hugs: [total_facehugs] / [next_facehug_goal]" else . += "Lifetime Hugs: [total_facehugs]" + + +/datum/xeno_mutator/watcher + name = "STRAIN: Facehugger - Watcher" + description = "You lose your ability to hide in exchange to see further and the ability to no longer take damage outside of weeds. This enables you to stalk your host from a distance and wait for the perfect oppertunity to strike." + flavor_description = "No need to hide when you can see the danger." + individual_only = TRUE + caste_whitelist = list(XENO_CASTE_FACEHUGGER) + mutator_actions_to_remove = list( + /datum/action/xeno_action/onclick/xenohide, + ) + mutator_actions_to_add = list( + /datum/action/xeno_action/onclick/toggle_long_range/runner, + ) + + cost = 1 + + keystone = TRUE + +/datum/xeno_mutator/watcher/apply_mutator(datum/mutator_set/individual_mutators/mutator_set) + . = ..() + if(!.) + return + + var/mob/living/carbon/xenomorph/facehugger/facehugger = mutator_set.xeno + + facehugger.viewsize = 10 + facehugger.layer = MOB_LAYER + + facehugger.mutation_type = FACEHUGGER_WATCHER + mutator_update_actions(facehugger) + mutator_set.recalculate_actions(description, flavor_description) diff --git a/icons/mob/xenos/facehugger.dmi b/icons/mob/xenos/facehugger.dmi index d44903adf941d1d6d59222e5a42a0fbbfed3b544..2d8665899331021df69fa679271a0bf683e50f88 100644 GIT binary patch literal 13481 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 X;wZ3ku#u|x00000NkvXXu0mjfrWott literal 6962 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 Ef;vuZssI20 From 272f4040bed2fc08d26aea7b93e5a1bb27d434b4 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:50:51 +0100 Subject: [PATCH 06/15] Automatic changelog for PR #3726 [ci skip] --- html/changelogs/AutoChangeLog-pr-3726.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3726.yml diff --git a/html/changelogs/AutoChangeLog-pr-3726.yml b/html/changelogs/AutoChangeLog-pr-3726.yml new file mode 100644 index 000000000000..574ecbe0f4e9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3726.yml @@ -0,0 +1,4 @@ +author: "Hopek" +delete-after: True +changes: + - rscadd: "New facehugger strain: Watcher. The Watcher loses their ability to hide in exchange to see further and the ability to no longer take damage outside of weeds." \ No newline at end of file From a154f9858877f192d11af59e17d42cfc02f3af2b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 19 Sep 2023 01:07:51 +0000 Subject: [PATCH 07/15] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-3726.yml | 4 ---- html/changelogs/AutoChangeLog-pr-4378.yml | 6 ------ html/changelogs/AutoChangeLog-pr-4423.yml | 4 ---- html/changelogs/archive/2023-09.yml | 12 ++++++++++++ 4 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-3726.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4378.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4423.yml diff --git a/html/changelogs/AutoChangeLog-pr-3726.yml b/html/changelogs/AutoChangeLog-pr-3726.yml deleted file mode 100644 index 574ecbe0f4e9..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3726.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hopek" -delete-after: True -changes: - - rscadd: "New facehugger strain: Watcher. The Watcher loses their ability to hide in exchange to see further and the ability to no longer take damage outside of weeds." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4378.yml b/html/changelogs/AutoChangeLog-pr-4378.yml deleted file mode 100644 index b2c237cf85a4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4378.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "c4xmaniac2" -delete-after: True -changes: - - 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." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4423.yml b/html/changelogs/AutoChangeLog-pr-4423.yml deleted file mode 100644 index 85d0ba5afce0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4423.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - bugfix: "Fixes the CMB tradeband scanner not being able to do it's job." \ No newline at end of file diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml index a2a40d6566b0..4a4bd3219556 100644 --- a/html/changelogs/archive/2023-09.yml +++ b/html/changelogs/archive/2023-09.yml @@ -233,3 +233,15 @@ - rscdel: Disables Shivas Snowball Private Tristan: - spellcheck: acid runners are now properly informed of their corrosive acid's strength. +2023-09-19: + Hopek: + - rscadd: 'New facehugger strain: Watcher. The Watcher loses their ability to hide + in exchange to see further and the ability to no longer take damage outside + of weeds.' + c4xmaniac2: + - 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. + realforest2001: + - bugfix: Fixes the CMB tradeband scanner not being able to do it's job. From e97996f899ac416ae6c130a1775af1919a2beceb Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Tue, 19 Sep 2023 03:46:46 +0300 Subject: [PATCH 08/15] IOs get their own squads (#4375) # About the pull request IOs get their own squad, and they get assigned roundstart # Explain why it's good for the game It promotes teamwork for IOs, the lack of which is the https://github.com/cmss13-devs/cmss13/pull/1 cause of IO death In addition there's already an overwatch console in the CIC office. You could already do this via Echo, but that's not apparant to new players # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: TheGamerdk, ihatethisengine add: IOs start in their own squad now /:cl: --------- Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Co-authored-by: ihatethisengine --- code/__DEFINES/job.dm | 1 + code/__DEFINES/minimap.dm | 1 + code/game/jobs/job/command/auxiliary/intel.dm | 2 +- code/game/jobs/job/marine/squads.dm | 29 +++++++++++++++++-- code/game/jobs/role_authority.dm | 9 ++++++ .../mob/living/carbon/human/update_icons.dm | 4 +-- .../tgui/interfaces/OverwatchConsole.js | 1 + 7 files changed, 42 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 600f7d14b0aa..d80c3b5bb23b 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -9,6 +9,7 @@ #define SQUAD_MARINE_4 "Delta" #define SQUAD_MARINE_5 "Echo" #define SQUAD_MARINE_CRYO "Foxtrot" +#define SQUAD_MARINE_INTEL "Intel" #define SQUAD_SOF "SOF" // Job name defines diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm index c9f21484f622..71d0ed8e7445 100644 --- a/code/__DEFINES/minimap.dm +++ b/code/__DEFINES/minimap.dm @@ -52,6 +52,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL)) #define MINIMAP_SQUAD_ECHO "#00b043" #define MINIMAP_SQUAD_FOXTROT "#fe7b2e" #define MINIMAP_SQUAD_SOF "#400000" +#define MINIMAP_SQUAD_INTEL "#053818" #define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820" #define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f" diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm index 10b8381c417e..0c6e80069a68 100644 --- a/code/game/jobs/job/command/auxiliary/intel.dm +++ b/code/game/jobs/job/command/auxiliary/intel.dm @@ -6,7 +6,7 @@ allow_additional = 1 scaled = 1 supervisors = "the auxiliary support officer" - flags_startup_parameters = ROLE_ADD_TO_DEFAULT + flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = "USCM Intelligence Officer (IO) (Cryo)" entry_message_body = "Your job is to assist the marines in collecting intelligence related to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources." diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index 116de402104d..bdc903fdd47d 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -31,6 +31,8 @@ var/tracking_id = null //Used for the tracking subsystem /// Maximum number allowed in a squad. Defaults to infinite var/max_positions = -1 + /// If uses the overlay + var/use_stripe_overlay = TRUE /// Color for the squad marines gear overlays var/equipment_color = "#FFFFFF" /// The alpha for the armor overlay used by equipment color @@ -108,6 +110,9 @@ var/minimap_color = MINIMAP_SQUAD_UNKNOWN + ///Should we add the name of our squad in front of their name? Ex: Alpha Hospital Corpsman + var/prepend_squad_name_to_assignment = TRUE + /datum/squad/marine name = "Root" @@ -175,6 +180,23 @@ roundstart = FALSE locked = TRUE +/datum/squad/marine/intel + name = SQUAD_MARINE_INTEL + use_stripe_overlay = FALSE + equipment_color = "#053818" + minimap_color = MINIMAP_SQUAD_INTEL + radio_freq = null + + roundstart = FALSE + prepend_squad_name_to_assignment = FALSE + + max_engineers = 0 + max_medics = 0 + max_specialists = 0 + max_tl = 0 + max_smartgun = 0 + max_leaders = 0 + /datum/squad/marine/sof name = SQUAD_SOF equipment_color = "#400000" @@ -496,7 +518,10 @@ marines_list += M M.assigned_squad = src //Add them to the squad C.access += (src.access + extra_access) //Add their squad access to their ID - C.assignment = "[name] [assignment]" + if(prepend_squad_name_to_assignment) + C.assignment = "[name] [assignment]" + else + C.assignment = assignment SEND_SIGNAL(M, COMSIG_SET_SQUAD) @@ -505,7 +530,7 @@ C.name = "[C.registered_name]'s ID Card ([C.assignment])" var/obj/item/device/radio/headset/almayer/marine/headset = locate() in list(M.wear_l_ear, M.wear_r_ear) - if(headset) + if(headset && radio_freq) headset.set_frequency(radio_freq) M.update_inv_head() M.update_inv_wear_suit() diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm index d1934c597da7..c147807f004e 100644 --- a/code/game/jobs/role_authority.dm +++ b/code/game/jobs/role_authority.dm @@ -652,6 +652,15 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou if (S.roundstart && S.usable && S.faction == H.faction && S.name != "Root") mixed_squads += S + //Deal with IOs first + if(H.job == JOB_INTEL) + var/datum/squad/intel_squad = get_squad_by_name(SQUAD_MARINE_INTEL) + if(!intel_squad || !istype(intel_squad)) //Something went horribly wrong! + to_chat(H, "Something went wrong with randomize_squad()! Tell a coder!") + return + intel_squad.put_marine_in_squad(H) //Found one, finish up + return + //Deal with non-standards first. //Non-standards are distributed regardless of squad population. //If the number of available positions for the job are more than max_whatever, it will break. diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 5fa8b577e8c2..e7e36242a90a 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -494,7 +494,7 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, if(istype(head, /obj/item/clothing/head/helmet/marine)) var/obj/item/clothing/head/helmet/marine/marine_helmet = head if(assigned_squad && marine_helmet.flags_marine_helmet & HELMET_SQUAD_OVERLAY) - if(assigned_squad && assigned_squad.equipment_color) + if(assigned_squad && assigned_squad.equipment_color && assigned_squad.use_stripe_overlay) var/leader = assigned_squad.squad_leader var/image/helmet_overlay = image(marine_helmet.helmet_overlay_icon, icon_state = "std-helmet") if(leader == src) @@ -556,7 +556,7 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, if(istype(wear_suit, /obj/item/clothing/suit/storage/marine)) var/obj/item/clothing/suit/storage/marine/marine_armor = wear_suit if(marine_armor.flags_marine_armor & ARMOR_SQUAD_OVERLAY) - if(assigned_squad && assigned_squad.equipment_color) + if(assigned_squad && assigned_squad.equipment_color && assigned_squad.use_stripe_overlay) var/leader = assigned_squad.squad_leader var/image/squad_overlay = image(marine_armor.squad_overlay_icon, icon_state = "std-armor") if(leader == src) diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.js b/tgui/packages/tgui/interfaces/OverwatchConsole.js index 7beceef9e72d..1a6f67ac7ccd 100644 --- a/tgui/packages/tgui/interfaces/OverwatchConsole.js +++ b/tgui/packages/tgui/interfaces/OverwatchConsole.js @@ -28,6 +28,7 @@ const HomePanel = (props, context) => { 'delta': 'blue', 'echo': 'green', 'foxtrot': 'brown', + 'intel': 'green', }; return ( From 8147159ff1ddba8b302c564ef13659a84a3affea Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 19 Sep 2023 02:20:52 +0100 Subject: [PATCH 09/15] Automatic changelog for PR #4375 [ci skip] --- html/changelogs/AutoChangeLog-pr-4375.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4375.yml diff --git a/html/changelogs/AutoChangeLog-pr-4375.yml b/html/changelogs/AutoChangeLog-pr-4375.yml new file mode 100644 index 000000000000..a32ceb7fce68 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4375.yml @@ -0,0 +1,4 @@ +author: "TheGamerdk, ihatethisengine" +delete-after: True +changes: + - rscadd: "IOs start in their own squad now" \ No newline at end of file From c091d2b6d99aa47097731a2650c561fdc86f5a17 Mon Sep 17 00:00:00 2001 From: c4xmaniac2 <133173804+c4xmaniac2@users.noreply.github.com> Date: Mon, 18 Sep 2023 21:43:25 -0400 Subject: [PATCH 10/15] Science Annex Yard Readdition (#4379) # About the pull request This PR aims to readd yard to Science Annex. In February last year, we removed yard due to having a negative effect on Science Annex's gameplay flow. However, the complete removal of it has shown over time that it also has its own major issues. This readdition should address the flow issues that the map suffers. Will probably require test merging to gauge its effect, another possible solution is only allowing it to serve as a connector to the North and South. # Explain why it's good for the game Science Annex currently suffers badly from there being no center of the map, meaning that you have to travel all the way around the map to reach the other side. This should aid in the flow of the map, without allowing yard to turn into the meta afk and hold spot while ignoring the rest of the map. You can use yard as a hold, but you will need to use the rest of the map to push. # Testing Photographs and Procedure
Screenshots & Videos ![image](https://github.com/cmss13-devs/cmss13/assets/133173804/1009ca47-3119-4076-a221-df84122784d5)
# Changelog :cl: mapadd: Readds yard to Science Annex maptweak: Redid the yard loot to be more in line with current surv loot standards. /:cl: --------- Co-authored-by: Morrow --- .../FOP_v3_Sciannex/Fiorina_SciAnnex.dmm | 3665 ++++++++++------- .../sprinkles/20.yardbasketball.dmm | 337 ++ 2 files changed, 2593 insertions(+), 1409 deletions(-) create mode 100644 maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index e8c3bb319b7e..2c6bfb2071be 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -174,6 +174,15 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) +"acx" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "ppflowers_2" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "adk" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ @@ -205,6 +214,12 @@ icon_state = "yellow" }, /area/fiorina/station/disco) +"aee" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "aem" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/donkpockets{ @@ -346,14 +361,10 @@ }, /area/fiorina/tumor/servers) "ajp" = ( -/obj/structure/barricade/wooden{ - dir = 4; - pixel_y = 4 - }, -/obj/structure/barricade/wooden, +/obj/structure/window/framed/prison, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) "ajr" = ( @@ -546,6 +557,9 @@ /area/fiorina/station/park) "anG" = ( /obj/structure/largecrate/supply, +/obj/structure/platform_decoration{ + dir = 8 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) "anJ" = ( @@ -562,11 +576,12 @@ /turf/open/floor/carpet, /area/fiorina/station/security/wardens) "aoa" = ( -/obj/structure/largecrate/random/mini/med, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" +/obj/structure/machinery/door/airlock/almayer/maint/autoname{ + name = "\improper Null Hatch REPLACE ME"; + req_access = null; + req_one_access = null }, +/turf/open/floor/plating/prison, /area/fiorina/station/medbay) "aoH" = ( /obj/structure/surface/rack, @@ -671,6 +686,14 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/servers) +"arY" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "ask" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -919,6 +942,21 @@ /obj/structure/girder, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"azy" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "azI" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ desc = "A ticket to Souto Man's raffle!"; @@ -1069,19 +1107,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"aCO" = ( -/obj/structure/bed/chair{ - dir = 1; - pixel_y = 3 - }, -/obj/item/reagent_container/food/drinks/cans/beer{ - pixel_x = 12; - pixel_y = 8 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) "aCT" = ( /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/prison{ @@ -1215,12 +1240,6 @@ icon_state = "plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"aFO" = ( -/obj/structure/largecrate/supply/floodlights, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/disco) "aFV" = ( /obj/item/stack/sheet/wood, /obj/structure/machinery/light/double/blue, @@ -1241,12 +1260,11 @@ }, /area/fiorina/station/chapel) "aGS" = ( -/obj/structure/lattice, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "whitegreen" }, -/turf/open/space, -/area/fiorina/oob) +/area/fiorina/station/medbay) "aGV" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/prison, @@ -1361,6 +1379,11 @@ icon_state = "bluefull" }, /area/fiorina/station/power_ring) +"aIX" = ( +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/central_ring) "aIZ" = ( /obj/structure/prop/resin_prop{ icon_state = "rack" @@ -1392,6 +1415,13 @@ icon_state = "kitchen" }, /area/fiorina/station/civres_blue) +"aJU" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "aJX" = ( /obj/structure/bed/chair{ dir = 8 @@ -1449,6 +1479,12 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer_hull, /area/fiorina/station/medbay) +"aLC" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged1" + }, +/area/fiorina/station/central_ring) "aLR" = ( /obj/item/stack/medical/bruise_pack, /turf/open/floor/prison, @@ -1499,13 +1535,11 @@ }, /area/fiorina/station/park) "aNw" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/obj/structure/platform, +/turf/open/floor/prison{ + icon_state = "whitegreen" }, -/turf/open/space, -/area/fiorina/oob) +/area/fiorina/station/medbay) "aNP" = ( /obj/structure/inflatable, /obj/structure/barricade/handrail/type_b, @@ -1593,6 +1627,21 @@ "aPH" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/security/wardens) +"aQB" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "aQE" = ( /obj/item/stack/sheet/metal{ amount = 5 @@ -1724,13 +1773,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"aTN" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) "aUa" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/prison{ @@ -1892,6 +1934,13 @@ dir = 5 }, /area/fiorina/tumor/aux_engi) +"aXK" = ( +/obj/item/clothing/under/shorts/green, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/central_ring) "aXM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/cable_coil/orange, @@ -2235,11 +2284,11 @@ }, /area/fiorina/station/park) "biJ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/kitchen/utensil/fork, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, +/turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/research_cells) "bjk" = ( /obj/structure/sink{ @@ -2427,6 +2476,13 @@ }, /area/fiorina/station/security) "bqy" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 10 + }, /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ dir = 10; @@ -2456,6 +2512,18 @@ icon_state = "darkyellowfull2" }, /area/fiorina/tumor/servers) +"brI" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform_decoration/kutjevo, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "brS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, @@ -2567,10 +2635,12 @@ /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "bxa" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) +/obj/structure/platform, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) "bxl" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -2607,13 +2677,6 @@ icon_state = "stan27" }, /area/fiorina/tumor/ship) -"byl" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) "bym" = ( /turf/closed/shuttle/ert{ icon_state = "stan20" @@ -2686,18 +2749,6 @@ icon_state = "stan25" }, /area/fiorina/tumor/aux_engi) -"bAB" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) "bAS" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ @@ -2732,6 +2783,13 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/prison, /area/fiorina/tumor/aux_engi) +"bCk" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" + }, +/area/fiorina/station/central_ring) "bCu" = ( /obj/item/shard{ icon_state = "large" @@ -3067,10 +3125,6 @@ /obj/item/tool/pen, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"bMl" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/lowsec) "bMr" = ( /turf/open/floor/prison{ dir = 10; @@ -3203,13 +3257,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"bQp" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) "bQx" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison{ @@ -3372,6 +3419,10 @@ /obj/structure/machinery/faxmachine, /turf/open/floor/wood, /area/fiorina/station/security/wardens) +"bWr" = ( +/obj/structure/inflatable/popped, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "bWE" = ( /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/prison{ @@ -3448,6 +3499,20 @@ icon_state = "yellow" }, /area/fiorina/station/lowsec) +"bZC" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/obj/item/tool/crowbar/red, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/medbay) "bZF" = ( /obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison{ @@ -3492,12 +3557,6 @@ icon_state = "kitchen" }, /area/fiorina/station/power_ring) -"cbH" = ( -/obj/structure/largecrate/supply/generator, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/disco) "cbK" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = null @@ -3601,19 +3660,13 @@ }, /area/fiorina/station/research_cells) "chA" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/lattice, /obj/structure/platform/kutjevo/smooth{ dir = 4 }, /obj/structure/platform/kutjevo/smooth{ dir = 1 }, -/turf/open/space, +/turf/open/space/basic, /area/fiorina/oob) "chJ" = ( /obj/structure/bed{ @@ -3707,19 +3760,18 @@ }, /area/fiorina/station/botany) "cjA" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/lattice, /obj/structure/platform/kutjevo/smooth{ dir = 8 }, /obj/structure/platform/kutjevo/smooth{ dir = 1 }, -/turf/open/space, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, /area/fiorina/oob) "cjF" = ( /turf/open/floor/prison{ @@ -3733,6 +3785,12 @@ icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) +"ckj" = ( +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "ckm" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -3827,6 +3885,18 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/servers) +"cmz" = ( +/obj/structure/platform_decoration/kutjevo, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space, +/area/fiorina/oob) "cmI" = ( /obj/structure/platform{ dir = 8 @@ -3854,6 +3924,10 @@ icon_state = "panelscorched" }, /area/fiorina/station/chapel) +"cnl" = ( +/obj/structure/largecrate/supply/supplies/metal, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "cnn" = ( /obj/item/device/flashlight, /turf/open/floor/prison{ @@ -3865,10 +3939,6 @@ /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/prison, /area/fiorina/station/disco) -"cnF" = ( -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison, -/area/fiorina/station/medbay) "cnU" = ( /obj/structure/machinery/computer/atmos_alert, /obj/structure/surface/table/reinforced/prison, @@ -3927,6 +3997,8 @@ /obj/structure/platform/kutjevo/smooth{ dir = 8 }, +/obj/structure/platform/kutjevo/smooth, +/obj/structure/lattice, /turf/open/space/basic, /area/fiorina/oob) "cqc" = ( @@ -4231,12 +4303,18 @@ }, /area/fiorina/station/research_cells) "cAv" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 8; - layer = 3.5 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/central_ring) "cAA" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/floor/prison{ @@ -4431,6 +4509,13 @@ icon_state = "whitepurple" }, /area/fiorina/station/research_cells) +"cFN" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/central_ring) "cFQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/bottle/vodka{ @@ -4616,6 +4701,15 @@ }, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"cNC" = ( +/obj/structure/prop/almayer/computers/mission_planning_system{ + density = 0; + desc = "Its a telephone, and a computer. Woah."; + name = "\improper funny telephone booth"; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "cOb" = ( /obj/item/ammo_casing{ icon_state = "casing_6" @@ -4835,6 +4929,12 @@ icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) +"cWN" = ( +/obj/item/weapon/gun/rifle/mar40, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "cWR" = ( /obj/effect/landmark/objective_landmark/medium, /obj/structure/closet/secure_closet/engineering_personal, @@ -4884,20 +4984,32 @@ /turf/open/floor/plating/prison, /area/fiorina/station/flight_deck) "cYa" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/fiorina/oob) +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/fiorina/station/central_ring) "cYg" = ( -/obj/item/ammo_magazine/m56d, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, -/area/fiorina/station/medbay) +/area/fiorina/station/central_ring) +"cYv" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "cYP" = ( /obj/structure/closet/crate/trashcart, /obj/item/storage/pill_bottle/dexalin/skillless, @@ -4922,6 +5034,15 @@ icon_state = "whitepurple" }, /area/fiorina/station/research_cells) +"cZc" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/fiorina/oob) "cZq" = ( /obj/item/shard{ icon_state = "medium" @@ -4938,6 +5059,12 @@ }, /turf/open/floor/wood, /area/fiorina/station/security) +"das" = ( +/obj/structure/platform/shiva{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "daA" = ( /obj/item/clothing/accessory/armband/cargo{ desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; @@ -5087,6 +5214,10 @@ icon_state = "whitegreen" }, /area/fiorina/station/medbay) +"deH" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "deL" = ( /obj/structure/window/framed/prison/reinforced/hull, /obj/structure/window/framed/prison/reinforced/hull, @@ -5185,13 +5316,10 @@ }, /area/fiorina/station/chapel) "dhe" = ( -/obj/structure/barricade/metal/wired{ - dir = 4 - }, /turf/open/floor/prison{ icon_state = "cell_stripe" }, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "dhi" = ( /obj/structure/platform_decoration/kutjevo, /turf/open/space/basic, @@ -5313,6 +5441,20 @@ name = "astroturf" }, /area/fiorina/station/research_cells) +"djU" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "dka" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -5325,21 +5467,6 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"dkg" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) "dkj" = ( /turf/open/floor/prison{ dir = 8; @@ -5438,6 +5565,16 @@ /obj/effect/spawner/random/toy, /turf/open/floor/wood, /area/fiorina/station/chapel) +"dnA" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "dnB" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison{ @@ -5451,6 +5588,15 @@ }, /turf/open/floor/prison, /area/fiorina/station/security) +"dnI" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "ywflowers_4" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "dnK" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -5694,13 +5840,14 @@ }, /area/fiorina/station/power_ring) "dvY" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/obj/structure/machinery/door/airlock/almayer/maint/autoname{ + dir = 1; + name = "\improper Null Hatch REPLACE ME"; + req_access = null; + req_one_access = null }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/fiorina/oob) +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) "dwg" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -6123,11 +6270,8 @@ /turf/open/floor/prison, /area/fiorina/station/flight_deck) "dGw" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 4 - }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "dGx" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 @@ -6150,6 +6294,14 @@ icon_state = "yellow" }, /area/fiorina/station/lowsec) +"dHI" = ( +/obj/item/ammo_casing{ + icon_state = "casing_1" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "dIa" = ( /obj/item/stack/sheet/metal{ amount = 5 @@ -6185,7 +6337,6 @@ dir = 4; icon_state = "triagedecaldir" }, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" @@ -6255,7 +6406,7 @@ }, /area/fiorina/station/research_cells) "dMa" = ( -/obj/structure/largecrate/random, +/obj/structure/stairs/perspective, /turf/open/floor/plating/prison, /area/fiorina/maintenance) "dMc" = ( @@ -6304,21 +6455,6 @@ icon_state = "floor_marked" }, /area/fiorina/station/park) -"dMU" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/space, -/area/fiorina/oob) "dNh" = ( /turf/open/auto_turf/sand/layer1, /area/fiorina/lz/near_lzI) @@ -6415,6 +6551,14 @@ name = "metal wall" }, /area/fiorina/oob) +"dRW" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "dSw" = ( /obj/structure/bed{ icon_state = "abed" @@ -6561,6 +6705,10 @@ "dYr" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/explosive/grenade/incendiary/molotov, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -6680,6 +6828,12 @@ /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"ecC" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "ecF" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_y = 32 @@ -6713,6 +6867,10 @@ icon_state = "greenfull" }, /area/fiorina/tumor/servers) +"edd" = ( +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "edv" = ( /obj/item/storage/fancy/cigar, /turf/open/floor/prison, @@ -6935,6 +7093,13 @@ /turf/open/floor/prison, /area/fiorina/station/chapel) "eli" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 6 + }, /obj/structure/closet/emcloset, /turf/open/floor/prison{ dir = 10; @@ -7475,10 +7640,8 @@ /turf/open/floor/prison, /area/fiorina/station/power_ring) "eDn" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/central_ring) "eDs" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison{ @@ -7561,10 +7724,9 @@ }, /area/fiorina/station/lowsec) "eHa" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/fiorina/oob) +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/central_ring) "eHC" = ( /turf/closed/shuttle/ert{ icon_state = "wy25" @@ -7633,6 +7795,12 @@ /obj/structure/lattice, /turf/open/space/basic, /area/fiorina/oob) +"eKg" = ( +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkpurple2" + }, +/area/fiorina/station/central_ring) "eKu" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -7662,6 +7830,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/botany) +"eMJ" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "eML" = ( /obj/structure/monorail{ name = "launch track" @@ -7673,6 +7845,15 @@ icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_tram) +"eMO" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "ywflowers_2" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "eMU" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -7745,6 +7926,14 @@ icon_state = "greenfull" }, /area/fiorina/tumor/servers) +"eON" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "eOS" = ( /obj/item/tool/warning_cone, /obj/structure/machinery/light/double/blue, @@ -7758,6 +7947,15 @@ icon_state = "floor_plate" }, /area/fiorina/station/flight_deck) +"ePm" = ( +/obj/structure/barricade/handrail{ + dir = 1; + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "ePq" = ( /obj/item/trash/cigbutt/ucigbutt, /obj/item/trash/cigbutt/ucigbutt{ @@ -8102,33 +8300,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"eZq" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) -"eZA" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) "eZD" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = null @@ -8237,21 +8408,6 @@ icon_state = "floor_plate" }, /area/fiorina/station/chapel) -"fcZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) "fde" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -8341,7 +8497,6 @@ pixel_x = 10; pixel_y = -3 }, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" @@ -8374,19 +8529,12 @@ }, /area/fiorina/maintenance) "fhz" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +/obj/structure/barricade/wooden, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, -/turf/open/space/basic, -/area/fiorina/oob) +/area/fiorina/station/central_ring) "fhC" = ( /obj/item/stack/rods, /turf/open/floor/prison{ @@ -8475,6 +8623,17 @@ "fjd" = ( /turf/closed/wall/prison, /area/fiorina/lz/near_lzI) +"fje" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 6 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = -13; + pixel_y = 13 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "fjr" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/plating_catwalk/prison, @@ -8738,13 +8897,9 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) "fsn" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) +/obj/item/device/flashlight, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "ftq" = ( /obj/item/stack/cable_coil/orange, /turf/open/floor/prison{ @@ -8815,6 +8970,17 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) +"fvY" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "fwn" = ( /obj/structure/lattice, /obj/item/stack/sheet/metal, @@ -9049,7 +9215,7 @@ /obj/structure/inflatable/popped/door, /obj/item/ammo_magazine/m56d, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "fBp" = ( /obj/structure/closet/firecloset, /turf/open/floor/prison{ @@ -9088,12 +9254,9 @@ }, /area/fiorina/tumor/civres) "fDI" = ( -/obj/structure/prop/almayer/computers/mission_planning_system{ - density = 0; - desc = "Its a telephone, and a computer. Woah."; - name = "\improper funny telephone booth"; - pixel_x = 2; - pixel_y = 21 +/obj/structure/barricade/handrail/type_b{ + dir = 8; + layer = 3.5 }, /turf/open/floor/prison{ icon_state = "floor_plate" @@ -9781,6 +9944,15 @@ /obj/structure/bed/chair/office/dark, /turf/open/floor/prison, /area/fiorina/tumor/ice_lab) +"fYV" = ( +/obj/structure/machinery/door/airlock/almayer/marine{ + dir = 1; + icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/research_cells) "fYW" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/carpet, @@ -9886,9 +10058,16 @@ icon_state = "greenfull" }, /area/fiorina/tumor/civres) -"gcy" = ( -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/lowsec) +"gde" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/fiorina/station/central_ring) "gdn" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison{ @@ -9956,20 +10135,9 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/maintenance) "gfp" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) +/obj/structure/machinery/m56d_hmg/mg_turret/dropship, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "gfw" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/donut_box{ @@ -10019,15 +10187,6 @@ icon_state = "yellow" }, /area/fiorina/station/lowsec) -"ggu" = ( -/obj/item/ammo_casing{ - icon_state = "casing_6_1" - }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) "ggB" = ( /obj/item/stool, /turf/open/floor/prison{ @@ -10044,12 +10203,15 @@ }, /area/fiorina/tumor/ice_lab) "ggQ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "ghg" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -10090,16 +10252,6 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/servers) -"gik" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger{ - pixel_y = 4 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "giX" = ( /obj/structure/barricade/handrail/type_b{ dir = 4 @@ -10152,6 +10304,16 @@ }, /turf/open/floor/prison, /area/fiorina/station/medbay) +"gky" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) "gkZ" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalleft" @@ -10456,14 +10618,13 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) "guB" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 8; - layer = 3.5 - }, +/obj/item/ammo_magazine/m56d, +/obj/item/ammo_magazine/m56d, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "cell_stripe" }, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "guG" = ( /turf/open/floor/prison{ dir = 9; @@ -10588,9 +10749,8 @@ }, /area/fiorina/station/park) "gyW" = ( -/obj/item/weapon/harpoon, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) +/turf/open/space, +/area/fiorina/station/medbay) "gzb" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -10648,6 +10808,16 @@ /obj/structure/largecrate/random/case, /turf/open/floor/prison, /area/fiorina/tumor/aux_engi) +"gAk" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/fiorina/oob) "gAA" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/plating/prison, @@ -10710,6 +10880,16 @@ icon_state = "cell_stripe" }, /area/fiorina/station/flight_deck) +"gDt" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) "gDx" = ( /obj/structure/surface/table/woodentable, /obj/item/newspaper{ @@ -10779,9 +10959,9 @@ /turf/open/space, /area/fiorina/oob) "gEW" = ( -/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "cell_stripe" }, /area/fiorina/station/lowsec) "gFc" = ( @@ -11244,10 +11424,11 @@ }, /area/fiorina/station/park) "gTw" = ( -/obj/structure/lattice, -/obj/structure/platform_decoration/kutjevo, -/turf/open/space/basic, -/area/fiorina/oob) +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/fiorina/station/central_ring) "gUf" = ( /turf/open/floor/prison{ dir = 10; @@ -11278,11 +11459,9 @@ }, /area/fiorina/station/telecomm/lz1_cargo) "gUH" = ( -/obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/prison{ - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) +/obj/structure/machinery/cm_vending/sorted/medical/wall_med, +/turf/closed/wall/prison, +/area/fiorina/station/medbay) "gUO" = ( /obj/item/tool/warning_cone, /turf/open/floor/prison, @@ -11308,6 +11487,18 @@ icon_state = "redfull" }, /area/fiorina/station/security) +"gVR" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/fiorina/maintenance) +"gVX" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkpurple2" + }, +/area/fiorina/station/central_ring) "gWf" = ( /obj/structure/barricade/handrail/type_b{ dir = 1 @@ -11342,6 +11533,13 @@ icon_state = "green" }, /area/fiorina/tumor/civres) +"gXi" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 + }, +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "gXt" = ( /turf/open/floor/prison{ icon_state = "platingdmg1" @@ -11352,6 +11550,14 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) +"gXD" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "gXH" = ( /obj/structure/prop/structure_lattice{ dir = 4; @@ -11424,6 +11630,14 @@ icon_state = "panelscorched" }, /area/fiorina/station/transit_hub) +"haa" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "hab" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/plate{ @@ -11652,7 +11866,7 @@ "hgJ" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "hgS" = ( /turf/closed/shuttle/ert{ icon_state = "stan5" @@ -11792,12 +12006,9 @@ /turf/open/floor/almayer_hull, /area/fiorina/oob) "hkW" = ( -/obj/item/trash/popcorn, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) +/obj/structure/barricade/wooden, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "hll" = ( /obj/item/tool/warning_cone, /turf/open/floor/prison{ @@ -11959,8 +12170,8 @@ "hpJ" = ( /obj/structure/bed/roller, /obj/structure/machinery/filtration/console{ - pixel_y = 22; - can_block_movement = 0 + can_block_movement = 0; + pixel_y = 22 }, /obj/item/trash/used_stasis_bag, /turf/open/floor/plating/prison, @@ -12015,6 +12226,14 @@ icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"hrg" = ( +/obj/structure/barricade/handrail{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "hro" = ( /obj/structure/girder, /turf/open/floor/plating/prison, @@ -12069,6 +12288,10 @@ }, /turf/open/floor/prison/chapel_carpet, /area/fiorina/maintenance) +"htc" = ( +/obj/item/tool/wrench, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "htt" = ( /turf/closed/shuttle/ert, /area/fiorina/station/power_ring) @@ -12468,6 +12691,11 @@ icon_state = "greenblue" }, /area/fiorina/station/botany) +"hGP" = ( +/obj/structure/platform_decoration/kutjevo, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "hGZ" = ( /obj/item/stack/cable_coil, /turf/open/floor/prison{ @@ -12652,6 +12880,18 @@ icon_state = "red" }, /area/fiorina/lz/near_lzII) +"hNi" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomright" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "hNY" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -12787,6 +13027,16 @@ /obj/structure/window/reinforced, /turf/open/floor/prison, /area/fiorina/station/security) +"hTc" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/station/central_ring) "hTf" = ( /obj/structure/prop/structure_lattice{ dir = 4; @@ -12808,7 +13058,9 @@ /area/fiorina/lz/near_lzII) "hTr" = ( /obj/structure/closet, +/obj/item/clothing/mask/gas/clown_hat, /obj/effect/spawner/random/gun/shotgun/midchance, +/obj/item/clothing/under/marine/ucf_clown, /turf/open/floor/plating/prison, /area/fiorina/maintenance) "hTs" = ( @@ -12905,10 +13157,14 @@ /turf/closed/wall/prison, /area/fiorina/station/medbay) "hVS" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "lavendergrass_4" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "hWB" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ @@ -13032,10 +13288,12 @@ }, /area/fiorina/station/medbay) "ick" = ( -/obj/item/tool/candle, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/chapel_carpet, -/area/fiorina/maintenance) +/obj/structure/barricade/wooden, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/central_ring) "icK" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gibmid3" @@ -13378,6 +13636,15 @@ /obj/item/device/cassette_tape/hiphop, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) +"ioG" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "brflowers_1" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "ioM" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/medbay) @@ -13445,6 +13712,9 @@ icon_state = "sterile_white" }, /area/fiorina/station/research_cells) +"irx" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "iry" = ( /obj/structure/janitorialcart, /turf/open/floor/prison{ @@ -13481,6 +13751,12 @@ icon_state = "kitchen" }, /area/fiorina/station/research_cells) +"isl" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "isB" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -13504,6 +13780,14 @@ icon_state = "yellow" }, /area/fiorina/station/lowsec) +"isL" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "isP" = ( /obj/item/trash/snack_bowl, /turf/open/floor/prison{ @@ -13564,6 +13848,12 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) +"iuw" = ( +/obj/item/reagent_container/food/drinks/cans/souto/cherry, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "iuV" = ( /obj/structure/curtain, /turf/open/floor/prison{ @@ -13605,7 +13895,6 @@ "ivB" = ( /obj/structure/surface/rack, /obj/item/storage/pouch/tools/full, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/maintenance) "ivL" = ( @@ -13645,11 +13934,11 @@ /turf/open/floor/prison/chapel_carpet, /area/fiorina/station/chapel) "iwK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/mre_pack/meal1, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" }, +/turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/research_cells) "iwT" = ( /obj/structure/ice/thin/indestructible{ @@ -13767,6 +14056,14 @@ icon_state = "stan25" }, /area/fiorina/oob) +"iCi" = ( +/obj/item/device/flashlight/lamp/tripod, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "iCo" = ( /obj/structure/machinery/door/poddoor/almayer{ density = 0; @@ -13962,9 +14259,6 @@ dir = 1 }, /obj/structure/inflatable/popped, -/obj/structure/barricade/wooden{ - dir = 8 - }, /turf/open/floor/prison{ icon_state = "whitegreen" }, @@ -14038,6 +14332,21 @@ /obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/prison, /area/fiorina/station/park) +"iKT" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "iLy" = ( /obj/item/stack/rods/plasteel, /turf/open/floor/prison{ @@ -14307,6 +14616,13 @@ icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) +"iTe" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "iTm" = ( /turf/open/auto_turf/sand/layer1, /area/fiorina/station/civres_blue) @@ -14606,6 +14922,12 @@ icon_state = "sterile_white" }, /area/fiorina/station/civres_blue) +"jdX" = ( +/obj/item/clothing/under/shorts/red, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/central_ring) "jeh" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" @@ -14655,21 +14977,12 @@ name = "pool" }, /area/fiorina/station/park) -"jfm" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" +"jfk" = ( +/obj/item/ammo_magazine/rifle/mar40/extended, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/space/basic, -/area/fiorina/oob) +/area/fiorina/station/lowsec) "jfp" = ( /obj/structure/barricade/handrail, /obj/structure/barricade/handrail{ @@ -14710,6 +15023,16 @@ "jgu" = ( /turf/closed/wall/prison, /area/fiorina/station/park) +"jgN" = ( +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/effect/landmark/nightmare{ + insert_tag = "yardbasketball" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "jgW" = ( /obj/structure/barricade/metal/wired{ dir = 1 @@ -15131,18 +15454,12 @@ }, /area/fiorina/station/power_ring) "jqR" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/barricade/wooden{ + dir = 4; + pixel_y = 4 }, -/area/fiorina/station/disco) +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "jqX" = ( /obj/structure/platform{ dir = 8 @@ -15381,6 +15698,10 @@ /obj/item/stack/tile/plasteel, /turf/open/floor/prison, /area/fiorina/station/disco) +"jAt" = ( +/obj/structure/platform/shiva, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "jAx" = ( /turf/open/floor/prison{ dir = 1; @@ -15552,6 +15873,13 @@ icon_state = "greenfull" }, /area/fiorina/tumor/servers) +"jEC" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 3 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "jEG" = ( /obj/structure/prop/resin_prop, /turf/open/floor/prison{ @@ -15658,6 +15986,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"jJe" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) "jJh" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/objective, @@ -15841,6 +16175,16 @@ /obj/structure/machinery/power/smes/buildable, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"jMA" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) "jMH" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -15849,6 +16193,11 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) +"jNa" = ( +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/fiorina/station/central_ring) "jNl" = ( /obj/structure/ice/thin/indestructible{ icon_state = "Straight" @@ -16125,6 +16474,11 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/prison, /area/fiorina/station/park) +"jXx" = ( +/turf/open/floor/prison{ + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "jXz" = ( /turf/closed/wall/prison, /area/fiorina/tumor/servers) @@ -16207,11 +16561,11 @@ }, /area/fiorina/lz/near_lzII) "jZb" = ( -/obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "cell_stripe" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/central_ring) "jZc" = ( /obj/structure/disposalpipe/segment{ icon_state = "delivery_outlet"; @@ -16221,6 +16575,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) +"jZx" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "jZR" = ( /obj/item/frame/rack, /obj/structure/barricade/handrail/type_b{ @@ -16398,6 +16758,7 @@ }, /area/fiorina/station/security) "kdo" = ( +/obj/structure/platform_decoration, /obj/structure/inflatable, /turf/open/floor/prison{ icon_state = "whitegreen" @@ -16429,6 +16790,13 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzI) +"keo" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "keF" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flash, @@ -16532,6 +16900,11 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/wood, /area/fiorina/station/civres_blue) +"kiq" = ( +/turf/open/floor/prison{ + icon_state = "damaged2" + }, +/area/fiorina/station/central_ring) "kis" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -16941,6 +17314,15 @@ icon_state = "redfull" }, /area/fiorina/station/medbay) +"kuT" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "ywflowers_3" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "kvd" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/golden_cup, @@ -16963,6 +17345,20 @@ name = "astroturf" }, /area/fiorina/station/park) +"kvm" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "kvn" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/energy/taser, @@ -17771,6 +18167,16 @@ icon_state = "blue" }, /area/fiorina/station/civres_blue) +"kUR" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/station/central_ring) "kVg" = ( /obj/item/stack/cable_coil/blue, /turf/open/floor/plating/prison, @@ -18053,6 +18459,10 @@ icon_state = "whitegreen" }, /area/fiorina/station/medbay) +"ldZ" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "leq" = ( /obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/prison{ @@ -18151,6 +18561,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"liT" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "liX" = ( /obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/prison{ @@ -18637,6 +19053,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) "lwB" = ( +/obj/structure/platform, /obj/structure/bed/chair{ dir = 1; layer = 2.7 @@ -18725,11 +19142,13 @@ }, /area/fiorina/station/medbay) "lzb" = ( -/obj/structure/largecrate/random, +/obj/structure/platform_decoration{ + dir = 1 + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "lzm" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced/tinted, @@ -18813,6 +19232,10 @@ }, /turf/open/floor/prison, /area/fiorina/station/flight_deck) +"lBY" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "lCm" = ( /obj/item/ammo_casing{ icon_state = "cartridge_1" @@ -18883,12 +19306,8 @@ }, /area/fiorina/station/civres_blue) "lDC" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/fiorina/oob) +/turf/closed/wall/prison, +/area/fiorina/station/central_ring) "lEa" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" @@ -18983,19 +19402,6 @@ }, /turf/open/floor/prison, /area/fiorina/station/transit_hub) -"lGA" = ( -/obj/structure/machinery/bioprinter{ - stored_metal = 1000 - }, -/obj/structure/machinery/door/window/eastright, -/obj/structure/machinery/door/window/eastright{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "lHc" = ( /obj/structure/bed{ icon_state = "abed" @@ -19071,6 +19477,7 @@ }, /area/fiorina/station/park) "lJv" = ( +/obj/structure/platform, /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/regular, /obj/structure/machinery/light/double/blue{ @@ -19209,6 +19616,15 @@ icon_state = "darkbrownfull2" }, /area/fiorina/tumor/aux_engi) +"lOB" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space/basic, +/area/fiorina/oob) "lOE" = ( /turf/open/floor/prison{ dir = 9; @@ -19380,6 +19796,20 @@ icon_state = "damaged2" }, /area/fiorina/station/lowsec) +"lWh" = ( +/obj/item/clothing/under/shorts/black, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) +"lWr" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/shiva, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "lWD" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -19824,12 +20254,11 @@ }, /area/fiorina/station/telecomm/lz1_cargo) "mhv" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 +/obj/structure/machinery/power/apc{ + dir = 1 }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "mhM" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -20153,6 +20582,12 @@ icon_state = "yellow" }, /area/fiorina/station/lowsec) +"msS" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "mtj" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -20183,6 +20618,10 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/fiberbush) +"muf" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "muB" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison{ @@ -20254,6 +20693,13 @@ icon_state = "floor_plate" }, /area/fiorina/station/lowsec) +"mxG" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space/basic, +/area/fiorina/oob) "mxO" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -20367,7 +20813,6 @@ /area/fiorina/station/security) "mAz" = ( /obj/structure/closet/emcloset, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 5; icon_state = "whitegreen" @@ -20458,16 +20903,11 @@ }, /area/fiorina/station/lowsec) "mDi" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "mDs" = ( /obj/item/stack/sandbags_empty/half, /turf/open/floor/prison{ @@ -20496,11 +20936,11 @@ }, /area/fiorina/station/park) "mEv" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/mre_pack/meal5, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, +/turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/research_cells) "mEL" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ @@ -20530,6 +20970,10 @@ icon_state = "floor_plate" }, /area/fiorina/station/civres_blue) +"mFv" = ( +/obj/structure/largecrate/random/mini/ammo, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "mFz" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gibmid1" @@ -20540,19 +20984,8 @@ }, /area/fiorina/station/medbay) "mGe" = ( -/obj/structure/bed/chair{ - dir = 1; - pixel_y = 3 - }, -/obj/effect/decal/cleanable/blood, -/obj/item/reagent_container/food/drinks/cans/beer{ - pixel_x = -11; - pixel_y = -6 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "mGx" = ( /obj/item/reagent_container/food/drinks/sillycup, /turf/open/floor/prison, @@ -20593,6 +21026,14 @@ icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"mIq" = ( +/obj/structure/barricade/handrail{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "mIu" = ( /obj/effect/spawner/random/sentry/midchance, /turf/open/floor/plating/prison, @@ -22020,6 +22461,13 @@ icon_state = "floor_plate" }, /area/fiorina/station/security) +"nzp" = ( +/obj/item/clothing/gloves/boxing/blue, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "nzI" = ( /obj/structure/largecrate/random, /turf/open/floor/wood, @@ -23215,6 +23663,13 @@ icon_state = "sterile_white" }, /area/fiorina/tumor/ice_lab) +"olQ" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/fiorina/oob) "olT" = ( /obj/structure/machinery/computer3/server/rack, /obj/structure/window{ @@ -23863,12 +24318,14 @@ /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) "oFW" = ( +/obj/structure/platform, /obj/structure/bed/chair{ dir = 1; layer = 2.7 }, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "whitegreencorner" + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "oGm" = ( @@ -24020,6 +24477,14 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) +"oKQ" = ( +/obj/structure/machinery/floodlight{ + name = "Yard Floodlight" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "oKV" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/freight, /turf/open/floor/corsat{ @@ -24081,6 +24546,18 @@ icon_state = "doubleside" }, /area/fiorina/maintenance) +"oOs" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkpurple2" + }, +/area/fiorina/station/central_ring) +"oOv" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "oOK" = ( /obj/item/device/multitool, /turf/open/floor/prison{ @@ -24102,6 +24579,13 @@ icon_state = "floor_plate" }, /area/fiorina/station/park) +"oPJ" = ( +/obj/effect/decal/cleanable/blood/gibs, +/obj/item/ammo_magazine/rifle/mar40, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "oPN" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/plating/prison, @@ -24203,6 +24687,13 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) +"oTG" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "oTH" = ( /obj/structure/bed/chair, /turf/open/floor/prison{ @@ -24225,6 +24716,12 @@ }, /turf/open/space, /area/fiorina/oob) +"oVk" = ( +/obj/structure/sign/prop3{ + desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + }, +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/central_ring) "oVn" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/close, @@ -24646,6 +25143,15 @@ /obj/item/stack/cable_coil/cut, /turf/open/floor/prison, /area/fiorina/tumor/servers) +"pkw" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "pkG" = ( /obj/item/stool, /turf/open/floor/prison{ @@ -25557,6 +26063,8 @@ /area/fiorina/tumor/aux_engi) "pON" = ( /obj/structure/closet, +/obj/item/storage/backpack/clown, +/obj/item/toy/bikehorn, /turf/open/floor/prison{ dir = 4; icon_state = "bluecorner" @@ -25667,7 +26175,6 @@ }, /area/fiorina/station/medbay) "pSJ" = ( -/obj/effect/landmark/corpsespawner/pmc, /turf/open/floor/wood, /area/fiorina/maintenance) "pSU" = ( @@ -25874,6 +26381,15 @@ "qbl" = ( /turf/open/auto_turf/sand/layer1, /area/fiorina/lz/near_lzII) +"qbr" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "lavendergrass_2" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "qbu" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -26035,6 +26551,13 @@ icon_state = "whitepurple" }, /area/fiorina/oob) +"qfE" = ( +/obj/item/ammo_magazine/shotgun/buckshot, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "qfI" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -26057,13 +26580,6 @@ }, /turf/open/space/basic, /area/fiorina/oob) -"qgh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/book/manual/surgery, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/medbay) "qgi" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -26601,6 +27117,16 @@ icon_state = "darkbrowncorners2" }, /area/fiorina/maintenance) +"qwZ" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/station/central_ring) "qxB" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -26652,11 +27178,17 @@ }, /area/fiorina/station/park) "qyX" = ( -/obj/structure/barricade/wooden, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "qzl" = ( /obj/structure/machinery/shower{ pixel_y = 13 @@ -27625,6 +28157,15 @@ icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) +"rac" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/turf/open/space/basic, +/area/fiorina/oob) "rar" = ( /obj/structure/window/reinforced{ dir = 4 @@ -27683,6 +28224,12 @@ icon_state = "redfull" }, /area/fiorina/station/security) +"rcG" = ( +/obj/structure/barricade/handrail, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "rdS" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -27706,6 +28253,14 @@ icon_state = "blue" }, /area/fiorina/station/power_ring) +"reD" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "reO" = ( /obj/structure/platform_decoration{ dir = 4 @@ -27889,9 +28444,12 @@ }, /area/fiorina/station/botany) "rkB" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, /obj/item/device/flashlight, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "rkH" = ( /obj/structure/grille, /obj/structure/lattice, @@ -28290,6 +28848,15 @@ }, /turf/open/floor/almayer_hull, /area/fiorina/oob) +"rxu" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "lavendergrass_3" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "rxz" = ( /obj/structure/curtain/open/black, /turf/open/floor/prison, @@ -28297,7 +28864,7 @@ "rym" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "ryt" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/prison, @@ -28339,11 +28906,6 @@ icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"rAe" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) "rAk" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -28378,6 +28940,9 @@ /turf/open/floor/wood, /area/fiorina/station/park) "rAQ" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; @@ -28515,13 +29080,19 @@ /turf/open/floor/prison{ icon_state = "damaged3" }, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "rFu" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/chapel_carpet{ icon_state = "doubleside" }, /area/fiorina/station/chapel) +"rFH" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "rFT" = ( /obj/item/ammo_casing{ icon_state = "casing_7_1" @@ -28682,6 +29253,14 @@ icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) +"rKO" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "rKS" = ( /obj/item/tool/wrench, /turf/open/floor/prison{ @@ -28758,11 +29337,6 @@ /area/fiorina/lz/near_lzI) "rMS" = ( /obj/structure/largecrate/random/secure, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 1 - }, /turf/open/floor/prison{ dir = 6; icon_state = "whitegreen" @@ -29048,15 +29622,12 @@ }, /area/fiorina/station/disco) "rVy" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/effect/spawner/random/pills/midchance, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/area/fiorina/station/research_cells) +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "rVM" = ( /obj/structure/closet/crate/miningcar, /obj/structure/barricade/wooden{ @@ -29091,6 +29662,10 @@ icon_state = "blue_plate" }, /area/fiorina/station/botany) +"rWB" = ( +/obj/structure/closet/boxinggloves, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "rWX" = ( /turf/open/floor/prison{ icon_state = "damaged3" @@ -29321,6 +29896,20 @@ /obj/structure/platform/stair_cut, /turf/open/floor/plating/prison, /area/fiorina/station/park) +"seu" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "seW" = ( /turf/closed/shuttle/ert{ icon_state = "stan_r_w" @@ -29502,7 +30091,6 @@ /obj/item/stack/sheet/mineral/plastic, /obj/item/stack/sheet/mineral/plastic, /obj/item/stack/sheet/mineral/plastic, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/maintenance) "sma" = ( @@ -29540,6 +30128,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"smz" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "smX" = ( /obj/item/stock_parts/matter_bin/super, /turf/open/floor/prison{ @@ -29772,6 +30364,10 @@ /obj/structure/machinery/computer/telecomms/monitor, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"svo" = ( +/obj/structure/grille, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "svF" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/prison{ @@ -29982,6 +30578,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) +"sDV" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "sEi" = ( /turf/open/floor/prison{ dir = 8; @@ -30179,6 +30781,12 @@ icon_state = "yellow" }, /area/fiorina/station/disco) +"sLl" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" + }, +/area/fiorina/station/central_ring) "sLo" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 1 @@ -30205,9 +30813,12 @@ }, /area/fiorina/station/civres_blue) "sMj" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 + }, /obj/structure/largecrate/random/secure, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "sMo" = ( /obj/item/clothing/under/marine/ua_riot, /obj/item/weapon/gun/rifle/m16, @@ -30526,11 +31137,17 @@ }, /area/fiorina/station/medbay) "sWF" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "damaged2" + icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "sXi" = ( /turf/open/floor/corsat{ icon_state = "plate" @@ -30542,17 +31159,16 @@ icon_state = "floor_plate" }, /area/fiorina/station/chapel) +"sYe" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "sYn" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"sYv" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) "sYM" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ @@ -30637,8 +31253,8 @@ "tcl" = ( /obj/structure/largecrate/random/mini/med, /turf/open/floor/prison{ - dir = 5; - icon_state = "whitegreen" + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) "tcJ" = ( @@ -30803,6 +31419,14 @@ icon_state = "floor_plate" }, /area/fiorina/station/park) +"tjM" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "tjQ" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison{ @@ -30991,7 +31615,7 @@ }, /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "tov" = ( /obj/effect/spawner/random/gun/smg/midchance, /turf/open/floor/prison{ @@ -31056,6 +31680,12 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"tqa" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/space/basic, +/area/fiorina/oob) "tqM" = ( /obj/structure/filingcabinet, /turf/open/floor/prison{ @@ -31121,6 +31751,14 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) +"tsf" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "tsi" = ( /obj/structure/barricade/metal/wired, /turf/open/floor/prison{ @@ -31234,12 +31872,11 @@ }, /area/fiorina/station/power_ring) "tvI" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" }, -/obj/structure/lattice, -/turf/open/space, -/area/fiorina/oob) +/area/fiorina/station/central_ring) "tvM" = ( /obj/structure/platform{ dir = 1 @@ -31349,12 +31986,18 @@ /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) "tzF" = ( -/obj/item/storage/pill_bottle/tramadol/skillless, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreenfull" }, -/area/fiorina/station/medbay) +/area/fiorina/station/central_ring) "tAb" = ( /obj/structure/surface/rack, /obj/item/storage/backpack/general_belt{ @@ -31678,6 +32321,13 @@ icon_state = "green" }, /area/fiorina/station/chapel) +"tJn" = ( +/obj/item/tool/wirecutters, +/obj/structure/platform/shiva{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "tJM" = ( /obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison{ @@ -31691,6 +32341,12 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"tJT" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "tJU" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light/double/blue{ @@ -32390,6 +33046,12 @@ /obj/item/prop/almayer/flight_recorder, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) +"ued" = ( +/obj/structure/sign/prop3{ + desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + }, +/turf/closed/wall/prison, +/area/fiorina/station/central_ring) "uef" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/floor/prison{ @@ -32886,6 +33548,10 @@ icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"uvM" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "uwg" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison{ @@ -32911,6 +33577,11 @@ /obj/item/stack/sheet/mineral/plastic, /turf/open/floor/prison, /area/fiorina/tumor/servers) +"uwY" = ( +/obj/structure/lattice, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space, +/area/fiorina/oob) "uxa" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison{ @@ -32969,6 +33640,10 @@ /obj/item/stack/sheet/metal, /turf/open/floor/prison, /area/fiorina/station/lowsec) +"uym" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) "uyq" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/prison{ @@ -33008,7 +33683,7 @@ }, /obj/structure/largecrate/random/secure, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "uzX" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -33019,6 +33694,13 @@ icon_state = "sterile_white" }, /area/fiorina/station/research_cells) +"uAd" = ( +/obj/item/clothing/gloves/boxing/green, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "uAi" = ( /obj/structure/sink{ dir = 4; @@ -33106,11 +33788,10 @@ }, /area/fiorina/station/medbay) "uCD" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "medicalhold" +/turf/open/floor/prison{ + icon_state = "cell_stripe" }, -/turf/closed/wall/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/research_cells) "uCW" = ( /obj/item/reagent_container/glass/bucket/janibucket, /turf/open/floor/prison{ @@ -33258,6 +33939,16 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/civres) +"uIA" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "uIG" = ( /obj/structure/prop/structure_lattice{ dir = 4 @@ -33463,6 +34154,12 @@ icon_state = "floor_plate" }, /area/fiorina/station/disco) +"uRu" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "uRK" = ( /obj/structure/platform{ dir = 8 @@ -33482,6 +34179,13 @@ icon_state = "blue_plate" }, /area/fiorina/station/botany) +"uRY" = ( +/obj/item/ammo_magazine/rifle/mar40, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "uSb" = ( /obj/structure/barricade/wooden{ dir = 4; @@ -33491,7 +34195,7 @@ dir = 10; icon_state = "damaged1" }, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "uSo" = ( /obj/item/poster, /turf/open/floor/prison{ @@ -33607,6 +34311,14 @@ icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) +"uWs" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "uWQ" = ( /obj/structure/platform{ dir = 8 @@ -33708,16 +34420,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/park) -"uYD" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) "uYR" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -33797,14 +34499,15 @@ }, /area/fiorina/station/lowsec) "vbe" = ( -/obj/structure/machinery/m56d_hmg/mg_turret/dropship{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, /turf/open/floor/prison{ dir = 8; icon_state = "whitegreen" }, -/area/fiorina/station/medbay) +/area/fiorina/station/central_ring) "vbl" = ( /obj/structure/closet/bombcloset, /obj/effect/landmark/objective_landmark/medium, @@ -34015,6 +34718,10 @@ }, /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) +"vgP" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "vgS" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison{ @@ -34281,6 +34988,9 @@ }, /area/fiorina/tumor/ice_lab) "vqi" = ( +/obj/structure/platform{ + dir = 1 + }, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 @@ -34461,20 +35171,11 @@ }, /area/fiorina/station/civres_blue) "vuc" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "vuE" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds2/delayone, @@ -34730,6 +35431,17 @@ }, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"vCT" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "vDc" = ( /obj/structure/bed/sofa/south/grey/left, /obj/item/reagent_container/food/snacks/sandwich{ @@ -34858,8 +35570,9 @@ /obj/structure/barricade/metal/wired{ dir = 4 }, +/obj/structure/largecrate/random, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "vGO" = ( /obj/structure/platform{ dir = 4 @@ -35021,6 +35734,12 @@ icon_state = "floor_plate" }, /area/fiorina/station/power_ring) +"vMX" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/fiorina/station/central_ring) "vNq" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/telecomm/lz1_cargo) @@ -35116,12 +35835,10 @@ /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "vPM" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/area/fiorina/station/central_ring) "vPR" = ( /turf/closed/shuttle/ert{ icon_state = "stan1" @@ -35256,6 +35973,10 @@ icon_state = "greenfull" }, /area/fiorina/station/transit_hub) +"vVR" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/prison, +/area/fiorina/station/central_ring) "vWe" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, @@ -35267,6 +35988,14 @@ icon_state = "cell_stripe" }, /area/fiorina/station/power_ring) +"vWE" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "vWI" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -35320,6 +36049,15 @@ icon_state = "yellow" }, /area/fiorina/station/disco) +"vYE" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "lavendergrass_1" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "vYL" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ @@ -35367,6 +36105,12 @@ icon_state = "blue" }, /area/fiorina/station/power_ring) +"vZz" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "vZD" = ( /obj/item/storage/box/donkpockets, /turf/open/floor/plating/prison, @@ -35442,10 +36186,17 @@ /area/fiorina/tumor/fiberbush) "wby" = ( /obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, /obj/structure/platform/kutjevo/smooth{ dir = 8 }, -/obj/structure/lattice, /turf/open/space, /area/fiorina/oob) "wbB" = ( @@ -35707,6 +36458,12 @@ "wkD" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"wkZ" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, /area/fiorina/station/disco) "wlp" = ( /obj/item/reagent_container/food/snacks/donkpocket, @@ -35777,17 +36534,11 @@ }, /area/fiorina/station/lowsec) "wnB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkpurple2" }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/area/fiorina/station/central_ring) "wnW" = ( /obj/structure/toilet{ pixel_y = 4 @@ -35949,13 +36700,18 @@ }, /area/fiorina/station/botany) "wuT" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/obj/structure/platform_decoration{ + dir = 1 }, -/turf/open/space/basic, -/area/fiorina/oob) +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "wvf" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/flora/pottedplant{ @@ -35966,6 +36722,21 @@ }, /turf/open/floor/prison, /area/fiorina/station/security) +"wvu" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "wvH" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/chapel_carpet{ @@ -36293,6 +37064,17 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"wGa" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 3 + }, +/obj/structure/largecrate/random/mini/med{ + pixel_x = -6; + pixel_y = -3 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "wGe" = ( /obj/structure/barricade/metal/wired{ dir = 8 @@ -36431,6 +37213,14 @@ icon_state = "whitegreen" }, /area/fiorina/station/medbay) +"wJX" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "wKb" = ( /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/wood, @@ -36789,6 +37579,12 @@ icon_state = "green" }, /area/fiorina/tumor/aux_engi) +"wUN" = ( +/obj/item/reagent_container/food/drinks/cans/sodawater, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "wVu" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison{ @@ -36829,6 +37625,14 @@ "wWs" = ( /turf/open/floor/greengrid, /area/fiorina/station/security) +"wWF" = ( +/obj/item/frame/rack, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) +"wWT" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "wWW" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8 @@ -37187,7 +37991,7 @@ dir = 1; icon_state = "cell_stripe" }, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "xkG" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -37419,6 +38223,14 @@ icon_state = "darkbrownfull2" }, /area/fiorina/tumor/aux_engi) +"xqh" = ( +/obj/item/ammo_casing{ + icon_state = "cartridge_2" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "xqj" = ( /obj/structure/bed{ icon_state = "abed" @@ -37695,6 +38507,21 @@ }, /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) +"xyy" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space, +/area/fiorina/oob) "xyK" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -38260,14 +39087,19 @@ icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) -"xQC" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"xQs" = ( +/obj/item/reagent_container/food/drinks/coffee{ + name = "\improper paper cup" }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) +"xQC" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "xQE" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/up, @@ -38467,6 +39299,13 @@ icon_state = "floor_plate" }, /area/fiorina/station/civres_blue) +"xXw" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "xYg" = ( /obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating/prison, @@ -38590,6 +39429,14 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) +"ybs" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "ybR" = ( /obj/item/stack/sheet/metal{ amount = 5 @@ -66526,7 +67373,7 @@ djA hVI ivR ovJ -aif +dvY kqz cwO hVI @@ -66537,17 +67384,17 @@ lbu mEO gbS aFZ -dhi -lDC +brI +gAk qOk -mKS -mhv -cAW -hVS -lDC +cZc +lml +hGP +olQ qOk -mKS -mhv +kvm +oTG +bQM tPN ecL cME @@ -66733,12 +67580,12 @@ cwO nQq hVI hVI -lGA hVI hVI hVI hVI -nQq +hVI +gUH mJy tkk vWe @@ -66749,17 +67596,17 @@ lyJ ndh kwT tQB -daD +azy afk afk afk chA -qFE -dvY +uWs afk afk afk -dkg +wvu +fQV tPN ecL cME @@ -66948,7 +67795,7 @@ fPZ fPZ fPZ hVI -kSP +adH qSg hVI mJy @@ -66966,19 +67813,19 @@ afk hkh afk tCZ -pcu urJ afk hkh afk tCZ +pcu tPN slM cME cME tIU gZc -ick +tIU cME liA cME @@ -67157,12 +68004,12 @@ cwO hVI djA vDj -qgh +fPZ fPZ hVI ivR ovJ -aif +dvY kqz cwO fPZ @@ -67170,20 +68017,20 @@ fPZ sJu rjE dQp -cnF +idE fUX tQB -mdJ +iKT afk afk afk cjA cpW -cYa afk afk afk -dMU +rac +jlH twb twb twb @@ -67195,7 +68042,7 @@ bgy eLu cME cME -gyW +cME liA cFy mcc @@ -67369,8 +68216,8 @@ uGq hVI tEH tEH -hVI -jjs +ajp +aoa hVI tEH tEH @@ -67385,19 +68232,19 @@ hVI anG wyl aFZ -ggQ -eJQ -eJQ -tvI -sYv +aQB +wJX +llQ +djU +tqa +keo +mxG +llQ +lOB +tqa +bQM bQM -ggQ -eJQ -eJQ -tvI -sYv kPz -eHa twb aLT cME @@ -67591,25 +68438,25 @@ avX cwO fPZ cqH +hVI +hVI +hVI +bZC +hVI aFZ -aFZ -aFZ -aFZ -aFZ -aFZ -cAW -cAW -bQM -bQM -bQM -bQM -cAW -cAW -cAW -cAW -cAW +xQC +xQC +eDn +eDn +eDn +eDn +eDn +eDn +xQC +xQC +eDn +kPz kPz -bTo twb twb twb @@ -67803,28 +68650,28 @@ jEb tur fPZ goA -aFZ -dhi +hVI +lDC +lDC +ldZ lDC -qOk -mKS mhv +mGe +dGw +vPM +haa +mGe +mGe +vPM +rKO +mGe +mGe +eDn +eDn +cAW bQM bQM bQM -bQM -bQM -bQM -cAW -cAW -cAW -cAW -cAW -hVS -lDC -qOk -mKS -mhv twb ivB uzw @@ -68006,37 +68853,37 @@ hVI hVI hVI hVI -jjs +aoa hVI hVI -jjs +aoa hVI vWe ruB ruB dID -aSS -daD -afk -afk -afk -bAB -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW +vWe +mFv +gXD +gTw +dGw +vPM +vPM +vPM +vPM +vPM +vPM +vPM +vPM +vPM +vPM +vPM +dGw eDn -afk -afk -afk -dkg +oVk +eDn +bQM +bQM twb nSU cME @@ -68227,28 +69074,28 @@ pQD rME fPZ fPZ -tQB -urJ -afk -hkh -afk -bQp -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW +wGa +dGw +tvI +tvI +tvI +tvI +tvI +tvI +tvI +vPM +vPM +vPM +tvI +tvI +tvI +tvI +vPM +vPM +dGw +eHa eDn -afk -hkh -afk -tCZ +bQM twb uts cME @@ -68429,41 +69276,41 @@ xIg hVI mMb dLx -gik fPZ fPZ -aif +fPZ +dvY ryN gBo qpw fPZ fPZ fPZ -tQB -mdJ -afk -afk -afk -bAB -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -rAe -afk -afk -afk -dMU +jEC +dGw +tvI +tvI +tvI +tvI +tvI +tvI +tvI +vPM +vPM +vPM +tvI +tvI +tvI +tvI +tvI +tvI +vPM +deH +eDn +eDn twb -dTf -cME +eLu +eLu eLu srI dTf @@ -68641,42 +69488,42 @@ lUp hVI mei oZz -vWe hVI hVI -uCD +hVI +hVI hVI hVI hVI fPZ fPZ -hBX -tQB +hNi +lDC ggQ -eJQ -eJQ tvI -sYv -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -ggQ -eJQ -eJQ tvI -sYv -twb -wQT +tvI +tvI +eMO +tvI +tvI +vPM +vPM +vPM +tvI +tvI +tvI +tvI +tvI +tvI +tvI +vPM +dGw +dhe +liA +gVR dMa -eLu +gfo cME wQT eLu @@ -68853,45 +69700,45 @@ uXc cQn mhb mhb -cQn +mhb rAQ bqy hVI kSp pEe -aoa -aja mFh aja -aFZ -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -twb -twb +fPZ +uxi +qwZ +bWr +tvI +tvI +tvI +tvI +tvI +tvI +tvI +vPM +mGe +vPM +jgN +tvI +acx +tvI +tvI +eMO +tvI +vPM +dGw +lDC twb twb tPN +tPN +tPN twb -twb +eLu kqC pHu mcc @@ -69066,39 +69913,39 @@ tST kqz kqz kqz -cwO +aGS eli hVI myO cwO mJy cwO -mJy -cwO -tQB -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW +fPZ +uxi +kUR +eMJ +tvI +vYE +tvI +tvI +tvI +tvI +qbr +vPM +mGe +vPM +tvI +tvI +tvI +tvI +tvI +tvI +tvI +tvI +vPM +mGe +xQC +bQM bQM bQM bQM @@ -69277,8 +70124,8 @@ icj kqz kqz sZr -ffm -cwO +kqz +aNw hVI hVI mAz @@ -69286,31 +70133,31 @@ tur quk rMS tcl -tur -tQB -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW +seu +hTc +bWr +tvI +tvI +tvI +tvI +tvI +tvI +tvI +vPM +dGw +vPM +tvI +tvI +tvI +tvI +tvI +tvI +tvI +tvI +vPM +mGe +xQC +bQM bQM bQM bQM @@ -69490,44 +70337,44 @@ vro kqz sWu kqz -tkk -hVI -hVI -aFZ -tQB -tQB -aFZ -tQB -tQB -aFZ -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -wzE -hZR -hZR -wzE -wzE +bxa +lDC +lDC +lDC +lDC +lDC +lDC +lDC +lDC +lDC +ggQ +tvI +kuT +tvI +tvI +tvI +oKQ +tvI +vPM +mGe +vPM +tvI +oKQ +tvI +tvI +tvI +ioG +tvI +tvI +vPM +deH +eDn +eDn +xQC +xQC +xQC +eDn +eDn vqi pHu mcc @@ -69701,46 +70548,46 @@ pnc bII kqz kqz -hkW +kqz iJj -fPZ -aFZ -aFZ -bce +cAv +vPM +fhz +gTw gTw wuT -qOk -jfm +qyX vPM -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -wzE -mcc -mcc -mcc -sHH -mcc +vPM +dGw +tvI +tvI +tvI +tvI +tvI +tvI +kuT +vPM +mGe +xqh +tvI +tvI +ioG +tvI +aJU +tvI +tvI +tvI +vPM +vPM +pkw +ybs +gTw +gTw +gTw +vPM +pkw +tjM cMg mcc vei @@ -69916,42 +70763,42 @@ kqz kqz lcu vbe -aja -tQB -cAW -ajx -afk -afk -afk +dGw +fsn +mGe +mGe +dGw +rVy +mGe wnB -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -hZR +wnB +gVX +vPM +vPM +vPM +vPM +vPM +vPM +vPM +dGw +vPM +vPM +vPM +vPM +vPM +vPM +vPM +sYe +tJT +tJT mGe -gcy -gcy -sHH +isl +dGw +mGe +mGe +mGe +dGw +isl sHH pHu mcc @@ -70125,45 +70972,45 @@ hVI fcO sZr kqz -ajp +kqz pIX cYg -cwO -tQB -cAW -ajx -afk -hkh -afk -wnB -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -hZR -mcc -sHH -sHH -sHH +dGw +dGw +dGw +jqR +dGw +rVy +mGe +bCk +sLl +jNa +vPM +mGe +mGe +smz +mGe +mGe +dGw +muf +dGw +mGe +wWT +dGw +mGe +mGe +vPM +liT +jXx +jXx +mGe +isl +dGw +dGw +dGw +dGw +dGw +isl sHH pHu mcc @@ -70339,43 +71186,43 @@ kqz kqz kqz aSw -kqz -cwO -tQB -cAW -ajx -afk -afk -afk -wnB -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -hZR -aCO -bMl -gcy -sHH +cYa +dGw +gfp +hkW +mGe +dGw +rVy +mGe +oOs +oOs +eKg +vPM +jZx +vPM +vPM +vPM +vPM +jZx +dGw +vPM +dHI +vPM +vPM +vPM +vPM +vPM +xQs +ckj +ckj +mGe +isl +dGw +mGe +mGe +mGe +dGw +isl sHH pHu mcc @@ -70549,46 +71396,46 @@ ueA bII kqz kqz -xzb +kqz kdo tzF -cwO -tQB -cAW -ajx -afk -afk -afk -wnB -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -wzE -mcc +vPM +guB +ick jZb -mcc -sHH -mcc +mDi +sWF +vPM +vPM +tvI +tvI +tvI +tvI +tvI +tvI +tvI +tvI +vPM +mGe +vPM +tvI +tvI +tvI +tvI +tvI +tvI +tvI +tvI +vPM +vPM +dnA +vWE +jZb +jZb +jZb +vPM +dnA +reD pHu mcc vei @@ -70763,43 +71610,43 @@ xzb kqz kqz oFW -jEb -tur -tQB -cAW -ajx -afk -hkh -afk -wnB -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -wzE -hZR -hZR -wzE -wzE +eDn +eHa +xQC +xQC +xQC +eDn +eDn +iCi +vPM +tvI +rxu +tvI +tvI +tvI +tvI +oKQ +tvI +vPM +mGe +vPM +tvI +oKQ +tvI +vYE +tvI +xXw +hVS +tvI +vPM +deH +eDn +eDn +xQC +xQC +xQC +eDn +eDn vqi pHu mcc @@ -70975,42 +71822,42 @@ kqz kqz kqz lwB -aSS aFZ aFZ -cAW -ajx -afk -afk -afk -wnB -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -dhi -fsn +gyW +bQM +bQM +bQM +xQC +mGe +vPM +tvI +tvI +tvI +tvI +tvI +tvI +tvI +rxu +vPM +dGw +vPM +tvI +tvI +rxu +tvI +kuT +tvI +hVS +tvI +vPM +mGe +xQC +cmz +fyC qOk -gfp -mhv +mKS +erT wzE wzE pHu @@ -71185,40 +72032,40 @@ jEb aaf eTd jEb -jEb +kqz lJv aFZ aFZ -aFZ -kPz -aGS -aNw -llQ +gyW +bQM +bQM +bQM +xQC vuc -aTN -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -ajx +vPM +tvI +tvI +tvI +qfE +dnI +tvI +tvI +tvI +vPM +mGe +vPM +tvI +rxu +tvI +tvI +tvI +tvI +tvI +tvI +vPM +mGe +xQC +xyy afk afk afk @@ -71397,40 +72244,40 @@ tOp jmG sta sta -sta jmG jmG jmG jmG jmG -uwk -uwk jmG jmG jmG -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -cAW -ajx +jmG +cKa +cKa +cNC +tvI +tvI +tvI +tvI +tvI +tvI +vYE +vPM +mGe +vPM +vPM +vPM +vPM +hrg +hrg +hrg +vPM +vPM +rWB +eDn +eDn +urJ afk hkh afk @@ -71617,32 +72464,32 @@ rsE cKa imL ggB -ggB +uCD mEv -uwk -cAW -cAW -cAW -cAW +jYs +vMX +tvI +tvI +tvI hVS -vBP -vBP -vBP -vBP -vBP -vBP -vBP -vBP -vBP -vBP +tvI +tvI +tvI vPM -cAW -cAW -cAW -cAW -cAW -bQM -ajx +vZz +vPM +ioG +tvI +rcG +nzp +jdX +tJT +ePm +vPM +rWB +eDn +jKI +mdJ afk afk afk @@ -71829,39 +72676,39 @@ mYp cKa qZW ggB -ggB +uCD biJ -uwk -cAW -cAW -cAW -cAW -rAe -afk -afk -afk -hkh -afk -afk -hkh -afk -afk -afk -eZq -cAW -cAW -cAW -cAW -cAW -cAW -fdV +jYs +vMX +iuw +tvI +tvI +tvI +tvI +tvI +tvI +sYe +aee +tJT +tvI +tvI +rcG +aIX +vPM +aIX +ePm +dGw +vVR +eDn +eDn +eDn wby llQ -eZA -sYv -kPz +jKI +bUB +bQM wzE -pHu +ulJ mcc vei kqC @@ -72041,33 +72888,33 @@ tOp cKa rfJ ggB -ggB +uCD iwK -uwk -cAW -cAW -cAW -cAW -rAe -afk -afk -afk -pcu -afk -afk -pcu -afk -afk -afk -eZq -cAW -cAW -cAW -cAW -cAW -cAW -cAW -ajx +cKa +gde +dGw +vPM +vPM +tvI +tvI +tvI +tvI +sDV +uRu +ckj +tvI +kuT +rcG +sDV +aIX +uAd +ePm +deH +ued +uvM +cnl +eDn +xQC wzE wzE wzE @@ -72256,35 +73103,35 @@ kNz vJD vJD jmG -cAW -cAW -bQM -bQM -rAe -afk -afk -afk -hkh -afk -afk -hkh -afk -afk -afk -eZq -cAW -cAW -cAW -cAW -cAW -cAW -cAW -ajx -hZR +eHa +eDn +dGw +dGw +vPM +vPM +vPM +aLC +sDV +uRu +ckj +vPM +vZz +vPM +mIq +mIq +mIq +vPM +dhe +msS +vMX +mGe +uIA +mGe +oFI gEW mcc fLR -usz +kqC pHu mcc vei @@ -72457,7 +73304,7 @@ kNz aau xMR roY -gUH +iZV vJD jvE vII @@ -72468,33 +73315,33 @@ dyM vJD vJD jmG -cAW -cAW -cAW -cAW -ggQ -jlH -jlH -tWI -llQ -jKI -tWI -llQ -jKI -jlH -jlH -sYv -cAW -cAW -cAW -cAW -cAW -cAW -cAW -bTo -hZR +bQM +eDn +xQC +eDn +mGe +mGe +isL +wUN +mGe +mGe +mGe +kiq +tsf +lWh +vPM +kiq +vPM +vPM +dhe +msS +vMX +mGe +iTe +mGe +oFI gEW -ggu +mcc mcc usz pHu @@ -72680,30 +73527,30 @@ cKa aaK kNz jmG -bQM -bQM -cAW -cAW -bce -cAW -ecM -ecM -mlC -mlC -mlC -ecM -ecM -cAW -cAW -bce -cAW -bce -hVS -vBP -byl -byl -mhv -rAe +kPz +uwY +pcu +eDn +xQC +xQC +eDn +eON +cYv +cYv +cYv +arY +lDC +irx +aXK +jZb +dRW +jZb +cFN +eDn +eDn +xQC +xQC +xQC wzE dYr mcc @@ -72884,38 +73731,38 @@ roY iZV cKa aaK -rVy +soQ cKa cFE -uYD +soQ cKa xMR iZV uwk -bxa -byl -vBP -byl -mhv +swg +fyC +qOk +sHO +erT kPz -ecM +eDn rkB rFr -miU +lBY uSb lzb -ecM -bQM -bQM -kPz +lDC +lDC +ldZ +ldZ +lDC +ldZ +ldZ +eDn cAW -kPz -ajx -afk -afk -afk -ghg -fsn +bce +bce +bce wzE kqC usz @@ -73093,7 +73940,7 @@ tOp cKa fiu gbi -tHu +iZV cKa ldm usA @@ -73110,27 +73957,27 @@ afk afk ghg gef -mlC +xQC wkD sMj -miU -xKX +gXi +ecC hgJ -mlC -bQM +edd +vgP +irx +htc +svo +irx +irx +xQC +cAW +bce +cAW cAW -kPz -bQM -kPz -bTo -afk -hkh -afk -tCZ -pcu wzE msv -dHp +uRY dHp dHp bop @@ -73322,28 +74169,28 @@ hkh afk tCZ pcu -mlC +xQC rym fBi -xKX +irx rym rym -mlC -kPz -kPz -kPz -kPz -kPz -rAe -afk -afk -afk -fhz -tvI +edd +vgP +eON +lWr +svo +eON +lWr +xQC +bce +bce +cAW +cAW wzE pHu dui -mcc +cWN dWM mcc mcc @@ -73534,29 +74381,29 @@ afk afk xMW ssJ -mlC +xQC xkC tom vGv uzO dhe -mlC -bQM -kPz -cAW +edd +fje +das +jAt +svo +tJn +jAt +xQC cAW bce -aKA -xQC -llQ -eZA -sYv -kPz +bce +bce wzE lll mcc -vza -mcc +oPJ +jfk mcc vza mcc @@ -73746,24 +74593,24 @@ llQ eOF bUB kPz +eDn +vPM +lBY +oOv +dGw +rFH +lDC +izZ +uym +uym +izZ +uym +uym ecM -cjF -miU -xKX -gqe -lzb -ecM -ecM -mlC -mlC -mlC -mlC -ecM -ecM -pcu -fcZ -erT -bQM +cAW +bce +cAW +cAW wzE scw uFh @@ -73958,24 +74805,24 @@ mlC mlC mlC ecM -ecM -xKX -xKX -rWX -xKX +eDn +eON +cYv +cYv +cYv +arY +lDC xKX -ecM -cjF -cjF -cjF -cjF -cjF -cjF +wkZ +wkZ +wWF +wkZ +wkZ ecM mlC wzE -iWq -bQM +wzE +wzE wzE glW vei @@ -74157,40 +75004,40 @@ dkj dkj dkj dkj +fvY dkj dkj dkj dkj dkj -dkj -kNz -cKa +vCT +fYV +fDI fDI -gqe cjF -qyX cjF -jqR cjF -qnu -xKX -sWF +jMA cjF -mDi -gqe -gqe -gqe -gqe -gqe -gqe -aFO -cbH -wzE -hZR -hZR -wzE -vei -iUy +cjF +cjF +cjF +cjF +gky +cjF +cjF +cjF +cjF +cjF +cjF +gky +cjF +kqC +usz +usz +usz +usz +usz mcc mcc mcc @@ -74377,8 +75224,8 @@ roY gLG iZV fSq -guB -cAv +cjF +gqe rAW cjF vEF @@ -74589,8 +75436,8 @@ vII vII dyM fSq -cjF -gqe +ebP +jJe gqe gqe sad @@ -74791,18 +75638,18 @@ wef roY roY roY -iZV +fin jpN uwk uwk uwk lIG vJD +gDt vJD -vJD -fSq -ebP -dGw +cKa +cjF +gqe gqe gqe vTl @@ -76487,7 +77334,7 @@ xMR roY wef roY -iZV +fin jmG uwk uwk diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm new file mode 100644 index 000000000000..6662ebf081f0 --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm @@ -0,0 +1,337 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/wood, +/area/template_noop) +"b" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/wood, +/area/template_noop) +"d" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E-corner" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/wood, +/area/template_noop) +"e" = ( +/obj/item/trash/cigbutt{ + pixel_x = 5; + pixel_y = -6 + }, +/turf/open/floor/wood, +/area/template_noop) +"f" = ( +/obj/effect/landmark/corpsespawner/ua_riot, +/obj/effect/decal/cleanable/blood, +/obj/item/handcuffs/zip{ + pixel_y = -12 + }, +/turf/open/floor/wood, +/area/template_noop) +"g" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NS-center" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/wood, +/area/template_noop) +"i" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E-corner" + }, +/turf/open/floor/wood, +/area/template_noop) +"j" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E-corner" + }, +/turf/open/floor/wood, +/area/template_noop) +"k" = ( +/obj/item/ammo_casing{ + dir = 6; + icon_state = "casing_10_1" + }, +/turf/open/floor/wood, +/area/template_noop) +"l" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/wood, +/area/template_noop) +"n" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NS-center" + }, +/turf/open/floor/wood, +/area/template_noop) +"p" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E-corner" + }, +/turf/open/floor/wood, +/area/template_noop) +"r" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NS-center" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/wood, +/area/template_noop) +"s" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/wood, +/area/template_noop) +"u" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/item/spacecash/c100{ + pixel_x = -11; + pixel_y = -6 + }, +/turf/open/floor/wood, +/area/template_noop) +"w" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/item/trash/barcardine, +/turf/open/floor/wood, +/area/template_noop) +"x" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E-corner" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/wood, +/area/template_noop) +"C" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NS-center" + }, +/obj/effect/decal/warning_stripes, +/turf/open/floor/wood, +/area/template_noop) +"G" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/wood, +/area/template_noop) +"H" = ( +/obj/item/trash/chunk, +/turf/open/floor/wood, +/area/template_noop) +"J" = ( +/obj/item/weapon/gun/smg/mac15{ + pixel_x = 12 + }, +/turf/open/floor/wood, +/area/template_noop) +"L" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/wood, +/area/template_noop) +"M" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E-corner" + }, +/obj/effect/decal/warning_stripes, +/obj/structure/holohoop{ + dir = 8 + }, +/turf/open/floor/wood, +/area/template_noop) +"Q" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/wood, +/area/template_noop) +"R" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes, +/obj/structure/holohoop{ + dir = 4 + }, +/turf/open/floor/wood, +/area/template_noop) +"S" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/wood, +/area/template_noop) +"T" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E-corner" + }, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/turf/open/floor/wood, +/area/template_noop) +"U" = ( +/obj/item/ammo_magazine/smg/uzi{ + current_rounds = 0; + pixel_x = 5; + pixel_y = 12 + }, +/turf/open/floor/wood, +/area/template_noop) +"W" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/template_noop) +"Y" = ( +/turf/open/floor/wood, +/area/template_noop) +"Z" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NS-center" + }, +/obj/effect/decal/warning_stripes, +/obj/item/toy/beach_ball/holoball, +/turf/open/floor/wood, +/area/template_noop) + +(1,1,1) = {" +Q +G +R +G +a +"} +(2,1,1) = {" +w +s +Y +Y +l +"} +(3,1,1) = {" +s +d +C +T +S +"} +(4,1,1) = {" +s +Y +Y +Y +L +"} +(5,1,1) = {" +s +Y +Y +H +L +"} +(6,1,1) = {" +s +Y +e +Y +L +"} +(7,1,1) = {" +r +n +Z +n +g +"} +(8,1,1) = {" +s +J +U +Y +L +"} +(9,1,1) = {" +s +k +W +Y +L +"} +(10,1,1) = {" +u +f +Y +Y +L +"} +(11,1,1) = {" +p +b +C +G +i +"} +(12,1,1) = {" +s +Y +Y +Y +L +"} +(13,1,1) = {" +d +j +M +j +x +"} From f5186b86cb6e24d1d2257b0cbd11c7ba70c713f8 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 19 Sep 2023 02:52:03 +0100 Subject: [PATCH 11/15] Automatic changelog for PR #4379 [ci skip] --- html/changelogs/AutoChangeLog-pr-4379.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4379.yml diff --git a/html/changelogs/AutoChangeLog-pr-4379.yml b/html/changelogs/AutoChangeLog-pr-4379.yml new file mode 100644 index 000000000000..0bbab0ceae6a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4379.yml @@ -0,0 +1,5 @@ +author: "c4xmaniac2" +delete-after: True +changes: + - mapadd: "Readds yard to Science Annex" + - maptweak: "Redid the yard loot to be more in line with current surv loot standards." \ No newline at end of file From 888fd2745f05d0593fbd8051b13aee38d4e44f4d Mon Sep 17 00:00:00 2001 From: spartanbobby <71467726+spartanbobby@users.noreply.github.com> Date: Tue, 19 Sep 2023 02:45:50 +0100 Subject: [PATCH 12/15] LV522: Changes to map decortation, loot tables and renaming of colony airlocks (#4386) # About the pull request This PR Updates some LV522 areas that were comparatively under-decorated compared to the rest of the map Heavily Nerfs the loose metal spawns on the map replacing them with things like pouches and equipment Renames alot of doors to have more accurate names # Explain why it's good for the game When I was making the map it was very clear that I didn't know what to place in some areas so I just put down some loose metal, this has come back to bite me in the ass with the FORECON tunnel hold and I wanna knock that area down a peg without directly touching it as I still believe it looks pretty cool so I've added some decor to make it take longer to get into and build up and nerfed a lot of the potential metal spawns There's a new area between dorms and security I'll be calling it Checkpoint Charlie in this PR but it goes unnamed in the map file. Checkpoint Charlie is the last stand location for FORECON's GL spec and thus has some explosives FORECON can pick up and use such as an M79, 3 HEDPs, an M15, and a demo charge for getting into the crashed dropship. The Landed FORECON ship has been made slightly easier to get into, now only requiring a breaching charge to open instead of pushing a button across the map, hopefully this will make FORECON consider getting whats inside and the crashed ship has been slightly buffed with an Autoinjector pouch and a compact defib for FORECOn to use. The doors were renamed in an attempt to help people navigate and is something that should have been in from the start # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: SpartanBobby, GSDPathe maptweak: Changes to LV522 loot table surrounding metal spawns maptweak: Redectorates areas around LV522 that were underwhelming before /:cl: --- .../LV522_Chances_Claim.dmm | 1605 +++++++++++++---- 1 file changed, 1245 insertions(+), 360 deletions(-) diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 9fcb8b7386a7..abbf64ff7116 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -111,6 +111,10 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor) +"acC" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "acD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat, @@ -197,6 +201,14 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) +"afa" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "afn" = ( /obj/item/reagent_container/spray/cleaner/drone{ pixel_x = -3; @@ -804,6 +816,7 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, +/obj/vehicle/train/cargo/trolley, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "awI" = ( @@ -855,6 +868,16 @@ icon_state = "plate" }, /area/lv522/atmos/reactor_garage) +"ayf" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/vehicle/train/cargo/trolley, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "ayn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -901,11 +924,6 @@ /area/lv522/indoors/a_block/corpo/glass) "azJ" = ( /obj/structure/surface/table/almayer, -/obj/item/clothing/head/helmet/marine/grenadier{ - armor_bullet = 10; - desc = "Pairs with the M3-G4 heavy grenadier plating. A distant cousin of the experimental B18 defensive helmet. Decorated with a blue stripe the large hole in the side of this helmet somewhat limits its protection."; - name = "\improper damaged M3-G4 grenadier helmet" - }, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) "azK" = ( @@ -934,6 +952,12 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"aAX" = ( +/obj/item/ammo_box/magazine/misc/mre/empty, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "aBm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/invuln/lattice_prop{ @@ -1172,6 +1196,12 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) +"aId" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "aIf" = ( /obj/structure/machinery/light{ dir = 1 @@ -1274,6 +1304,10 @@ icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) +"aKE" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "aKK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/pipes/standard/simple/hidden/green{ @@ -2102,6 +2136,10 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/north) +"bgw" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "bgJ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "Sec-Kitchen-Lockdown"; @@ -2611,6 +2649,15 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor) +"byb" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/obj/structure/barricade/wooden{ + dir = 1 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "bye" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -2627,6 +2674,22 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) +"byD" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal{ + icon = 'icons/mob/xenos/effects.dmi'; + icon_state = "acid_weak"; + layer = 2; + name = "weak acid"; + pixel_x = -10; + pixel_y = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "byJ" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -2700,6 +2763,13 @@ }, /turf/open/floor/plating, /area/lv522/indoors/a_block/security) +"bAn" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "bAo" = ( /obj/item/prop/colony/usedbandage{ dir = 10 @@ -3111,6 +3181,10 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor) +"bKf" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "bKk" = ( /turf/open/floor/corsat{ dir = 8; @@ -3132,6 +3206,12 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) +"bKu" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "bKO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -3384,6 +3464,18 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"bQP" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_y = -6 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_y = 10 + }, +/obj/structure/barricade/wooden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "bRN" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -3597,6 +3689,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/w_rockies) +"bWv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "bWA" = ( /obj/structure/prop/ice_colony/flamingo{ dir = 4; @@ -3673,7 +3769,8 @@ /area/lv522/outdoors/colony_streets/central_streets) "bXU" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2 + dir = 2; + name = "\improper B-Block Bar" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -3863,6 +3960,11 @@ icon_state = "floor_plate" }, /area/lv522/atmos/sewer) +"cbb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "cbn" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -4041,7 +4143,9 @@ }, /area/lv522/indoors/a_block/fitness) "cgG" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Cargo Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -4413,7 +4517,6 @@ }, /area/lv522/indoors/c_block/cargo) "cqL" = ( -/obj/structure/largecrate/random/barrel/white, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 @@ -4472,6 +4575,12 @@ icon_state = "marked" }, /area/lv522/atmos/east_reactor) +"csl" = ( +/obj/structure/barricade/plasteel/metal, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "csv" = ( /obj/structure/platform{ dir = 1 @@ -5214,6 +5323,17 @@ icon_state = "brown" }, /area/lv522/oob) +"cJc" = ( +/obj/item/prop/colony/used_flare, +/obj/structure/cargo_container/wy/right, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/north_east_street) +"cJg" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/asphalt/cement{ + icon_state = "cement9" + }, +/area/lv522/outdoors/colony_streets/north_street) "cJh" = ( /obj/structure/window/reinforced{ dir = 4 @@ -5576,6 +5696,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) +"cQv" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/storage_blocks) "cQB" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/pipes/standard/simple/hidden/green{ @@ -6284,7 +6408,7 @@ /obj/structure/surface/rack, /obj/item/device/analyzer, /obj/effect/landmark/objective_landmark/close, -/obj/item/stack/sandbags_empty/small_stack, +/obj/item/stack/sheet/cardboard/full_stack, /turf/open/floor/prison{ icon_state = "darkbrownfull2" }, @@ -6531,6 +6655,12 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/hallway) +"dhj" = ( +/obj/item/prop/colony/used_flare, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "dhH" = ( /turf/open/asphalt/cement{ icon_state = "cement12" @@ -6655,7 +6785,7 @@ pixel_x = -6; pixel_y = 6 }, -/obj/structure/largecrate/random, +/obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) @@ -6760,7 +6890,8 @@ /area/lv522/outdoors/colony_streets/north_west_street) "dlM" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper B-Block - Hydroponics Airlock" }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -7161,7 +7292,7 @@ "dtl" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; - name = "\improper Canteen"; + name = "\improper A-Block Canteen Airlock"; welded = 1 }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -7507,6 +7638,13 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) +"dBQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "dCx" = ( /obj/structure/closet/crate/radiation, /turf/open/floor/corsat{ @@ -7669,7 +7807,9 @@ }, /area/lv522/indoors/c_block/mining) "dFE" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block - Colony Operations Centre Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -7760,7 +7900,6 @@ }, /area/lv522/atmos/east_reactor) "dHx" = ( -/obj/structure/largecrate/random/barrel/red, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -7987,7 +8126,8 @@ /area/lv522/indoors/a_block/kitchen/damage) "dMo" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper B-Block - Hydroponics Airlock" }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "LV_522_Hydro-Lockdown"; @@ -8316,6 +8456,11 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/east) +"dSJ" = ( +/obj/structure/largecrate/random/secure, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "dSW" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ dir = 1; @@ -8373,7 +8518,7 @@ "dUr" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Westlock"; + name = "\improper A-Block Dorms And Office Airlock"; welded = 1 }, /turf/open/floor/corsat{ @@ -9488,16 +9633,13 @@ }, /area/lv522/indoors/a_block/medical/glass) "eqb" = ( -/obj/structure/largecrate/random/mini{ - pixel_x = -8; - pixel_y = -8 - }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/barricade/deployable, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -9598,6 +9740,7 @@ /obj/structure/platform_decoration{ dir = 8 }, +/obj/item/stack/sheet/wood, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "esB" = ( @@ -9720,6 +9863,14 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/corpo/glass) +"evQ" = ( +/obj/structure/barricade/sandbags, +/obj/item/trash/uscm_mre{ + pixel_x = -8; + pixel_y = 10 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "evS" = ( /obj/structure/platform, /obj/structure/platform{ @@ -10445,6 +10596,14 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"eLK" = ( +/obj/structure/tunnel/maint_tunnel{ + pixel_y = 6 + }, +/obj/structure/machinery/light/small, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "eLN" = ( /obj/structure/machinery/light, /turf/open/floor{ @@ -10751,6 +10910,12 @@ icon_state = "platebot" }, /area/lv522/indoors/c_block/cargo) +"eSM" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/asphalt/cement{ + icon_state = "cement9" + }, +/area/lv522/outdoors/colony_streets/north_street) "eSO" = ( /obj/structure/largecrate/random, /obj/structure/machinery/light{ @@ -10797,10 +10962,6 @@ /obj/structure/platform{ dir = 8 }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "UD6 East"; - indestructible = 1 - }, /turf/open/floor/plating, /area/lv522/landing_zone_forecon/UD6_Tornado) "eTQ" = ( @@ -11183,10 +11344,6 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "UD6 East"; - indestructible = 1 - }, /turf/open/floor/plating, /area/lv522/landing_zone_forecon/UD6_Tornado) "fcd" = ( @@ -11618,7 +11775,8 @@ /area/lv522/indoors/a_block/security) "fmg" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper A-Block Corporate Office Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -11834,7 +11992,9 @@ }, /area/lv522/atmos/east_reactor/south) "frc" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Security Airlock" + }, /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "Sec-Kitchen-Lockdown"; @@ -11942,6 +12102,11 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"fto" = ( +/obj/item/storage/belt/grenade, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/north_street) "fts" = ( /obj/structure/surface/table/woodentable/fancy, /obj/effect/decal/cleanable/dirt, @@ -12011,6 +12176,12 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/east) +"fvc" = ( +/obj/structure/barricade/sandbags, +/turf/open/asphalt/cement{ + icon_state = "cement14" + }, +/area/lv522/outdoors/colony_streets/north_street) "fvk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -13092,6 +13263,12 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/admin) +"fRw" = ( +/obj/structure/girder, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "fRP" = ( /obj/structure/prop/vehicles/crawler{ layer = 3.3 @@ -13211,7 +13388,7 @@ "fTK" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Corporation Dome"; + name = "\improper A-Block Corporate Office Airlock"; req_access_txt = "100" }, /turf/open/floor/corsat{ @@ -13239,6 +13416,12 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) +"fUc" = ( +/obj/structure/girder, +/turf/open/asphalt/cement{ + icon_state = "cement15" + }, +/area/lv522/outdoors/colony_streets/north_street) "fUf" = ( /obj/effect/decal{ icon = 'icons/mob/xenos/effects.dmi'; @@ -13261,6 +13444,15 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) +"fUQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "fUT" = ( /obj/structure/prop/server_equipment/yutani_server{ density = 0; @@ -13927,6 +14119,18 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/east) +"ghE" = ( +/obj/item/clothing/head/helmet/marine/grenadier{ + armor_bullet = 10; + desc = "Pairs with the M3-G4 heavy grenadier plating. A distant cousin of the experimental B18 defensive helmet. Decorated with a blue stripe the large hole in the side of this helmet somewhat limits its protection."; + name = "\improper damaged M3-G4 grenadier helmet"; + pixel_x = 3; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "gib" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/stairs/perspective{ @@ -14379,6 +14583,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) +"gsn" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/vehicle/train/cargo/engine, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "gsM" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -14563,16 +14774,45 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/security) +"gvK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/uscm_mre{ + pixel_x = -12; + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "gvT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/fitness) +"gvU" = ( +/obj/structure/prop/invuln/minecart_tracks, +/obj/structure/closet/crate/miningcar{ + layer = 3.1; + name = "\improper materials storage bin"; + pixel_y = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/ore/slag, +/obj/item/ore/slag, +/obj/item/ore/slag, +/obj/item/ore/slag, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/mining) "gwb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/corpo) "gwg" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock" + }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "LV_522_Hydro-Lockdown"; name = "\improper Storm Shutters" @@ -14623,6 +14863,18 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/security) +"gwU" = ( +/obj/structure/barricade/sandbags{ + dir = 8 + }, +/obj/item/prop/alien/hugger{ + pixel_x = 13; + pixel_y = -5 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "gxb" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -14642,9 +14894,10 @@ }, /area/lv522/atmos/command_centre) "gxe" = ( -/obj/item/stack/sandbags_empty/small_stack, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/indoors/b_block/bridge) +/obj/effect/decal/cleanable/blood, +/obj/effect/spawner/gibspawner/human, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "gxl" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC, @@ -15343,7 +15596,9 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/security) "gLw" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Security Airlock" + }, /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "Sec-Corpo-Bridge-Lockdown" @@ -15352,6 +15607,13 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/security) +"gLy" = ( +/obj/structure/surface/table/almayer, +/obj/item/map/lv522_map, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "gLK" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -15420,6 +15682,11 @@ icon_state = "cement9" }, /area/lv522/outdoors/colony_streets/south_west_street) +"gMT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/alien/hugger, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "gMV" = ( /obj/structure/machinery/light{ dir = 1 @@ -15636,7 +15903,7 @@ /area/lv522/indoors/c_block/cargo) "gRi" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/large_stack, +/obj/item/stack/sheet/metal/medium_stack, /obj/item/ore/uranium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -15648,6 +15915,10 @@ /obj/item/prop/colony/used_flare, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"gRl" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/storage_blocks) "gRp" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/prison{ @@ -15684,6 +15955,11 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"gRS" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "gRU" = ( /obj/item/paper_bin/uscm{ pixel_x = -7; @@ -15798,6 +16074,13 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) +"gUT" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -12; + pixel_y = 25 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "gUY" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/vomit, @@ -16296,6 +16579,7 @@ /area/lv522/atmos/east_reactor/east) "hbO" = ( /obj/structure/largecrate/random/case/small, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) "hcv" = ( @@ -16328,6 +16612,7 @@ dir = 10; icon_state = "p_stair_full" }, +/obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "hcO" = ( @@ -16345,6 +16630,9 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 11 + }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) "hcZ" = ( @@ -16987,7 +17275,6 @@ /area/lv522/atmos/west_reactor) "hnG" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Corporation Dome"; req_access_txt = "100" }, /turf/open/floor/corsat{ @@ -16996,7 +17283,8 @@ /area/lv522/atmos/way_in_command_centre) "hnX" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2 + dir = 2; + name = "\improper A-Block Dorms And Office Airlock" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -17101,7 +17389,7 @@ "hpO" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Engineering Hut" + name = "\improper Emergency Engineering" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -18416,7 +18704,8 @@ /area/lv522/atmos/way_in_command_centre) "hPT" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2 + dir = 2; + name = "\improper A-Block - Colony Operations Centre Airlock" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -18956,6 +19245,16 @@ icon_state = "plate" }, /area/lv522/atmos/filt) +"iaD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "iaM" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/rods, @@ -18996,6 +19295,10 @@ icon_state = "23" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"ibS" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "ibT" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -19437,6 +19740,15 @@ icon_state = "wood" }, /area/lv522/indoors/b_block/bar) +"ikp" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/item/stack/folding_barricade, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "ikr" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -19942,6 +20254,7 @@ /area/lv522/indoors/a_block/admin) "iuQ" = ( /obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Cargo Airlock"; welded = 1 }, /turf/open/floor/corsat{ @@ -19979,6 +20292,16 @@ /obj/item/tool/wet_sign, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"ivs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "ivy" = ( /obj/structure/surface/rack, /obj/item/tool/pickaxe/jackhammer, @@ -20006,6 +20329,12 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"ivY" = ( +/obj/item/prop/colony/used_flare, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "iwb" = ( /obj/structure/stairs/perspective{ dir = 6; @@ -20250,7 +20579,9 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) "iBd" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Garage Airlock" + }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ icon_state = "marked" @@ -20400,6 +20731,13 @@ icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) +"iFe" = ( +/obj/structure/closet/crate, +/obj/item/weapon/stunprod, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/landing_zone_2) "iFk" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -20815,6 +21153,9 @@ icon_state = "N"; pixel_y = 1 }, +/obj/structure/barricade/metal{ + dir = 1 + }, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -21682,7 +22023,9 @@ }, /area/lv522/atmos/cargo_intake) "jdI" = ( -/obj/structure/machinery/door/airlock/almayer/generic, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Radio Tower Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -21701,6 +22044,12 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor/south) +"jeh" = ( +/obj/item/stack/sandbags/small_stack, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "jey" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -21997,7 +22346,7 @@ /area/lv522/atmos/cargo_intake) "jjc" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Greenhouse Storage" + name = "\improper Electronics Storage" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -22407,6 +22756,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) +"joV" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "jpa" = ( /obj/structure/bedsheetbin{ pixel_y = 7 @@ -22419,6 +22774,9 @@ /area/lv522/indoors/a_block/fitness) "jpb" = ( /obj/structure/closet/crate, +/obj/item/storage/pouch/shotgun/large/slug, +/obj/item/storage/pouch/general/large/m39ap, +/obj/item/storage/pouch/flamertank, /turf/open/floor/prison, /area/lv522/landing_zone_2) "jpc" = ( @@ -22484,7 +22842,7 @@ /area/lv522/landing_zone_1) "jqV" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Corporation Dome"; + name = "\improper A-Block Corporate Office Airlock"; req_access_txt = "100" }, /turf/open/floor/corsat{ @@ -22638,8 +22996,9 @@ /area/lv522/indoors/a_block/corpo/glass) "jub" = ( /obj/structure/machinery/floodlight, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/plating{ + dir = 8; + icon_state = "platingdmg3" }, /area/lv522/indoors/lone_buildings/storage_blocks) "jud" = ( @@ -22764,6 +23123,7 @@ /area/lv522/indoors/c_block/cargo) "jwO" = ( /obj/structure/largecrate/random/barrel/blue, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) "jwT" = ( @@ -22967,6 +23327,16 @@ }, /turf/open/floor/plating, /area/lv522/indoors/a_block/admin) +"jAA" = ( +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "jAI" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, @@ -23658,15 +24028,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"jNk" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Westlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorms) "jNv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata{ @@ -23767,7 +24128,9 @@ /turf/open/floor/plating, /area/lv522/oob) "jPd" = ( -/obj/structure/machinery/door/airlock/almayer/generic, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock" + }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; id = "LV_522_Hydro-Lockdown"; @@ -24607,9 +24970,15 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"keA" = ( +/obj/structure/girder, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/lv522/outdoors/colony_streets/north_street) "kfa" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Colony Marshals" + name = "\improper A-Block Security Airlock" }, /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -25955,6 +26324,15 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"kCQ" = ( +/obj/structure/largecrate/random, +/obj/item/explosive/plastic/breaching_charge{ + pixel_y = -2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "kDH" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ @@ -26766,6 +27144,13 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) +"kSh" = ( +/obj/structure/closet/crate, +/obj/item/storage/pouch/pressurized_reagent_canister/revival, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "kSm" = ( /obj/structure/machinery/light{ dir = 8 @@ -27210,6 +27595,13 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen/damage) +"lae" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "lag" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/power/apc/weak{ @@ -27239,7 +27631,8 @@ /area/lv522/indoors/a_block/admin) "laB" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper A-Block - Colony Operations Centre Airlock" }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27557,6 +27950,10 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) +"lgR" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "lgY" = ( /obj/structure/platform_decoration{ dir = 1 @@ -27726,6 +28123,7 @@ /area/lv522/atmos/cargo_intake) "lkr" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Casino Airlock"; welded = 1 }, /turf/open/floor/corsat{ @@ -27971,6 +28369,11 @@ icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) +"loX" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "lpi" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -28163,14 +28566,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"ltI" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Westlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorms) "lui" = ( /obj/effect/decal/cleanable/blood/drip, /obj/structure/pipes/standard/simple/hidden/green{ @@ -28782,6 +29177,16 @@ icon_state = "brown" }, /area/lv522/atmos/filt) +"lFM" = ( +/obj/structure/prop/invuln/pipe_water{ + pixel_x = 3; + pixel_y = 10 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_y = -6 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "lFO" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -29034,10 +29439,7 @@ }, /area/lv522/indoors/a_block/admin) "lKH" = ( -/obj/structure/machinery/colony_floodlight{ - layer = 4.3; - pixel_y = 9 - }, +/obj/structure/machinery/colony_floodlight, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -29255,6 +29657,15 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) +"lQA" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "lQS" = ( /obj/structure/prop/vehicles/crawler{ dir = 8; @@ -29263,6 +29674,16 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) +"lRi" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -12; + pixel_y = -1 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "lRx" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/sriracha{ @@ -29414,7 +29835,9 @@ /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) "lUy" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Shared Dorms Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -29924,7 +30347,8 @@ /area/lv522/indoors/a_block/fitness) "mfS" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper C-Block - Casino Airlock" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -30036,7 +30460,7 @@ /area/lv522/outdoors/colony_streets/south_east_street) "mji" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Corporation Dome"; + name = "\improper A-Block Corporate Office Airlock"; req_access_txt = "100" }, /turf/open/floor/corsat{ @@ -30156,7 +30580,9 @@ }, /area/lv522/indoors/a_block/security) "mkT" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Security Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -30243,11 +30669,15 @@ }, /area/lv522/atmos/reactor_garage) "mlY" = ( -/obj/structure/largecrate/random, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/alien/hugger{ + pixel_x = -7; + pixel_y = -5 + }, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -30796,6 +31226,11 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) +"mwn" = ( +/obj/structure/largecrate/random/barrel/white, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "mwp" = ( /obj/effect/spawner/random/tool, /turf/open/auto_turf/sand_white/layer0, @@ -31133,6 +31568,14 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) +"mEn" = ( +/obj/structure/surface/rack, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/metal/medium_stack, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/garage) "mEp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -31299,6 +31742,12 @@ icon_state = "E"; pixel_x = 1 }, +/obj/structure/reagent_dispensers/fueltank{ + layer = 2.9 + }, +/obj/structure/barricade/metal{ + dir = 4 + }, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -31420,6 +31869,14 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) +"mKK" = ( +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "mKN" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/corsat{ @@ -31774,6 +32231,7 @@ /area/lv522/indoors/a_block/dorms) "mPQ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Dorms And Office Airlock"; welded = 1 }, /obj/structure/pipes/standard/simple/hidden/green, @@ -31787,6 +32245,11 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) +"mPV" = ( +/obj/structure/largecrate/random/barrel, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "mPY" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /obj/effect/landmark/xeno_spawn, @@ -31821,7 +32284,9 @@ }, /area/lv522/landing_zone_2/ceiling) "mQo" = ( -/obj/structure/largecrate/random/barrel/green, +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_street) "mQq" = ( @@ -32321,6 +32786,16 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/mining) +"naM" = ( +/obj/item/explosive/grenade/high_explosive/m15{ + pixel_x = 8 + }, +/obj/item/prop/alien/hugger{ + pixel_x = -7; + pixel_y = -5 + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/north_street) "naN" = ( /obj/item/stack/rods, /obj/structure/machinery/light{ @@ -32434,7 +32909,6 @@ }, /area/lv522/outdoors/colony_streets/south_street) "ncs" = ( -/obj/structure/largecrate/random/barrel/white, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -32829,6 +33303,11 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"nkm" = ( +/obj/item/prop/alien/hugger, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "nkt" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -32896,7 +33375,6 @@ "nlO" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/metal/large_stack, -/obj/item/stack/sheet/metal/large_stack, /turf/open/floor/plating{ icon_state = "platebot" }, @@ -32984,7 +33462,7 @@ "nmL" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Colony Kitchen" + name = "\improper A-Block Kitchen Airlock" }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -33447,7 +33925,9 @@ /area/lv522/indoors/a_block/security) "nue" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock" + }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "LV_522_Hydro-Lockdown"; name = "\improper Storm Shutters" @@ -33517,6 +33997,12 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/bridges/op_centre) +"nvA" = ( +/turf/open/floor/plating{ + dir = 8; + icon_state = "platingdmg3" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "nvB" = ( /obj/structure/cargo_container/kelland/right, /turf/open/auto_turf/shale/layer1, @@ -33769,6 +34255,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) +"nDo" = ( +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "nDt" = ( /obj/structure/platform_decoration{ dir = 4 @@ -33881,7 +34371,9 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) "nFQ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock" + }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "LV_522_Hydro-Lockdown"; name = "\improper Storm Shutters" @@ -33962,6 +34454,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) +"nHM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "nHT" = ( /obj/structure/bed/chair, /obj/structure/machinery/light{ @@ -34091,6 +34589,13 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"nKZ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "nLe" = ( /obj/structure/machinery/vending/cola, /obj/effect/decal/cleanable/cobweb2, @@ -34207,10 +34712,10 @@ }, /area/lv522/outdoors/colony_streets/north_street) "nMP" = ( -/obj/structure/largecrate/random/secure, /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -34682,6 +35187,7 @@ pixel_y = 6 }, /obj/structure/largecrate/random/case/small, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) "nUO" = ( @@ -34889,7 +35395,8 @@ /area/lv522/indoors/c_block/garage) "nXI" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper B-Block - Hydroponics Airlock" }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -35008,7 +35515,6 @@ /obj/effect/landmark/objective_landmark/close, /obj/structure/closet/crate, /obj/item/stack/sheet/plasteel/large_stack, -/obj/item/stack/sheet/plasteel/large_stack, /turf/open/floor/plating{ icon_state = "platebot" }, @@ -35029,7 +35535,7 @@ /area/lv522/indoors/a_block/fitness) "nZx" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/plasteel/medium_stack, +/obj/item/stack/sheet/plasteel/small_stack, /obj/item/ore/uranium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -35156,11 +35662,9 @@ }, /area/lv522/indoors/a_block/kitchen) "odi" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) +/obj/effect/spawner/gibspawner/human, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "odt" = ( /obj/structure/window_frame/strata, /obj/item/stack/rods, @@ -35475,10 +35979,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/op_centre) "oik" = ( -/obj/structure/machinery/colony_floodlight{ - layer = 4.3; - pixel_y = 9 - }, +/obj/structure/machinery/colony_floodlight, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -35685,6 +36186,13 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/hallway) +"omv" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_y = -6 + }, +/obj/item/stack/sheet/metal, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "omG" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -35763,11 +36271,10 @@ }, /area/lv522/indoors/a_block/dorms) "oow" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) +/obj/effect/spawner/gibspawner/human, +/obj/item/device/defibrillator/compact, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/w_rockies) "ooG" = ( /obj/structure/machinery/power/apc/weak{ dir = 1 @@ -36037,10 +36544,7 @@ }, /area/lv522/atmos/sewer) "otC" = ( -/obj/structure/machinery/colony_floodlight{ - layer = 4.3; - pixel_y = 9 - }, +/obj/structure/machinery/colony_floodlight, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -36110,6 +36614,10 @@ }, /turf/open/gm/river, /area/lv522/outdoors/colony_streets/south_street) +"ous" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "ouv" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/camera/autoname, @@ -36161,6 +36669,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"ovB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/item/trash/uscm_mre, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "ovT" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -36492,6 +37009,7 @@ pixel_x = -6; pixel_y = 6 }, +/obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "oDj" = ( @@ -36968,6 +37486,12 @@ icon_state = "brown" }, /area/lv522/atmos/north_command_centre) +"oMO" = ( +/obj/structure/tent/big, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "oNd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/reinforced/prison, @@ -37105,11 +37629,11 @@ /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) "oQV" = ( -/obj/structure/largecrate/random/barrel/green, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, +/obj/item/stack/sandbags/small_stack, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -37500,7 +38024,7 @@ /area/lv522/indoors/a_block/admin) "oXV" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Greenhouse Storage" + name = "\improper Electronics Storage" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -38352,6 +38876,10 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) +"pqk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "pqA" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/close, @@ -38401,11 +38929,26 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) +"pqX" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 9; + pixel_y = 25 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "pqZ" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ icon_state = "102" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"prs" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/obj/effect/spawner/gibspawner/xeno, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "prD" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "5" @@ -38588,7 +39131,9 @@ /area/lv522/atmos/east_reactor/south) "pvE" = ( /obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Cargo Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -38617,10 +39162,9 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/item/stack/sheet/metal/large_stack, /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal/medium_stack, +/obj/item/storage/pouch/medkit/full_advanced, /turf/open/floor/prison{ dir = 10; icon_state = "floor_marked" @@ -38702,6 +39246,15 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"pxp" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Dorms And Office Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorms) "pxN" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ @@ -39034,7 +39587,9 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/structure/machinery/door/airlock/almayer/generic, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper A-Block Fitness Centre Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -39458,7 +40013,7 @@ "pLN" = ( /obj/structure/machinery/door/airlock/almayer/medical{ dir = 2; - name = "Medical Airlock" + name = "\improper A-Block - Colony Medical Centre Airlock" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -39493,6 +40048,7 @@ /obj/structure/platform_decoration{ dir = 4 }, +/obj/item/stack/sheet/metal, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "pMd" = ( @@ -39527,7 +40083,7 @@ "pMt" = ( /obj/structure/machinery/door/airlock/almayer/medical{ dir = 2; - name = "Medical Airlock" + name = "\improper A-Block - Colony Medical Centre Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -39828,9 +40384,14 @@ icon_state = "brown" }, /area/lv522/atmos/cargo_intake) +"pSh" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "pSj" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper B-Block - Hydroponics Airlock" }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -40363,7 +40924,8 @@ /area/lv522/outdoors/colony_streets/central_streets) "qbL" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper A-Block Dorms And Office Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -40471,6 +41033,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) +"qdV" = ( +/obj/structure/barricade/sandbags{ + dir = 8 + }, +/obj/item/trash/uscm_mre, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "qer" = ( /obj/structure/prop/invuln/minecart_tracks{ layer = 2.6 @@ -40561,6 +41132,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) +"qhk" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/storage_blocks) "qhm" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -41410,6 +41985,10 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"qxe" = ( +/obj/item/prop/colony/used_flare, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "qxf" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/strata_outpost, @@ -41712,6 +42291,10 @@ /obj/item/trash/plate, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"qBH" = ( +/obj/structure/cargo_container/wy/left, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/north_east_street) "qBQ" = ( /obj/structure/prop/invuln/ice_prefab/standalone/trim{ icon_state = "white_trim" @@ -42514,7 +43097,9 @@ /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "qPS" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Corporate Office Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -43803,6 +44388,18 @@ icon_state = "cement3" }, /area/lv522/outdoors/colony_streets/central_streets) +"rjD" = ( +/obj/item/tool/lighter/zippo{ + layer = 3.1; + pixel_x = 12; + pixel_y = 18 + }, +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "rjJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -43859,6 +44456,7 @@ /area/lv522/outdoors/colony_streets/windbreaker/observation) "rlE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Security Airlock"; welded = 1 }, /turf/open/floor/corsat{ @@ -43900,6 +44498,22 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/a_block/bridges) +"rmk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/item/weapon/gun/launcher/grenade/m81/m79, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) +"rmm" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "rmp" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating, @@ -44002,6 +44616,10 @@ icon_state = "cement12" }, /area/lv522/landing_zone_1) +"rnX" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "rod" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -44544,7 +45162,7 @@ }, /area/lv522/indoors/a_block/hallway) "ryb" = ( -/obj/structure/largecrate/random/barrel/red, +/obj/item/prop/colony/used_flare, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -44601,7 +45219,7 @@ }, /area/lv522/landing_zone_1) "ryW" = ( -/obj/structure/largecrate/random/secure, +/obj/item/stack/sandbags_empty/small_stack, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -44662,10 +45280,6 @@ /obj/structure/platform{ dir = 4 }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "UD6 East"; - indestructible = 1 - }, /turf/open/floor/plating, /area/lv522/landing_zone_forecon/UD6_Tornado) "rAu" = ( @@ -44705,6 +45319,12 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) +"rBg" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/lv522/outdoors/colony_streets/north_street) "rBy" = ( /obj/effect/landmark/objective_landmark/medium, /obj/effect/decal/cleanable/dirt, @@ -44841,10 +45461,7 @@ }, /area/lv522/indoors/c_block/t_comm) "rEo" = ( -/obj/structure/machinery/colony_floodlight{ - layer = 4.3; - pixel_y = 9 - }, +/obj/structure/machinery/colony_floodlight, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -45047,7 +45664,9 @@ }, /area/lv522/outdoors/colony_streets/south_west_street) "rJz" = ( -/obj/structure/machinery/door/airlock/almayer/generic, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper A-Block Fitness Centre Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -45060,6 +45679,17 @@ /obj/item/stack/rods, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"rJG" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement2" + }, +/area/lv522/outdoors/colony_streets/north_street) "rJH" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/green, @@ -45456,6 +46086,7 @@ /area/lv522/indoors/b_block/bar) "rRc" = ( /obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Cargo Airlock"; welded = 1 }, /obj/structure/pipes/standard/simple/hidden/green{ @@ -45610,6 +46241,17 @@ icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) +"rSQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/uscm_mre, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "rSW" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 8 @@ -45677,6 +46319,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"rUJ" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Security Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "Sec-Kitchen-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/kitchen) "rUX" = ( /obj/structure/shuttle/engine/heater{ dir = 4; @@ -45832,14 +46488,9 @@ /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_street) "rYp" = ( -/obj/structure/largecrate/random/mini{ - pixel_x = 10; - pixel_y = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) +/obj/effect/spawner/gibspawner/human, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/w_rockies) "rYq" = ( /obj/structure/platform, /obj/structure/platform{ @@ -45948,6 +46599,8 @@ "sau" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, +/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/emergency_oxygen/double, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -46525,6 +47178,7 @@ "skn" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; + name = "\improper A-Block Dorms And Office Airlock"; welded = 1 }, /obj/structure/pipes/standard/simple/hidden/green, @@ -46546,7 +47200,8 @@ /area/lv522/landing_zone_forecon/UD6_Tornado) "skQ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper A-Block Fitness Centre Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -46715,10 +47370,7 @@ "snI" = ( /obj/structure/machinery/floodlight, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" - }, +/turf/open/floor/plating, /area/lv522/indoors/lone_buildings/storage_blocks) "snP" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -46872,6 +47524,12 @@ icon_state = "cement15" }, /area/lv522/outdoors/colony_streets/central_streets) +"sqr" = ( +/obj/structure/girder, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "sqH" = ( /obj/structure/machinery/door_display/research_cell{ dir = 8; @@ -47120,7 +47778,8 @@ /area/lv522/atmos/east_reactor) "swf" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper C-Block - Cargo Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -47778,6 +48437,14 @@ /obj/item/key/cargo_train, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"sJP" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "sKa" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/asphalt/cement{ @@ -47979,8 +48646,8 @@ /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) "sLT" = ( -/obj/structure/largecrate/random/case, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "sLU" = ( @@ -48560,10 +49227,13 @@ }, /area/lv522/indoors/c_block/cargo) "sUN" = ( -/obj/structure/largecrate/random/barrel/yellow, /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/barricade/deployable, +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null + }, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -49256,6 +49926,13 @@ icon_state = "cement1" }, /area/lv522/landing_zone_2) +"tkC" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/largecrate/random, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "tkL" = ( /obj/structure/prop/server_equipment/yutani_server{ density = 0; @@ -49319,8 +49996,19 @@ /obj/structure/platform, /turf/open/gm/river, /area/lv522/landing_zone_1/tunnel) +"tlF" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "tlM" = ( -/obj/structure/machinery/door/airlock/almayer/generic, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Garage Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -49353,6 +50041,7 @@ /area/lv522/indoors/a_block/fitness) "tms" = ( /obj/structure/largecrate/random, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) "tmy" = ( @@ -49366,6 +50055,7 @@ /area/lv522/indoors/b_block/bridge) "tmA" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock"; welded = 1 }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -49591,7 +50281,9 @@ }, /area/lv522/atmos/east_reactor/south) "tqG" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block - Colony Operations Centre Airlock" + }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 1 }, @@ -50160,15 +50852,6 @@ icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) -"tBT" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Eastlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/hallway) "tCa" = ( /obj/item/trash/uscm_mre{ pixel_x = 10; @@ -50230,7 +50913,8 @@ /area/lv522/landing_zone_forecon/UD6_Tornado) "tDq" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper A-Block Fitness Centre Airlock" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -50399,6 +51083,12 @@ }, /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) +"tFC" = ( +/obj/structure/barricade/wooden{ + dir = 1 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "tFZ" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -50433,7 +51123,7 @@ /area/lv522/outdoors/colony_streets/north_street) "tGm" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Corporate Liason" + name = "\improper Corporate Liason Office " }, /turf/open/floor/corsat{ icon_state = "marked" @@ -50550,6 +51240,11 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/east_central_street) +"tIQ" = ( +/obj/structure/barricade/sandbags, +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "tIT" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -50993,7 +51688,7 @@ "tQE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Canteen" + name = "\improper A-Block Canteen Airlock" }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -51017,6 +51712,10 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/bridges) +"tRu" = ( +/obj/structure/cargo_container/wy/mid, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/north_east_street) "tRI" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/wooden_tv{ @@ -51065,6 +51764,10 @@ icon_state = "73" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"tSF" = ( +/obj/item/trash/uscm_mre, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "tSJ" = ( /obj/structure/machinery/light/double{ dir = 8; @@ -51238,6 +51941,14 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_east_street) +"tWy" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "tWC" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ @@ -51328,6 +52039,7 @@ dir = 6; icon_state = "p_stair_full" }, +/obj/structure/largecrate/random/barrel, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "tXW" = ( @@ -52160,7 +52872,8 @@ /area/lv522/indoors/c_block/cargo) "unE" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2 + dir = 2; + name = "\improper A-Block - Colony Operations Centre Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -52573,6 +53286,13 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo/glass) +"uuy" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/obj/effect/spawner/gibspawner/xeno, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "uuA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red{ @@ -52656,6 +53376,12 @@ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical/glass) +"uvJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "uwb" = ( /obj/structure/machinery/light/double, /turf/open/asphalt/cement{ @@ -52749,6 +53475,14 @@ /area/lv522/indoors/c_block/garage) "uye" = ( /obj/structure/largecrate/random, +/obj/item/storage/box/packet/high_explosive{ + pixel_x = -5; + pixel_y = -14 + }, +/obj/item/storage/pill_bottle/packet/oxycodone{ + pixel_x = -1; + pixel_y = 8 + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -52931,7 +53665,10 @@ /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/east) "uDF" = ( -/obj/structure/largecrate/random, +/obj/item/trash/uscm_mre{ + pixel_x = 12; + pixel_y = -7 + }, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_street) "uDM" = ( @@ -52961,6 +53698,13 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bridge) +"uEj" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "uEl" = ( /obj/structure/machinery/conveyor{ dir = 10; @@ -53383,6 +54127,11 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/kitchen/glass) +"uKk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/case, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "uKw" = ( /obj/structure/bed/chair{ dir = 1 @@ -53713,6 +54462,13 @@ icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) +"uQa" = ( +/obj/item/trash/uscm_mre, +/obj/structure/surface/table/almayer, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "uQf" = ( /obj/structure/platform{ dir = 1 @@ -53883,7 +54639,7 @@ "uSI" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; - name = "\improper Corporate Liason" + name = "\improper A-Block Corporate Office Airlock" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -54066,6 +54822,9 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_1) +"uVS" = ( +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/storage_blocks) "uVU" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/wy{ @@ -54479,6 +55238,10 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) +"veA" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "veD" = ( /obj/structure/surface/rack, /obj/structure/machinery/light{ @@ -54660,7 +55423,7 @@ "vil" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Colony Marshals" + name = "\improper A-Block Security Airlock" }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -54925,7 +55688,9 @@ }, /area/lv522/indoors/a_block/fitness) "vmp" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Casino Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -54947,6 +55712,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) +"vmM" = ( +/obj/structure/girder, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "vmQ" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 @@ -55000,7 +55771,8 @@ /area/lv522/indoors/a_block/bridges/op_centre) "vnB" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper A-Block Corporate Office Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -55415,6 +56187,12 @@ icon_state = "marked" }, /area/lv522/landing_zone_1/ceiling) +"vuF" = ( +/obj/vehicle/powerloader, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/lv522/landing_zone_forecon/UD6_Tornado) "vuH" = ( /obj/structure/largecrate, /obj/effect/landmark/lv624/fog_blocker/short, @@ -55480,6 +56258,13 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"vwW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/deployable{ + dir = 4 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "vxa" = ( /obj/structure/closet/crate, /obj/item/clothing/under/colonist, @@ -55550,7 +56335,9 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) "vxT" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block - Colony Operations Centre Airlock" + }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 1 }, @@ -55577,7 +56364,8 @@ /area/lv522/indoors/a_block/medical) "vyk" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper C-Block - Cargo Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -55679,7 +56467,8 @@ /area/lv522/outdoors/colony_streets/north_west_street) "vzE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper B-Block Bar" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -55810,8 +56599,7 @@ /area/lv522/indoors/c_block/garage) "vCv" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Dormitories"; - welded = null + name = "\improper A-Block Shared Dorms Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -56010,7 +56798,9 @@ }, /area/lv522/indoors/a_block/dorms) "vFS" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Fitness Centre Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -56296,7 +57086,9 @@ "vKm" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock" + }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "LV_522_Hydro-Lockdown"; name = "\improper Storm Shutters" @@ -56402,7 +57194,9 @@ }, /area/lv522/indoors/c_block/casino) "vLW" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Cargo Airlock" + }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ icon_state = "marked" @@ -56555,7 +57349,7 @@ "vOR" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Corporation Office"; + name = "\improper A-Block Corporate Office Airlock"; req_access_txt = "100" }, /obj/structure/pipes/standard/simple/hidden/green{ @@ -56630,7 +57424,7 @@ "vPA" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Corporation Office"; + name = "\improper A-Block Corporate Office Airlock"; req_access_txt = "100" }, /obj/structure/pipes/standard/simple/hidden/green{ @@ -56988,6 +57782,7 @@ "vWp" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; + name = "\improper C-Block - Casino Airlock"; welded = 1 }, /turf/open/floor/corsat{ @@ -57575,6 +58370,18 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"whp" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/barricade/metal{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "whs" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, @@ -58151,6 +58958,13 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"wtO" = ( +/obj/structure/barricade/deployable, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "wtT" = ( /obj/structure/cargo_container/grant/rightmid, /turf/open/floor/plating{ @@ -58801,6 +59615,16 @@ /area/lv522/indoors/c_block/cargo) "wFC" = ( /obj/structure/largecrate/random/secure, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) +"wFL" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) "wFP" = ( @@ -59143,6 +59967,15 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) +"wOq" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper C-Block - Garage Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/bridge) "wOu" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -59175,8 +60008,7 @@ /area/lv522/indoors/lone_buildings/outdoor_bot) "wPA" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Dormitories"; - welded = null + name = "\improper A-Block Shared Dorms Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -59318,7 +60150,9 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) "wSz" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block - Colony Operations Centre Airlock" + }, /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "LV522CIC_1"; @@ -59343,6 +60177,9 @@ icon_state = "N"; pixel_y = 1 }, +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null + }, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -59938,6 +60775,10 @@ }, /turf/open/floor/plating, /area/lv522/outdoors/colony_streets/north_east_street) +"xfD" = ( +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "xfS" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/transmitter/colony_net{ @@ -60052,6 +60893,14 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security/glass) +"xhz" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "xhB" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ @@ -60089,6 +60938,7 @@ /area/lv522/landing_zone_forecon/UD6_Typhoon) "xig" = ( /obj/structure/closet/crate, +/obj/item/storage/xeno_tag_case, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -60551,7 +61401,9 @@ /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) "xsi" = ( -/obj/structure/machinery/door/airlock/almayer/generic, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Garage Airlock" + }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -60603,12 +61455,9 @@ }, /area/lv522/indoors/a_block/admin) "xto" = ( -/obj/item/tool/shovel/etool, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/indoors/b_block/bridge) +/obj/item/storage/pouch/autoinjector/full, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/w_rockies) "xtO" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -60775,6 +61624,7 @@ pixel_y = 6 }, /obj/structure/largecrate/random, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) "xxJ" = ( @@ -60841,6 +61691,11 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/central_streets) +"xyU" = ( +/obj/structure/surface/table/almayer, +/obj/item/map/lv522_map, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "xzj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -61041,6 +61896,10 @@ "xDu" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/corpo/glass) +"xDz" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "xDC" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 1; @@ -61244,7 +62103,10 @@ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal/medium_stack, +/obj/item/stack/sheet/metal/small_stack, +/obj/item/ore/slag, +/obj/item/ore/slag, +/obj/item/ore/slag, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "xHr" = ( @@ -61532,7 +62394,8 @@ /area/lv522/landing_zone_forecon/UD6_Tornado) "xNw" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 + dir = 1; + name = "\improper A-Block - Colony Operations Centre Airlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -61720,6 +62583,13 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) +"xQZ" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/obj/effect/spawner/gibspawner/xeno, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "xRg" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -61807,7 +62677,9 @@ }, /area/lv522/indoors/a_block/dorms/glass) "xRI" = ( -/obj/structure/machinery/door/airlock/almayer/generic, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Radio Tower Airlock" + }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -62114,6 +62986,11 @@ "xXg" = ( /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) +"xXh" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "xXo" = ( /obj/structure/surface/table/almayer, /obj/structure/bed/chair{ @@ -62642,7 +63519,9 @@ }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ygJ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Dorms And Office Airlock" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -62827,6 +63706,12 @@ icon_state = "E"; pixel_x = 1 }, +/obj/structure/barricade/metal{ + dir = 1 + }, +/obj/structure/barricade/metal{ + dir = 4 + }, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -66505,7 +67390,7 @@ vhd sRA sRA sRA -rWS +rYp ien cpy cpy @@ -66731,8 +67616,8 @@ rFp vhC uiK uiK -sRA -rWS +gxe +xto ien ien ien @@ -66958,7 +67843,7 @@ tbl vhJ uiK sRA -sRA +odi ien ien jTJ @@ -67185,7 +68070,7 @@ uEX vhO hPM uiK -uiK +oow ien sON ezH @@ -67456,7 +68341,7 @@ pck hYf erS sau -xig +kSh ofS ylo ien @@ -67911,9 +68796,9 @@ isG vBM hYf wHi -vBM -yfu -ylo +jAA +loX +aId ien ien vXc @@ -68137,10 +69022,10 @@ bZd yfu yfu bZd -yfu -bZd -wHi -ylo +loX +rmm +gRl +uVS ien vXc vXc @@ -68363,11 +69248,11 @@ yfu bZd bZd yfu -yfu -bZd -bZd -yfu -ylo +cQv +gRl +gRl +xXh +qhk ien vXc vXc @@ -68591,10 +69476,10 @@ yfu bZd bZd bZd -yfu -bZd -yfu -ylo +nvA +gRl +cQv +loX ien ien vXc @@ -70164,7 +71049,7 @@ nLm nLm nLm eBA -jNk +qbL nLm nLm nLm @@ -70840,7 +71725,7 @@ clY sjY sjY oNQ -ltI +ygJ vJT uOs tUM @@ -70849,7 +71734,7 @@ uOs tUM uOs kcS -ltI +ygJ spo yiM yiM @@ -73431,10 +74316,10 @@ kEl peM jba bPJ -mJs +ayf +aKE wfP -wfP -jJF +cbb sLT bPJ cpy @@ -73659,10 +74544,10 @@ hTe jFl aQH mJs +ous wfP wfP -wfP -jJF +uKk bPJ bPJ cpy @@ -73887,10 +74772,10 @@ sHd bPJ eeb wfP +bgw wfP wfP -wfP -wfP +pSh bPJ bPJ cpy @@ -74026,7 +74911,7 @@ esa qvJ jDJ osU -doq +pxp enP dnM dnM @@ -74113,7 +74998,7 @@ bPJ bPJ bPJ bPJ -wfP +veA wfP wfP wfP @@ -74344,7 +75229,7 @@ qxf wfP wfP wfP -wfP +aKE sRM bPJ cpy @@ -74795,10 +75680,10 @@ cpy cpy bPJ bPJ +nkm wfP wfP -wfP -jJF +vwW wfP bPJ cpy @@ -75023,9 +75908,9 @@ cpy cpy bPJ bPJ -wfP -wfP -wfP +bQP +omv +lFM bPJ bPJ cpy @@ -75479,7 +76364,7 @@ cpy bPJ bPJ wfP -wfP +bgw bPJ bPJ cpy @@ -75707,7 +76592,7 @@ cpy bPJ wfP wfP -wfP +bgw bPJ cpy bMX @@ -75932,7 +76817,7 @@ cpy cpy cpy bPJ -jJF +gMT wfP fvn bPJ @@ -76613,7 +77498,7 @@ max osN bPJ oeN -bLA +byb wfP hiL bPJ @@ -76840,7 +77725,7 @@ max osN bPJ awm -wfP +tFC wfP wfP bPJ @@ -77066,8 +77951,8 @@ max max osN aQH -awm -wfP +gsn +tFC wfP bPJ bPJ @@ -77204,7 +78089,7 @@ qDR dnM sPk pxS -doq +pxp fqD oFr lOi @@ -77296,7 +78181,7 @@ bPJ cLB esx wfP -iGD +eLK bPJ cpy bMX @@ -77521,7 +78406,7 @@ pAj fnA bPJ bPJ -fCb +uEj jJF bPJ bPJ @@ -78203,7 +79088,7 @@ cpy cpy bPJ wfP -wfP +pSh sRM bPJ cpy @@ -78312,7 +79197,7 @@ xAO xAO xAO xyL -tvO +ivY ugV hNR xhL @@ -78543,7 +79428,7 @@ tvO ugV hNR ugV -sSn +cJg yjm nLm lfe @@ -78553,7 +79438,7 @@ nLm ahP wCC fjr -fjr +xfD fjr fjr bPH @@ -78655,7 +79540,7 @@ vDL wIr wIr bPJ -guh +mPV wfP wfP bPJ @@ -78771,11 +79656,11 @@ ugV hNR ugV ugV -sSn +eSM cHw cHw hhD -hhD +dhj hhD wCC ugV @@ -78875,15 +79760,15 @@ wIr vDL tog fTP -xto -gxe +xgH +oLa qzQ hhI vDL wIr wIr -guh -wfP +dSJ +pSh wfP bPJ cpy @@ -78997,7 +79882,7 @@ tvO ugV hNR ugV -ugV +nDo ugV fjr fjr @@ -79006,7 +79891,7 @@ fjr ugV ugV ugV -ugV +xQZ ugV ugV fjr @@ -79110,7 +79995,7 @@ hhI lBd wIr guh -wfP +acC wfP bPJ cpy @@ -79226,6 +80111,7 @@ spe hcX vwi vwi +gRS vwi vwi vwi @@ -79234,8 +80120,7 @@ vwi vwi vwi vwi -vwi -vwi +pqX nQx rvx fZy @@ -79337,8 +80222,8 @@ hhI hLx wIr hcG -wfP -wfP +lgR +aKE bPJ cpy cpy @@ -79448,25 +80333,25 @@ xAO xAO xtb tvO -ugV +nDo ugV hNR -xRK -emH -emH -emH -emH -emH -emH -emH -emH -emH +rJG +mKK +tWy +lae +uvJ +gwU +jeh +qdV +byD +sqr tNr ugV spe nQx fjr -fjr +xfD crH pQE pQE @@ -79563,9 +80448,9 @@ qzQ aPu jmv ueY -awm -wfP -wfP +tkC +rnX +acC bPJ cpy cpy @@ -79678,18 +80563,18 @@ tEJ fjr ugV hNR -crH +keA wSW +gvK +nMP +ovB +ikp cVR -cVR -cVR -cVR -cVR -cVR +ivs nMP eqb -tvO -ugV +joV +pqk ugV jXQ nQx @@ -79791,7 +80676,7 @@ aPu pfq wIr tXS -wfP +acC wfP bPJ cpy @@ -79905,20 +80790,20 @@ wCC fjr ugV hNR -crH +keA vCy +ryb +ghE +sJP urY urY -urY -rYp -urY -ryW ryW +fIr sUN -tvO -ugV +bKu +pqk ugV -fjr +ibS jXQ iKF sQL @@ -80017,7 +80902,7 @@ aPu mOJ wIr wIr -wfP +lgR wfP jJF bPJ @@ -80131,23 +81016,23 @@ fjr fjr fjr fjr -hNR -crH -vCy +fUQ +rBg +whp uye +naM uAa -uAa -uAa +fto uDF mQo -odi +urY dHx -tvO +wtO ugV fjr fjr fjr -fjr +ibS miz tRd xvW @@ -80356,22 +81241,22 @@ fjr fjr fjr cpy +bKf fjr -fjr -hNR -crH +nKZ +rBg iML -uye -urY -urY -urY -uye +kCQ +rjD +ryW +tlF +fIr ryb -oow -sUN -tvO +urY +dHx +csl ugV -fjr +xfD cpy fjr fjr @@ -80584,19 +81469,19 @@ fjr cpy cpy cpy -fjr -jDO +xDz +bAn crH yjD mIa -mIa -mIa -mIa +rSQ +iaD +rmk mlY cqL oQV ncs -tvO +vmM fjr fjr cpy @@ -80812,18 +81697,18 @@ cpy cpy cpy cpy -jDO +dBQ sSn +xhz hhD +xhz +nHM +oMO hhD hhD -hhD -hhD -hhD -hhD -hhD -hhD -wCC +lQA +fRw +fUc fjr cpy cpy @@ -81039,19 +81924,19 @@ cpy cpy cpy fjr -jDO -ugV -ugV +lRi ugV ugV ugV +xyU +tSF ugV ugV +pqk +tIQ ugV ugV -ugV -ugV -fjr +gUT cpy cpy cpy @@ -81270,16 +82155,16 @@ hNR ugV xRK emH +uQa +gLy +aAX emH -emH -emH -emH -emH -tNr -fjr +uvJ +fvc fjr fjr fjr +prs cpy fjr fjr @@ -81502,7 +82387,7 @@ sjy sjy sjy sjy -ahP +evQ tNr fjr fjr @@ -81945,10 +82830,10 @@ xXR emH emH tNr -jDO +dBQ fjr xRK -ahP +uuy sjy uxn ckT @@ -82401,7 +83286,7 @@ wrC tvO jDO xRK -ahP +qxe sjy sjy sjy @@ -82968,7 +83853,7 @@ vpe wHz jas nQu -nQu +bWv jas cpy cpy @@ -83875,7 +84760,7 @@ hBp eso vpe jas -nQu +bWv nQu jas cpy @@ -84102,7 +84987,7 @@ cwe vpe oCs jas -nQu +bWv nQu jas cpy @@ -86140,7 +87025,7 @@ bxr iqV iqV xHj -xHj +gvU boQ vpe tuK @@ -88778,7 +89663,7 @@ sjy kqb kqb mUS -egP +rUJ kqb kqb pGl @@ -90231,7 +91116,7 @@ phq phq qYq jas -nQu +bWv aEF jas cpy @@ -90458,7 +91343,7 @@ eJd ptU jas jas -nQu +bWv aEF jas cpy @@ -90905,8 +91790,8 @@ qHr vpe vxa ppU -nQu -nQu +bWv +bWv nQu nQu nQu @@ -91133,12 +92018,12 @@ vpe ahZ jas jas -dLC +mwn xxz pYO pYO -pYO -pYO +afa +afa nUF jas jas @@ -92042,7 +92927,7 @@ ctE ctE ctE jas -aEF +wFL nQu hbO jas @@ -92269,7 +93154,7 @@ ctE ctE ctE jas -aEF +wFL nQu fZA jas @@ -96799,7 +97684,7 @@ wQa dkX rBd nPb -fdT +iFe rVR hIf rqn @@ -96991,7 +97876,7 @@ wrY xvl xvl lot -aTR +wOq xvl xvl xWO @@ -98539,7 +99424,7 @@ gdO gdO psC ayn -tBT +xNw psC gdO tTK @@ -98572,7 +99457,7 @@ nKK fzf sHY wao -whs +mEn tID uaI wqA @@ -100128,7 +101013,7 @@ gdO gdO gdO ayn -tBT +xNw gdO gdO gdO @@ -102839,7 +103724,7 @@ uDM tth eTw lVs -qUL +qBH lAn krH nTp @@ -103063,10 +103948,10 @@ tCR fTm uKQ uKQ -uKQ +vuF fbY qUL -qUL +tRu lAn krH nTp @@ -103293,7 +104178,7 @@ vjs tIF rAt gOZ -iRl +cJc lAn krH nTp From 02fde0b56ae43f54527d7c1bc797bf00e475943f Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 19 Sep 2023 03:06:42 +0100 Subject: [PATCH 13/15] Automatic changelog for PR #4386 [ci skip] --- html/changelogs/AutoChangeLog-pr-4386.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4386.yml diff --git a/html/changelogs/AutoChangeLog-pr-4386.yml b/html/changelogs/AutoChangeLog-pr-4386.yml new file mode 100644 index 000000000000..4aa1dce8ceb2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4386.yml @@ -0,0 +1,5 @@ +author: "SpartanBobby, GSDPathe" +delete-after: True +changes: + - maptweak: "Changes to LV522 loot table surrounding metal spawns" + - maptweak: "Redectorates areas around LV522 that were underwhelming before" \ No newline at end of file From 2e994b53d140ab1342f5e14c35d20834fa26b38d Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Tue, 19 Sep 2023 03:48:58 +0200 Subject: [PATCH 14/15] balance and fix to reduce the potentiel of requisiton players to get Carpal tunnel syndrome (#4303) # About the pull request i made req have double what a single squad prep as in term of standard gun and ammo. # Explain why it's good for the game reduce the number of clicks and Carpal tunnel syndrome risk # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: balance: made it so that req as double what a standard vendor as in ammo and guns. /:cl: --------- Co-authored-by: Julien --- .../vending/vendor_types/requisitions.dm | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index b979fe4a03a9..9f870191287b 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -19,16 +19,16 @@ /obj/structure/machinery/cm_vending/sorted/cargo_guns/populate_product_list(scale) listed_products = list( list("PRIMARY FIREARMS", -1, null, null), - list("M37A2 Pump Shotgun", round(scale * 10), /obj/item/weapon/gun/shotgun/pump, VENDOR_ITEM_REGULAR), - list("M39 Submachinegun", round(scale * 15), /obj/item/weapon/gun/smg/m39, VENDOR_ITEM_REGULAR), - list("M41A Pulse Rifle MK2", round(scale * 20), /obj/item/weapon/gun/rifle/m41a, VENDOR_ITEM_REGULAR), + list("M37A2 Pump Shotgun", round(scale * 30), /obj/item/weapon/gun/shotgun/pump, VENDOR_ITEM_REGULAR), + list("M39 Submachinegun", round(scale * 60), /obj/item/weapon/gun/smg/m39, VENDOR_ITEM_REGULAR), + list("M41A Pulse Rifle MK2", round(scale * 60), /obj/item/weapon/gun/rifle/m41a, VENDOR_ITEM_REGULAR), list("M4RA Battle Rifle", round(scale * 20), /obj/item/weapon/gun/rifle/m4ra, VENDOR_ITEM_REGULAR), list("SIDEARMS", -1, null, null), - list("88 Mod 4 Combat Pistol", round(scale * 15), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR), - list("M44 Combat Revolver", round(scale * 10), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR), - list("M4A3 Service Pistol", round(scale * 20), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR), - list("M82F Flare Gun", round(scale * 8), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), + list("88 Mod 4 Combat Pistol", round(scale * 50), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR), + list("M44 Combat Revolver", round(scale * 50), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR), + list("M4A3 Service Pistol", round(scale * 50), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR), + list("M82F Flare Gun", round(scale * 20), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), list("RESTRICTED FIREARMS", -1, null, null), list("VP78 Pistol", round(scale * 4), /obj/item/storage/box/guncase/vp78, VENDOR_ITEM_REGULAR), @@ -220,17 +220,17 @@ /obj/structure/machinery/cm_vending/sorted/cargo_ammo/populate_product_list(scale) listed_products = list( list("REGULAR AMMUNITION", -1, null, null), - list("Box Of Buckshot Shells", round(scale * 2), /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR), - list("Box Of Flechette Shells", round(scale * 2), /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR), - list("Box Of Shotgun Slugs", round(scale * 2), /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR), - list("M4RA Magazine (10x24mm)", round(scale * 20.8), /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR), - list("M41A MK2 Magazine (10x24mm)", round(scale * 18), /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR), - list("M39 HV Magazine (10x20mm)", round(scale * 17.1), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR), - list("M44 Speed Loader (.44)", round(scale * 18.1), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), - list("M4A3 Magazine (9mm)", round(scale * 20.5), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), + list("Box Of Buckshot Shells", round(scale * 20), /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR), + list("Box Of Flechette Shells", round(scale * 8), /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR), + list("Box Of Shotgun Slugs", round(scale * 20), /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR), + list("M4RA Magazine (10x24mm)", round(scale * 30), /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR), + list("M41A MK2 Magazine (10x24mm)", round(scale * 50), /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR), + list("M39 HV Magazine (10x20mm)", round(scale * 50), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR), + list("M44 Speed Loader (.44)", round(scale * 40), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), + list("M4A3 Magazine (9mm)", round(scale * 50), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), list("ARMOR-PIERCING AMMUNITION", -1, null, null), - list("88 Mod 4 AP Magazine (9mm)", round(scale * 16.7), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), + list("88 Mod 4 AP Magazine (9mm)", round(scale * 50), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), list("M4RA AP Magazine (10x24mm)", round(scale * 15.7), /obj/item/ammo_magazine/rifle/m4ra/ap, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", round(scale * 11.9), /obj/item/ammo_magazine/smg/m39/ap, VENDOR_ITEM_REGULAR), list("M41A MK2 AP Magazine (10x24mm)", round(scale * 10.5), /obj/item/ammo_magazine/rifle/ap, VENDOR_ITEM_REGULAR), @@ -259,9 +259,9 @@ list("M2C Box Magazine", round(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR), list("SHOTGUN SHELL BOXES", -1, null, null), - list("Shotgun Shell Box (Buckshot x 100)", round(scale * 1), /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR), - list("Shotgun Shell Box (Flechette x 100)", round(scale * 1), /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR), - list("Shotgun Shell Box (Slugs x 100)", round(scale * 1), /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Box (Buckshot x 100)", round(scale * 2), /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Box (Flechette x 100)", round(scale * 2), /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Box (Slugs x 100)", round(scale * 2), /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR), ) /obj/structure/machinery/cm_vending/sorted/cargo_ammo/stock(obj/item/item_to_stock, mob/user) From 8294dbdeb7bfdb2a3cd828665af99e931746ed52 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 19 Sep 2023 03:20:50 +0100 Subject: [PATCH 15/15] Automatic changelog for PR #4303 [ci skip] --- html/changelogs/AutoChangeLog-pr-4303.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4303.yml diff --git a/html/changelogs/AutoChangeLog-pr-4303.yml b/html/changelogs/AutoChangeLog-pr-4303.yml new file mode 100644 index 000000000000..74a783813fcd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4303.yml @@ -0,0 +1,4 @@ +author: "Huffie56" +delete-after: True +changes: + - balance: "made it so that req as double what a standard vendor as in ammo and guns." \ No newline at end of file