diff --git a/maps/antag_spawn/ert/ert_base.dmm b/maps/antag_spawn/ert/ert_base.dmm index 7a0a93642a330..1d113fd84d5f5 100644 --- a/maps/antag_spawn/ert/ert_base.dmm +++ b/maps/antag_spawn/ert/ert_base.dmm @@ -8,13 +8,6 @@ "ad" = ( /turf/unsimulated/wall, /area/map_template/rescue_base/base) -"ae" = ( -/obj/machinery/computer/teleporter, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) "af" = ( /obj/machinery/tele_projector, /turf/unsimulated/floor{ @@ -30,18 +23,21 @@ }, /area/map_template/rescue_base/base) "ah" = ( -/turf/unsimulated/wall{ - desc = "A secure airlock. Doesn't look like you can get through easily."; - icon = 'icons/obj/doors/centcomm/door.dmi'; - icon_state = "closed"; - name = "Facility Access" +/obj/wallframe_spawn/reinforced, +/obj/paint/sfv_arbiter, +/turf/unsimulated/floor{ + icon_state = "plating"; + name = "plating" }, /area/map_template/rescue_base/base) "ai" = ( -/obj/structure/table/steel_reinforced, -/obj/item/clothing/shoes/magboots/rig/combat, +/obj/structure/table/rack, +/obj/item/aicard, +/obj/item/pinpointer/advpinpointer, +/obj/prefab/hand_teleporter, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 1; + icon_state = "vault" }, /area/map_template/rescue_base/base) "aj" = ( @@ -81,12 +77,15 @@ }, /area/map_template/rescue_base/base) "ap" = ( -/obj/machinery/door/airlock/centcom{ - name = "Emergency Insertion" +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 }, +/obj/item/folder/red, +/obj/item/pen, /turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) "aq" = ( @@ -128,12 +127,16 @@ }, /area/map_template/rescue_base/base) "aw" = ( -/obj/item/soap, -/obj/structure/hygiene/shower{ - pixel_y = 32 +/obj/structure/window/reinforced/crescent, +/obj/structure/table/rack, +/obj/structure/window/reinforced/crescent{ + dir = 4 }, +/obj/item/rig_module/chem_dispenser/combat, +/obj/item/rig_module/vision/sechud, /turf/unsimulated/floor{ - icon_state = "freezerfloor" + dir = 1; + icon_state = "vault" }, /area/map_template/rescue_base/base) "ax" = ( @@ -166,63 +169,39 @@ }, /area/map_template/rescue_base/base) "aC" = ( -/obj/item/aiModule/reset, -/obj/item/aiModule/freeformcore, -/obj/item/aiModule/protectStation, -/obj/item/aiModule/quarantine, -/obj/item/aiModule/paladin, -/obj/item/aiModule/robocop, -/obj/item/aiModule/safeguard, -/obj/structure/table/rack, -/obj/item/aiModule/solgov, -/obj/item/aiModule/solgov_aggressive, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" +/obj/item/inflatable_dispenser, +/obj/item/inflatable_dispenser, +/obj/item/inflatable_dispenser, +/obj/item/stack/material/steel/fifty, +/obj/item/stack/material/plasteel/fifty, +/obj/item/stack/material/glass/reinforced/fifty, +/obj/item/stack/material/rods/fifty, +/obj/item/storage/toolbox/mechanical, +/obj/structure/closet{ + name = "tools" }, -/area/map_template/rescue_base/base) -"aD" = ( -/obj/structure/table/rack, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/obj/item/plastique, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" +/obj/item/stack/cable_coil, +/obj/floor_decal/techfloor{ + dir = 4 }, -/area/map_template/rescue_base/base) -"aE" = ( -/obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/device/radio/intercom/specops{ - pixel_y = 22 +/obj/item/device/binoculars, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"aD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/map_template/rescue_base/base) -"aF" = ( -/obj/structure/table/rack, -/obj/item/storage/box/ammo/stunshells, -/obj/item/storage/box/ammo/stunshells, -/obj/item/storage/box/ammo/beanbags, -/obj/item/storage/box/ammo/beanbags, -/obj/item/storage/box/ammo/shotgunammo, -/obj/item/storage/box/ammo/shotgunammo, -/obj/item/storage/box/ammo/shotgunshells, -/obj/item/storage/box/ammo/shotgunshells, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" +/obj/floor_decal/techfloor{ + dir = 9 }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"aE" = ( +/obj/paint/sfv_arbiter, +/turf/simulated/wall/r_wall, /area/map_template/rescue_base/base) "aG" = ( /obj/structure/table/rack, @@ -265,9 +244,6 @@ /turf/simulated/floor/wood/ebony, /area/map_template/rescue_base/base) "aK" = ( -/obj/structure/mopbucket, -/obj/item/mop, -/obj/floor_decal/corner/blue/diagonal, /obj/structure/hygiene/sink/kitchen{ pixel_y = 21 }, @@ -276,11 +252,12 @@ }, /area/map_template/rescue_base/base) "aL" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/floor_decal/corner/blue/diagonal, /obj/item/device/radio/intercom/specops{ pixel_y = 22 }, +/obj/structure/mopbucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -288,37 +265,48 @@ "aM" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/bar_soft/full, -/obj/floor_decal/corner/blue/diagonal, /obj/item/device/radio/intercom/specops{ pixel_y = 22 }, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "aN" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/bar_alc/full, -/obj/floor_decal/corner/blue/diagonal, /obj/machinery/vending/boozeomat{ pixel_y = 32 }, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "aO" = ( -/obj/structure/closet/fridge, -/obj/floor_decal/corner/blue/diagonal, -/turf/unsimulated/floor{ - icon_state = "dark" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/map_template/rescue_base/base) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/centcom{ + name = "Flight Deck" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/map_template/rescue_base/start) "aP" = ( -/obj/floor_decal/corner/blue/diagonal, -/obj/structure/closet/fridge/meat, +/obj/structure/table/rack, +/obj/item/clothing/head/beret/sec/corporate, +/obj/item/clothing/head/beret/sec/corporate, +/obj/item/clothing/head/beret/sec/corporate, +/obj/item/clothing/head/beret/sec/corporate, +/obj/item/clothing/head/beret/sec/corporate, +/obj/item/clothing/head/beret/sec/corporate, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 1; + icon_state = "vault" }, /area/map_template/rescue_base/base) "aQ" = ( @@ -330,9 +318,14 @@ }, /area/map_template/rescue_base/base) "aR" = ( -/obj/item/storage/mirror, -/turf/unsimulated/wall, -/area/map_template/rescue_base/base) +/obj/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/computer/modular/preset/full/ert{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) "aS" = ( /obj/machinery/door/airlock/centcom{ name = "Showers" @@ -357,29 +350,25 @@ pixel_y = 22 }, /turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) "aV" = ( -/obj/structure/table/rack, -/obj/item/stock_parts/circuitboard/borgupload, -/obj/item/stock_parts/circuitboard/aiupload{ - pixel_x = -3; - pixel_y = -3 - }, +/obj/structure/bed/padded, +/obj/item/bedsheet/hos, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "aW" = ( -/obj/structure/table/rack, -/obj/item/gun/projectile/automatic/sec_smg, -/obj/item/gun/projectile/automatic/sec_smg, -/obj/item/gun/projectile/automatic/sec_smg, +/obj/structure/table/steel, +/obj/item/clothing/accessory/medal/solgov/mil/service_cross, +/obj/item/device/radio/intercom/specops{ + pixel_y = 22 + }, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) @@ -394,14 +383,7 @@ "aY" = ( /turf/simulated/floor/wood/bamboo, /area/map_template/rescue_base/base) -"aZ" = ( -/obj/floor_decal/corner/blue/diagonal, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/map_template/rescue_base/base) "ba" = ( -/obj/floor_decal/corner/blue/diagonal, /obj/machinery/door/airlock/centcom{ name = "Storage" }, @@ -422,6 +404,9 @@ dir = 1; pixel_y = 16 }, +/obj/item/storage/mirror{ + pixel_y = 32 + }, /turf/unsimulated/floor{ icon_state = "freezerfloor" }, @@ -455,30 +440,19 @@ /area/map_template/rescue_base/base) "bf" = ( /obj/structure/table/rack, -/obj/item/ammo_magazine/smg_top/rubber, -/obj/item/ammo_magazine/smg_top/rubber, -/obj/item/ammo_magazine/smg_top/rubber, -/obj/item/ammo_magazine/smg_top/rubber, -/obj/item/ammo_magazine/smg_top/rubber, -/obj/item/ammo_magazine/smg_top/rubber, -/obj/item/ammo_magazine/smg_top/rubber, -/obj/item/ammo_magazine/smg_top/rubber, -/obj/item/ammo_magazine/smg_top/rubber, +/obj/item/storage/box/ammo/smg, +/obj/item/storage/box/ammo/smg, +/obj/item/storage/box/ammo/smg/rubber, +/obj/item/storage/box/ammo/smg/rubber, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"bg" = ( -/obj/wingrille_spawn/reinforced/crescent, -/turf/unsimulated/floor{ - icon_state = "plating"; - name = "plating" - }, -/area/map_template/rescue_base/base) "bh" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/handcuffs, +/obj/structure/bed/chair/padded/red{ + dir = 1 + }, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -514,10 +488,11 @@ /turf/simulated/floor/wood/yew, /area/map_template/rescue_base/base) "bm" = ( -/obj/machinery/vending/dinnerware, -/obj/floor_decal/corner/blue/diagonal, +/obj/structure/hygiene/shower{ + dir = 8 + }, /turf/unsimulated/floor{ - icon_state = "dark" + icon_state = "freezerfloor" }, /area/map_template/rescue_base/base) "bo" = ( @@ -539,23 +514,6 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"bp" = ( -/obj/structure/table/rack, -/obj/item/ammo_magazine/smg_top, -/obj/item/ammo_magazine/smg_top, -/obj/item/ammo_magazine/smg_top, -/obj/item/ammo_magazine/smg_top, -/obj/item/ammo_magazine/smg_top, -/obj/item/ammo_magazine/smg_top, -/obj/item/ammo_magazine/smg_top, -/obj/item/ammo_magazine/smg_top, -/obj/item/ammo_magazine/smg_top, -/obj/item/ammo_magazine/smg_top, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) "bq" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -578,80 +536,94 @@ }, /area/map_template/rescue_base/base) "bt" = ( -/obj/machinery/door/airlock/centcom{ - name = "Cell 2" - }, +/obj/structure/table/rack, +/obj/item/storage/secure/briefcase, +/obj/item/device/megaphone, +/obj/item/device/taperecorder, +/obj/item/clothing/head/beret/centcom/captain, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 1; + icon_state = "vault" }, /area/map_template/rescue_base/base) "bu" = ( /obj/structure/table/rack, -/obj/item/device/lightreplacer, -/obj/item/device/lightreplacer, -/obj/floor_decal/corner/blue/diagonal, +/obj/item/clothing/shoes/galoshes, +/obj/item/clothing/shoes/galoshes, +/obj/item/clothing/glasses/hud/janitor, +/obj/item/clothing/glasses/hud/janitor, +/obj/item/clothing/suit/bio_suit/janitor, +/obj/item/clothing/suit/bio_suit/janitor, +/obj/item/clothing/head/bio_hood/janitor, +/obj/item/clothing/head/bio_hood/janitor, +/obj/item/storage/belt/janitor, +/obj/item/storage/belt/janitor, +/obj/item/clothing/accessory/solgov/specialty/janitor, +/obj/item/clothing/accessory/solgov/specialty/janitor, +/obj/item/clothing/head/soft/purple, +/obj/item/clothing/head/soft/purple, /turf/unsimulated/floor{ icon_state = "dark" }, /area/map_template/rescue_base/base) "bv" = ( /obj/structure/table/rack, -/obj/item/clothing/shoes/galoshes, -/obj/item/clothing/head/bio_hood/janitor, -/obj/item/clothing/suit/bio_suit/janitor, -/obj/item/clothing/glasses/science, -/obj/item/clothing/shoes/galoshes, -/obj/item/clothing/head/bio_hood/janitor, -/obj/item/clothing/suit/bio_suit/janitor, -/obj/item/clothing/glasses/science, -/obj/item/reagent_containers/spray/plantbgone, -/obj/item/reagent_containers/spray/plantbgone, -/obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/mixed, +/obj/item/device/lightreplacer, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, -/obj/floor_decal/corner/blue/diagonal, +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/unsimulated/floor{ icon_state = "dark" }, /area/map_template/rescue_base/base) "bw" = ( /obj/structure/table/reinforced, -/obj/floor_decal/corner/blue/diagonal, /obj/machinery/microwave, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "bx" = ( -/obj/structure/table/reinforced, -/obj/floor_decal/corner/blue/diagonal, -/obj/item/reagent_containers/food/condiment/small/saltshaker{ - pixel_x = -3 - }, -/obj/item/reagent_containers/food/condiment/small/peppermill{ - pixel_x = 3 - }, -/turf/unsimulated/floor{ - icon_state = "dark" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/table/rack, +/obj/item/device/flashlight/maglight, +/obj/item/device/flashlight/maglight, +/obj/item/device/flashlight/maglight, +/obj/item/device/flashlight/maglight, +/obj/item/device/radio, +/obj/item/device/radio, +/obj/item/device/radio, +/obj/item/device/radio, +/obj/item/crowbar/prybar, +/obj/item/crowbar/prybar, +/obj/item/crowbar/prybar, +/obj/item/crowbar/prybar, +/obj/floor_decal/techfloor{ + dir = 4 }, -/area/map_template/rescue_base/base) +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) "by" = ( /obj/structure/table/reinforced, -/obj/floor_decal/corner/blue/diagonal, /obj/random/donkpocket_box, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "bz" = ( -/obj/floor_decal/corner/blue/diagonal, /obj/item/storage/box/donkpocket_premium, -/obj/structure/closet/kitchen, /obj/item/reagent_containers/food/condiment/enzyme, +/obj/structure/table/reinforced, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "bA" = ( @@ -674,6 +646,7 @@ /obj/structure/table/rack, /obj/item/gun/projectile/automatic/bullpup_rifle, /obj/item/gun/projectile/automatic/bullpup_rifle, +/obj/item/gun/projectile/automatic/bullpup_rifle, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -692,27 +665,10 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"bF" = ( -/obj/structure/table/rack, -/obj/item/storage/box/smokes, -/obj/item/storage/box/smokes, -/obj/item/storage/box/flashbangs, +"bH" = ( +/obj/item/stool, /turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"bG" = ( -/obj/structure/table/reinforced, -/obj/item/device/camera, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/map_template/rescue_base/base) -"bH" = ( -/obj/item/stool, -/turf/unsimulated/floor{ - icon_state = "dark" + icon_state = "dark" }, /area/map_template/rescue_base/base) "bI" = ( @@ -739,12 +695,9 @@ /area/map_template/rescue_base/base) "bL" = ( /obj/structure/table/rack, -/obj/item/ammo_magazine/mil_rifle/heavy, -/obj/item/ammo_magazine/mil_rifle/heavy, -/obj/item/ammo_magazine/mil_rifle/heavy, -/obj/item/ammo_magazine/mil_rifle/heavy, -/obj/item/ammo_magazine/mil_rifle/heavy, -/obj/item/ammo_magazine/mil_rifle/heavy, +/obj/item/storage/box/ammo/heavy_bullpup, +/obj/item/storage/box/ammo/heavy_bullpup, +/obj/item/storage/box/ammo/heavy_bullpup, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -752,7 +705,11 @@ /area/map_template/rescue_base/base) "bM" = ( /obj/structure/table/rack, +/obj/item/storage/box/emps, /obj/item/gun/launcher/grenade, +/obj/item/grenade/frag/shell, +/obj/item/grenade/frag/shell, +/obj/item/grenade/frag/shell, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -760,10 +717,11 @@ /area/map_template/rescue_base/base) "bN" = ( /obj/structure/table/rack, +/obj/item/storage/box/smokes, +/obj/item/storage/box/smokes, +/obj/item/storage/box/flashbangs, /obj/item/storage/box/teargas, -/obj/item/storage/box/teargas, -/obj/item/storage/box/emps, -/obj/item/storage/box/emps, +/obj/item/storage/box/frags, /obj/item/storage/box/frags, /turf/unsimulated/floor{ dir = 1; @@ -771,40 +729,37 @@ }, /area/map_template/rescue_base/base) "bO" = ( -/obj/structure/closet{ - name = "emergency response team wardrobe" - }, -/obj/item/clothing/accessory/solgov/fleet_patch/fifth, -/obj/item/clothing/head/solgov/utility/fleet, -/obj/item/clothing/accessory/badge/solgov/tags, +/obj/structure/bed/padded, +/obj/item/bedsheet/hop, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "bP" = ( -/obj/structure/bed/padded, -/obj/item/bedsheet/captain, +/obj/structure/closet{ + name = "emergency response team wardrobe" + }, +/obj/item/storage/backpack/ert/engineer, +/obj/item/clothing/accessory/solgov/department/engineering/fleet, +/obj/item/clothing/accessory/solgov/fleet_patch/fifth, +/obj/item/clothing/accessory/badge/solgov/tags, +/obj/item/clothing/head/solgov/utility/fleet, +/obj/item/clothing/glasses/ballistic/engi, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "bQ" = ( -/obj/structure/bed/padded, -/obj/item/bedsheet/captain, -/obj/item/device/radio/intercom/specops{ - pixel_y = 22 - }, +/obj/machinery/acting/changer, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) "bR" = ( -/obj/machinery/vending/coffee{ - prices = list() - }, +/obj/structure/filingcabinet/filingcabinet, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -832,21 +787,12 @@ }, /area/map_template/rescue_base/base) "bU" = ( -/obj/machinery/acting/changer, +/obj/machinery/pipedispenser/disposal, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"bV" = ( -/obj/landmark{ - name = "Response Team" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) "bW" = ( /obj/machinery/door/airlock/centcom{ name = "Squad Bay" @@ -856,15 +802,19 @@ }, /area/map_template/rescue_base/base) "bX" = ( -/obj/machinery/door/airlock/centcom{ - name = "Cell 1" +/obj/machinery/button/blast_door{ + id_tag = "rescuegarage"; + name = "Garage"; + pixel_x = -24; + pixel_y = -4 }, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "bY" = ( -/obj/structure/undies_wardrobe, +/obj/machinery/portable_atmospherics/powered/scrubber/huge, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -881,10 +831,16 @@ }, /area/map_template/rescue_base/base) "ca" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_y = 4 - }, +/obj/structure/table/rack, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/reagent_containers/hypospray/vial, +/obj/item/reagent_containers/hypospray/vial, +/obj/item/reagent_containers/hypospray/vial, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -895,171 +851,80 @@ name = "Ready Room" }, /turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) "cc" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/unsimulated/floor{ + icon_state = "asteroid" + }, +/area/map_template/rescue_base/base) +"cd" = ( /obj/structure/table/rack, -/obj/item/storage/box/handcuffs, -/obj/item/storage/box/handcuffs, /obj/item/storage/box/teargas, /obj/item/storage/box/teargas, /obj/item/storage/box/flashbangs, /obj/item/storage/box/flashbangs, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/melee/baton/loaded, -/obj/item/melee/baton/loaded, -/obj/item/reagent_containers/spray/pepper, -/obj/item/reagent_containers/spray/pepper, -/obj/item/melee/telebaton, -/obj/item/melee/telebaton, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, /obj/item/taperoll/police, /obj/item/taperoll/police, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"cd" = ( -/obj/structure/table/rack, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/tacgoggles, -/obj/item/clothing/glasses/tacgoggles, +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "ce" = ( -/obj/structure/table/rack, -/obj/item/storage/backpack/ert/security, -/obj/item/storage/backpack/ert/security, -/obj/item/storage/belt/holster/security/tactical, -/obj/item/storage/belt/holster/security/tactical, +/obj/structure/table/reinforced, +/obj/item/device/camera, +/obj/item/storage/box/handcuffs, /turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) "cf" = ( -/obj/structure/table/rack, -/obj/item/gun/energy/gun/nuclear, -/obj/item/gun/energy/gun/nuclear, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"cg" = ( -/obj/structure/table/rack, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, -/obj/item/clothing/suit/armor/pcarrier/medium, -/obj/item/clothing/suit/armor/pcarrier/medium, -/obj/item/clothing/head/helmet, -/obj/item/clothing/head/helmet, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" +/obj/machinery/vending/coffee{ + prices = list() }, -/area/map_template/rescue_base/base) -"ch" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/armor/pcarrier/medium, -/obj/item/clothing/suit/armor/pcarrier/medium, -/obj/item/clothing/head/helmet, -/obj/item/clothing/head/helmet, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) -"ci" = ( +"cg" = ( +/obj/item/swapper/power_drill, +/obj/item/swapper/power_drill, +/obj/item/swapper/jaws_of_life, +/obj/item/swapper/jaws_of_life, /obj/structure/table/rack, -/obj/item/gun/energy/gun, -/obj/item/gun/energy/gun, +/obj/item/weldingtool/electric, +/obj/item/weldingtool/electric, +/obj/item/clothing/glasses/welding/superior, +/obj/item/clothing/glasses/welding/superior, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "cj" = ( -/obj/structure/table/rack, -/obj/item/storage/backpack/ert/medical, -/obj/item/storage/backpack/ert/medical, -/obj/item/storage/belt/medical, -/obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/emt, -/obj/item/storage/belt/medical/emt, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"ck" = ( -/obj/structure/table/rack, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/storage/box/latexgloves, -/obj/item/storage/box/nitrilegloves, -/obj/item/storage/box/masks, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"cl" = ( -/obj/structure/table/rack, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/melee/baton/loaded, -/obj/item/melee/baton/loaded, -/obj/item/storage/box/syringes, -/obj/item/storage/box/syringes, -/obj/item/storage/box/autoinjectors, -/obj/item/storage/box/autoinjectors, -/obj/item/storage/box/beakers, -/obj/item/storage/box/beakers, -/obj/item/storage/box/pillbottles, -/obj/item/storage/box/pillbottles, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/syringegun, -/obj/item/storage/box/syringegun, -/obj/item/storage/box/syringegun, -/obj/item/storage/box/syringegun, -/obj/item/gun/launcher/syringe/rapid, -/obj/item/gun/launcher/syringe/rapid, +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/ivbag/nanoblood, +/obj/item/reagent_containers/ivbag/nanoblood, +/obj/item/reagent_containers/ivbag/nanoblood, +/obj/item/reagent_containers/ivbag/nanoblood, /turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) "cm" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/hypospray, -/obj/item/reagent_containers/hypospray, -/obj/item/reagent_containers/hypospray, -/obj/item/reagent_containers/hypospray, -/obj/item/reagent_containers/hypospray, -/obj/item/reagent_containers/hypospray, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/bottle/inaprovaline, -/obj/item/reagent_containers/glass/bottle/inaprovaline, -/obj/item/reagent_containers/glass/bottle/inaprovaline, +/obj/structure/table/rack, +/obj/item/clothing/accessory/stethoscope, +/obj/item/clothing/accessory/stethoscope, +/obj/item/tape/medical, +/obj/item/tape/medical, +/obj/item/device/flashlight/pen, +/obj/item/device/flashlight/pen, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -1074,83 +939,68 @@ /obj/structure/window/reinforced/crescent{ dir = 8 }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"co" = ( -/obj/structure/table/rack, /obj/item/rig/ert/medical, -/obj/structure/window/reinforced/crescent{ - dir = 1 - }, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"cp" = ( +"co" = ( /obj/structure/table/rack, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/chem_dispenser/injector, -/obj/item/rig_module/chem_dispenser/injector, -/obj/item/rig_module/device/healthscanner, -/obj/item/rig_module/device/healthscanner, -/obj/item/rig_module/vision/medhud, -/obj/item/rig_module/vision/medhud, /obj/structure/window/reinforced/crescent{ dir = 1 }, /obj/structure/window/reinforced/crescent{ dir = 4 }, +/obj/item/rig_module/device/defib, +/obj/item/rig_module/device/defib, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"cq" = ( +"cp" = ( /obj/structure/table/rack, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, /obj/item/device/radio/intercom/specops{ pixel_y = 22 }, +/obj/item/storage/toolbox/mechanical, +/obj/item/cell/super, +/obj/item/cell/super, +/obj/item/cell/super, +/obj/item/cell/super, +/obj/item/cell/super, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"cr" = ( +"cq" = ( /obj/structure/table/rack, +/obj/item/rig_module/device/flash, +/obj/item/rig_module/device/flash, +/obj/item/rig_module/device/flash, +/obj/item/rig_module/device/flash, +/obj/item/rig_module/device/flash, +/obj/item/rig_module/device/flash, +/obj/item/rig_module/vision/nvg, +/obj/item/rig_module/vision/nvg, +/obj/item/rig_module/vision/nvg, +/obj/item/rig_module/vision/nvg, +/obj/item/rig_module/vision/nvg, +/obj/item/rig_module/vision/nvg, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"cs" = ( +"cr" = ( /obj/structure/table/rack, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/mounted/energy/egun, -/obj/item/rig_module/mounted/energy/egun, /obj/item/rig_module/chem_dispenser/combat, /obj/item/rig_module/chem_dispenser/combat, -/obj/item/rig_module/grenade_launcher, /obj/item/rig_module/vision/sechud, /obj/item/rig_module/vision/sechud, -/obj/item/rig_module/device/flash, -/obj/item/rig_module/device/flash, /obj/structure/window/reinforced/crescent{ dir = 1 }, @@ -1162,18 +1012,7 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"ct" = ( -/obj/structure/table/rack, -/obj/item/rig/ert/security, -/obj/structure/window/reinforced/crescent{ - dir = 1 - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"cu" = ( +"cs" = ( /obj/structure/table/rack, /obj/item/rig/ert/security, /obj/structure/window/reinforced/crescent{ @@ -1182,17 +1021,44 @@ /obj/structure/window/reinforced/crescent{ dir = 4 }, +/obj/item/rig/ert/security, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) +"ct" = ( +/obj/machinery/computer/modular/preset/medical{ + dir = 1 + }, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"cu" = ( +/obj/structure/closet/medical_wall{ + name = "blood storage"; + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/item/storage/box/glucose, +/obj/item/reagent_containers/ivbag/nanoblood, +/obj/item/reagent_containers/ivbag/nanoblood, +/obj/item/reagent_containers/ivbag/nanoblood, +/turf/simulated/floor/tiled/white, +/area/map_template/rescue_base/start) "cv" = ( -/obj/machinery/hologram/holopad/longrange, -/turf/unsimulated/floor{ - icon_state = "dark" +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list("ACCESS_CENT_SPECOPS") }, -/area/map_template/rescue_base/base) +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) "cw" = ( /obj/structure/table/rack, /obj/item/stack/material/glass{ @@ -1201,32 +1067,10 @@ /obj/item/stack/material/glass{ amount = 50 }, -/obj/item/stack/material/glass{ - amount = 50 - }, -/obj/item/stack/material/glass{ - amount = 50 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, +/obj/item/stack/material/plastic/fifty, +/obj/item/stack/material/aluminium/fifty, +/obj/item/stack/material/steel/fifty, +/obj/item/stack/material/steel/fifty, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -1234,10 +1078,14 @@ /area/map_template/rescue_base/base) "cx" = ( /obj/structure/table/rack, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser, +/obj/item/device/paicard, +/obj/item/device/paicard, +/obj/item/device/paicard, +/obj/item/device/megaphone, +/obj/item/device/megaphone, +/obj/item/device/megaphone, +/obj/item/device/binoculars, +/obj/item/device/binoculars, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -1252,16 +1100,10 @@ }, /area/map_template/rescue_base/base) "cz" = ( -/obj/structure/window/reinforced/crescent{ - dir = 4 - }, -/obj/structure/window/reinforced/crescent{ - dir = 1 - }, -/obj/structure/table/rack, -/obj/item/rig/ert/janitor, +/obj/structure/table/reinforced, +/obj/machinery/fabricator/micro/bartender, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) @@ -1270,20 +1112,24 @@ /obj/item/paper_bin, /obj/item/pen, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "cB" = ( /obj/structure/table/reinforced, +/obj/item/storage/slide_projector, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "cC" = ( /obj/structure/table/reinforced, /obj/item/tableflag, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "cD" = ( @@ -1295,8 +1141,8 @@ /area/map_template/rescue_base/base) "cE" = ( /obj/structure/table/rack, -/obj/item/gun/energy/ionrifle, -/obj/item/gun/energy/ionrifle, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -1304,126 +1150,102 @@ /area/map_template/rescue_base/base) "cF" = ( /obj/structure/table/rack, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/shield/riot, -/obj/item/shield/riot, -/obj/item/shield/riot, -/obj/item/shield/riot, +/obj/item/gun/projectile/automatic/sec_smg, +/obj/item/gun/projectile/automatic/sec_smg, +/obj/item/gun/projectile/automatic/sec_smg, +/obj/item/gun/projectile/automatic/sec_smg, /turf/unsimulated/floor{ - dir = 8; + dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "cG" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/ivbag/nanoblood, -/obj/item/reagent_containers/ivbag/nanoblood, -/obj/item/reagent_containers/ivbag/blood/human/oneg, -/obj/item/reagent_containers/ivbag/blood/human/oneg, -/obj/item/reagent_containers/ivbag/blood/human/oneg, -/obj/item/reagent_containers/ivbag/blood/human/oneg, -/obj/item/reagent_containers/ivbag/blood/skrell/oneg, -/obj/item/reagent_containers/ivbag/blood/skrell/oneg, -/obj/item/reagent_containers/ivbag/blood/unathi/oneg, -/obj/item/reagent_containers/ivbag/blood/unathi/oneg, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/defibrillator/compact/loaded, +/obj/structure/table/steel_reinforced, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, /turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) "cH" = ( -/obj/structure/table/reinforced, -/obj/item/roller_bed, -/obj/item/roller_bed, -/obj/item/roller_bed, -/obj/item/roller_bed, -/obj/item/roller_bed, -/obj/item/roller_bed, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" +/obj/structure/sign/directions/engineering{ + dir = 2; + pixel_y = 3; + icon_state = "direction_infirm" }, +/obj/paint/sfv_arbiter, +/turf/simulated/wall/r_wall, /area/map_template/rescue_base/base) "cI" = ( -/obj/structure/closet{ - name = "insignias closet" - }, -/obj/item/clothing/accessory/solgov/department/medical/fleet, -/obj/item/clothing/accessory/solgov/department/medical/fleet, -/obj/item/clothing/accessory/solgov/department/medical/fleet, -/obj/item/clothing/accessory/solgov/department/medical/fleet, -/obj/item/clothing/head/beret/solgov/fleet/medical, -/obj/item/clothing/head/beret/solgov/fleet/medical, -/obj/item/clothing/head/beret/solgov/fleet/medical, -/obj/item/clothing/head/beret/solgov/fleet/medical, +/obj/structure/table/rack, +/obj/item/clothing/accessory/helmet_cover/saare, +/obj/item/clothing/accessory/helmet_cover/saare, +/obj/item/clothing/accessory/helmet_cover/saare, +/obj/item/clothing/accessory/helmet_cover/saare, +/obj/item/clothing/accessory/helmet_cover/saare, +/obj/item/clothing/accessory/helmet_cover/saare, +/obj/item/clothing/accessory/armor_tag/saare, +/obj/item/clothing/accessory/armor_tag/saare, +/obj/item/clothing/accessory/armor_tag/saare, +/obj/item/clothing/accessory/armor_tag/saare, +/obj/item/clothing/accessory/armor_tag/saare, +/obj/item/clothing/accessory/armor_tag/saare, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 1; + icon_state = "vault" }, /area/map_template/rescue_base/base) "cJ" = ( /obj/machinery/chem_master, +/obj/item/reagent_containers/glass/beaker/large, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "cK" = ( -/obj/structure/window/reinforced/crescent{ - dir = 4 - }, -/obj/structure/window/reinforced/crescent, /obj/structure/table/rack, -/obj/item/rig/ert/janitor, +/obj/item/rcd, +/obj/item/rcd, +/obj/item/rcd, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "cL" = ( -/obj/structure/table/reinforced, -/obj/item/device/paicard, -/obj/item/device/paicard, -/obj/item/device/paicard, -/obj/item/device/paicard, -/obj/item/device/paicard, -/obj/item/device/paicard, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" +/obj/machinery/door/window/brigdoor/eastleft{ + name = "Cell 1" }, -/area/map_template/rescue_base/base) -"cM" = ( -/obj/structure/table/rack, -/obj/item/gun/energy/gun, -/obj/item/gun/energy/gun, -/obj/item/gun/energy/gun, -/obj/item/gun/energy/gun, /turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) -"cN" = ( +"cM" = ( /obj/structure/table/rack, -/obj/item/shield/riot/metal, -/obj/item/shield/riot/metal, -/obj/item/shield/riot/metal, -/obj/item/shield/riot/metal, +/obj/item/clothing/head/helmet/riot, +/obj/item/clothing/head/helmet/riot, +/obj/item/clothing/head/helmet/riot, +/obj/item/clothing/head/helmet/riot, +/obj/item/clothing/suit/armor/riot, +/obj/item/clothing/suit/armor/riot, +/obj/item/clothing/suit/armor/riot, +/obj/item/clothing/suit/armor/riot, /turf/unsimulated/floor{ dir = 8; icon_state = "vault" @@ -1437,109 +1259,67 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"cP" = ( -/obj/structure/bed/chair{ - dir = 1 +"cR" = ( +/obj/item/aiModule/reset, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/protectStation, +/obj/item/aiModule/quarantine, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, +/obj/item/aiModule/safeguard, +/obj/structure/table/rack, +/obj/item/aiModule/solgov, +/obj/item/aiModule/solgov_aggressive, +/obj/item/stock_parts/circuitboard/aiupload{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/stock_parts/circuitboard/borgupload, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" }, +/area/map_template/rescue_base/base) +"cS" = ( +/obj/machinery/light, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"cT" = ( +/obj/structure/table/rack, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/unsimulated/floor{ icon_state = "dark" }, /area/map_template/rescue_base/base) -"cQ" = ( -/obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/structure/noticeboard{ - pixel_x = 32 +"cU" = ( +/obj/structure/bed/padded, +/obj/item/device/radio/intercom/specops{ + pixel_y = 22 }, +/obj/item/bedsheet/hos, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"cR" = ( -/obj/structure/closet{ - name = "insignias closet" - }, -/obj/item/clothing/accessory/solgov/department/security/fleet, -/obj/item/clothing/accessory/solgov/department/security/fleet, -/obj/item/clothing/accessory/solgov/department/security/fleet, -/obj/item/clothing/accessory/solgov/department/security/fleet, -/obj/item/clothing/head/beret/solgov/fleet/security, -/obj/item/clothing/head/beret/solgov/fleet/security, -/obj/item/clothing/head/beret/solgov/fleet/security, -/obj/item/clothing/head/beret/solgov/fleet/security, +"cV" = ( +/obj/machinery/vending/security, /turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"cS" = ( -/obj/structure/iv_stand, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"cT" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/reagent_containers/spray/sterilizine, -/obj/item/reagent_containers/spray/sterilizine, -/obj/item/storage/box/bloodpacks, -/obj/item/tape/medical, -/obj/item/tape/medical, -/obj/item/device/flashlight/pen, -/obj/item/device/flashlight/pen, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"cU" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/radiation, -/obj/item/storage/firstaid/radiation, -/obj/item/storage/firstaid/radiation, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"cV" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/combat, -/obj/item/storage/firstaid/combat, -/obj/item/storage/firstaid/combat, -/turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) "cW" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/table/reinforced, +/obj/item/clothing/mask/smokable/cigarette/rolled/sausage, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) @@ -1558,11 +1338,18 @@ "cY" = ( /obj/structure/window/reinforced/crescent, /obj/structure/table/rack, +<<<<<<< ours /obj/item/rig_module/mounted/energy/taser, /obj/item/rig_module/vision/nvg, /obj/item/rig_module/device/flash, +======= +/obj/item/rig_module/device/drill, +/obj/item/rig_module/device/drill, +/obj/item/rig_module/vision/meson, +/obj/item/rig_module/vision/meson, +>>>>>>> theirs /obj/structure/window/reinforced/crescent{ - dir = 4 + dir = 8 }, /turf/unsimulated/floor{ dir = 1; @@ -1572,53 +1359,45 @@ "cZ" = ( /obj/structure/window/reinforced/crescent, /obj/structure/table/rack, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/mounted/energy/taser, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/mounted/energy/plasmacutter, -/obj/item/rig_module/mounted/energy/plasmacutter, -/obj/item/rig_module/device/rcd, -/obj/item/rig_module/device/rcd, -/obj/item/rig_module/vision/meson, -/obj/item/rig_module/vision/meson, /obj/structure/window/reinforced/crescent{ - dir = 8 + dir = 4 }, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "da" = ( -/obj/structure/window/reinforced/crescent, /obj/structure/table/rack, -/obj/item/rig/ert/engineer, +/obj/item/storage/box/ammo/light_bullpup, +/obj/item/storage/box/ammo/light_bullpup, +/obj/item/storage/box/ammo/light_bullpup, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) "db" = ( -/obj/structure/window/reinforced/crescent, -/obj/structure/table/rack, -/obj/item/rig/ert/engineer, -/obj/structure/window/reinforced/crescent{ - dir = 4 +/obj/structure/table/steel, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 }, +/obj/item/pen/fancy, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) "dc" = ( -/turf/unsimulated/wall{ - desc = "A secure airlock. Doesn't look like you can get through easily."; - icon = 'icons/obj/doors/centcomm/door.dmi'; - icon_state = "closed"; - name = "Foxtrot Barracks" +/obj/structure/table/rack, +/obj/item/storage/box/cdeathalarm_kit, +/obj/item/storage/box/trackimp, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "dd" = ( @@ -1627,23 +1406,29 @@ icon_state = "asteroid" }, /area/map_template/rescue_base/base) -"de" = ( -/obj/structure/table/reinforced, +"df" = ( +/obj/paint/sfv_arbiter, +/obj/wallframe_spawn/reinforced, /turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" + icon_state = "plating"; + name = "plating" }, /area/map_template/rescue_base/base) -"df" = ( -/obj/machinery/vending/security, -/turf/unsimulated/wall, -/area/map_template/rescue_base/base) "dg" = ( -/obj/machinery/door/airlock/centcom{ - name = "Security" +/obj/structure/table/rack, +/obj/item/storage/box/ammo/stunshells, +/obj/item/storage/box/ammo/stunshells, +/obj/item/storage/box/ammo/beanbags, +/obj/item/storage/box/ammo/beanbags, +/obj/item/storage/box/ammo/shotgunammo, +/obj/item/storage/box/ammo/shotgunammo, +/obj/item/storage/box/ammo/shotgunshells, +/obj/item/storage/box/ammo/shotgunshells, +/obj/item/device/radio/intercom/specops{ + pixel_y = 22 }, /turf/unsimulated/floor{ - dir = 8; + dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) @@ -1657,12 +1442,11 @@ }, /area/map_template/rescue_base/base) "di" = ( -/obj/machinery/vending/medical, -/turf/unsimulated/wall, -/area/map_template/rescue_base/base) -"dj" = ( -/obj/wingrille_spawn/reinforced/crescent, -/turf/space, +/obj/structure/sign/directions/engineering{ + pixel_y = -4 + }, +/obj/paint/sfv_arbiter, +/turf/simulated/wall/r_wall, /area/map_template/rescue_base/base) "dk" = ( /obj/machinery/door/airlock/centcom{ @@ -1682,28 +1466,38 @@ name = "Unit Area" }, /turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) "dm" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, +/obj/structure/table/rack, +/obj/item/clothing/accessory/arm_guards/green, +/obj/item/clothing/accessory/arm_guards/green, +/obj/item/clothing/accessory/arm_guards/green, +/obj/item/clothing/accessory/arm_guards/green, +/obj/item/clothing/accessory/arm_guards/green, +/obj/item/clothing/accessory/arm_guards/green, +/obj/item/clothing/accessory/leg_guards/green, +/obj/item/clothing/accessory/leg_guards/green, +/obj/item/clothing/accessory/leg_guards/green, +/obj/item/clothing/accessory/leg_guards/green, +/obj/item/clothing/accessory/leg_guards/green, +/obj/item/clothing/accessory/leg_guards/green, +/obj/item/clothing/suit/armor/pcarrier/green, +/obj/item/clothing/suit/armor/pcarrier/green, +/obj/item/clothing/suit/armor/pcarrier/green, +/obj/item/clothing/suit/armor/pcarrier/green, +/obj/item/clothing/suit/armor/pcarrier/green, +/obj/item/clothing/suit/armor/pcarrier/green, /turf/unsimulated/floor{ - dir = 8; + dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "dn" = ( -/obj/machinery/door/airlock/centcom{ - name = "Echo Barracks" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" - }, +/obj/structure/sign/double/solgovflag/left, +/obj/paint/sfv_arbiter, +/turf/simulated/wall/r_wall, /area/map_template/rescue_base/base) "do" = ( /turf/unsimulated/wall{ @@ -1721,13 +1515,19 @@ }, /area/map_template/rescue_base/base) "dq" = ( -/obj/structure/table/reinforced, -/obj/item/modular_computer/tablet/lease/preset/command, -/obj/item/modular_computer/tablet/lease/preset/command, -/obj/item/modular_computer/tablet/lease/preset/command, -/obj/item/modular_computer/tablet/lease/preset/command, -/obj/item/modular_computer/tablet/lease/preset/command, -/obj/item/modular_computer/tablet/lease/preset/command, +/obj/structure/table/rack, +/obj/item/clothing/under/scga/utility/tan, +/obj/item/clothing/under/scga/utility/tan, +/obj/item/clothing/under/scga/utility/tan, +/obj/item/clothing/under/scga/utility/tan, +/obj/item/clothing/under/scga/utility/tan, +/obj/item/clothing/under/scga/utility/tan, +/obj/item/clothing/head/scga/beret, +/obj/item/clothing/head/scga/beret, +/obj/item/clothing/head/scga/beret, +/obj/item/clothing/head/scga/utility/tan, +/obj/item/clothing/head/scga/utility/tan, +/obj/item/clothing/head/scga/utility/tan, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -1742,45 +1542,18 @@ /area/map_template/rescue_base/base) "ds" = ( /obj/structure/table/rack, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"dt" = ( -/obj/structure/table/rack, -/obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"du" = ( -/obj/structure/table/rack, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, +/obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/accessory/storage/brown_vest, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"dv" = ( -/obj/structure/table/rack, /obj/item/clothing/accessory/storage/holster/thigh, /obj/item/clothing/accessory/storage/holster/thigh, /obj/item/clothing/accessory/storage/holster/thigh, @@ -1792,35 +1565,54 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"dw" = ( -/obj/item/device/radio/intercom/specops{ - dir = 1; - pixel_y = -22 +"du" = ( +/obj/structure/window/reinforced/crescent{ + dir = 4 }, +/obj/structure/window/reinforced/crescent, +/obj/structure/table/rack, +/obj/item/rig/ert/janitor, +/obj/item/rig/ert/janitor, /turf/unsimulated/floor{ - dir = 8; + dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"dx" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1331; - id_tag = "rescue_base"; - pixel_x = 5; - pixel_y = -25 +"dv" = ( +/obj/structure/table/rack, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/inflatable_dispenser, +/obj/item/inflatable_dispenser, +/obj/item/pickaxe/diamonddrill, +/obj/item/pickaxe/diamonddrill, +/obj/item/storage/briefcase/inflatable{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/briefcase/inflatable{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/briefcase/inflatable{ + pixel_x = 3; + pixel_y = 3 }, /turf/unsimulated/floor{ - dir = 8; + dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "dy" = ( -/obj/machinery/door/airlock/centcom{ - name = "Squad Leader's Office" +/obj/machinery/door/window/brigdoor/eastright{ + name = "Cell Two" }, /turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) "dz" = ( @@ -1841,10 +1633,6 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"dB" = ( -/obj/machinery/vending/engineering, -/turf/unsimulated/wall, -/area/map_template/rescue_base/base) "dC" = ( /obj/machinery/door/airlock/external{ frequency = 1331; @@ -1857,29 +1645,47 @@ }, /area/map_template/rescue_base/base) "dD" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/trackimp, -/obj/item/storage/box/cdeathalarm_kit, +/obj/machinery/hologram/holopad/longrange, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) "dE" = ( -/obj/structure/table/reinforced, -/obj/prefab/hand_teleporter, +/obj/structure/hygiene/shower{ + dir = 4 + }, +/obj/item/soap, /turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" + icon_state = "freezerfloor" }, /area/map_template/rescue_base/base) "dF" = ( -/obj/structure/table/reinforced, -/obj/item/aicard, -/obj/item/pinpointer/advpinpointer, -/obj/item/device/radio/intercom/specops{ - pixel_y = 22 - }, +/obj/structure/table/rack, +/obj/item/clothing/accessory/helmet_cover/tan, +/obj/item/clothing/accessory/helmet_cover/tan, +/obj/item/clothing/accessory/helmet_cover/tan, +/obj/item/clothing/accessory/helmet_cover/tan, +/obj/item/clothing/accessory/helmet_cover/tan, +/obj/item/clothing/accessory/helmet_cover/tan, +/obj/item/clothing/accessory/arm_guards/tan, +/obj/item/clothing/accessory/arm_guards/tan, +/obj/item/clothing/accessory/arm_guards/tan, +/obj/item/clothing/accessory/arm_guards/tan, +/obj/item/clothing/accessory/arm_guards/tan, +/obj/item/clothing/accessory/arm_guards/tan, +/obj/item/clothing/accessory/leg_guards/tan, +/obj/item/clothing/accessory/leg_guards/tan, +/obj/item/clothing/accessory/leg_guards/tan, +/obj/item/clothing/accessory/leg_guards/tan, +/obj/item/clothing/accessory/leg_guards/tan, +/obj/item/clothing/accessory/leg_guards/tan, +/obj/item/clothing/suit/armor/pcarrier/tan, +/obj/item/clothing/suit/armor/pcarrier/tan, +/obj/item/clothing/suit/armor/pcarrier/tan, +/obj/item/clothing/suit/armor/pcarrier/tan, +/obj/item/clothing/suit/armor/pcarrier/tan, +/obj/item/clothing/suit/armor/pcarrier/tan, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -1908,58 +1714,51 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"dJ" = ( -/obj/machinery/vending/generic, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) "dK" = ( -/obj/machinery/pipedispenser, -/obj/item/device/radio/intercom/specops{ - pixel_y = 22 - }, +/obj/structure/table/rack, +/obj/item/inducer, +/obj/item/inducer, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "dL" = ( -/obj/machinery/pipedispenser/disposal, +/obj/structure/table/rack, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "dM" = ( -/obj/structure/closet{ - name = "insignias closet" +/obj/floor_decal/techfloor{ + dir = 8 }, -/obj/item/clothing/accessory/solgov/department/engineering/fleet, -/obj/item/clothing/accessory/solgov/department/engineering/fleet, -/obj/item/clothing/accessory/solgov/department/engineering/fleet, -/obj/item/clothing/accessory/solgov/department/engineering/fleet, -/obj/item/clothing/head/beret/solgov/fleet/engineering, -/obj/item/clothing/head/beret/solgov/fleet/engineering, -/obj/item/clothing/head/beret/solgov/fleet/engineering, -/obj/item/clothing/head/beret/solgov/fleet/engineering, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/area/map_template/rescue_base/base) -"dN" = ( -/obj/floor_decal/industrial/hatch/yellow, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/area/map_template/rescue_base/base) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) "dO" = ( -/obj/structure/bed/chair/office/dark, +/obj/machinery/door/airlock/centcom{ + name = "Emergency Insertion" + }, /turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) "dP" = ( @@ -1969,7 +1768,6 @@ }, /area/map_template/rescue_base/base) "dQ" = ( -/obj/floor_decal/industrial/outline/yellow, /obj/machinery/door/airlock/external{ frequency = 1331; id_tag = "rescue_base_hatch" @@ -1987,21 +1785,31 @@ name = "Garage" }, /turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) "dS" = ( -/obj/structure/table/steel, -/obj/item/device/radio/intercom/specops, +/obj/structure/table/rack, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /turf/unsimulated/floor{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) "dT" = ( +<<<<<<< ours /obj/structure/table/glass, /obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/dark/monotile, +======= +/obj/machinery/atmospherics/unary/tank/air{ + dir = 1; + start_pressure = 4559.63 + }, +/obj/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +>>>>>>> theirs /area/map_template/rescue_base/start) "dU" = ( /obj/structure/table/steel, @@ -2011,8 +1819,11 @@ }, /area/map_template/rescue_base/base) "dV" = ( -/obj/machinery/door/airlock/centcom{ - name = "Command" +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1331; + id_tag = "rescue_base"; + pixel_x = 5; + pixel_y = -32 }, /turf/unsimulated/floor{ icon_state = "dark" @@ -2039,30 +1850,10 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"dZ" = ( -/obj/floor_decal/industrial/outline/yellow, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" - }, -/area/map_template/rescue_base/base) -"ea" = ( -/obj/floor_decal/industrial/outline/yellow, -/obj/floor_decal/industrial/warning/corner, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" - }, -/area/map_template/rescue_base/base) "eb" = ( -/obj/machinery/button/blast_door{ - id_tag = "rescuegarage"; - name = "Garage"; - pixel_x = -24; - pixel_y = -4 - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" - }, +/obj/structure/sign/warning/pods, +/obj/paint/sfv_arbiter, +/turf/simulated/wall/r_wall, /area/map_template/rescue_base/base) "ec" = ( /obj/structure/table/reinforced, @@ -2073,31 +1864,53 @@ }, /area/map_template/rescue_base/base) "ed" = ( -/obj/structure/table/reinforced, /obj/item/device/radio/intercom/specops{ pixel_y = 22 }, +<<<<<<< ours /obj/item/device/paint_sprayer, +======= +/obj/structure/table/rack, +/obj/item/gun/energy/plasmacutter/mounted/mech, +/obj/item/gun/energy/plasmacutter/mounted/mech, +/obj/item/mech_equipment/catapult, +/obj/item/mech_equipment/catapult, +/obj/item/mech_equipment/drill/diamond, +/obj/item/mech_equipment/drill/diamond, +/obj/item/mech_equipment/mounted_system/extinguisher, +/obj/item/mech_equipment/mounted_system/extinguisher, +/obj/item/mech_equipment/mounted_system/rcd, +/obj/item/mech_equipment/mounted_system/rcd, +>>>>>>> theirs /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "ee" = ( +<<<<<<< ours /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/cell/hyper, /obj/item/cell/hyper, +======= +/obj/structure/table/rack, +/obj/item/mech_equipment/camera, +/obj/item/mech_equipment/camera, +/obj/item/mech_equipment/light, +/obj/item/mech_equipment/light, +/obj/item/mech_equipment/clamp, +/obj/item/mech_equipment/clamp, +>>>>>>> theirs /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) "ef" = ( -/obj/structure/table/steel, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/obj/structure/sign/double/solgovflag/right, +/obj/paint/sfv_arbiter, +/turf/simulated/wall/r_wall, /area/map_template/rescue_base/base) "eg" = ( /obj/structure/bed/chair/office/dark{ @@ -2108,52 +1921,46 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"eh" = ( -/obj/structure/table/rack, -/obj/item/storage/box/flashbangs, -/obj/item/storage/box/teargas, -/obj/item/storage/box/handcuffs, -/obj/item/melee/baton/loaded, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) "ei" = ( /obj/structure/table/rack, -/obj/item/clothing/mask/gas, -/obj/item/clothing/glasses/tacgoggles, +/obj/item/clothing/accessory/armor_tag/solgov/fleet, +/obj/item/clothing/accessory/armor_tag/solgov/fleet, +/obj/item/clothing/accessory/armor_tag/solgov/fleet, +/obj/item/clothing/accessory/armor_tag/solgov/fleet, +/obj/item/clothing/accessory/armor_tag/solgov/fleet, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) "ej" = ( -/obj/structure/table/rack, -/obj/item/storage/backpack/ert/commander, -/obj/item/storage/belt/holster/security/tactical, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" +/obj/machinery/fabricator/hacked, +/obj/item/stack/material/plastic/fifty, +/obj/item/stack/material/steel/fifty, +/obj/item/stack/material/aluminium/fifty, +/obj/item/stack/material/glass/fifty, +/obj/floor_decal/techfloor{ + dir = 4 }, -/area/map_template/rescue_base/base) +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) "ek" = ( -/obj/structure/table/rack, -/obj/item/gun/energy/gun, +/obj/structure/flora/ausbushes/sunnybush, /turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" + icon_state = "asteroidplating" }, /area/map_template/rescue_base/base) "el" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/armor/pcarrier/medium/command, -/obj/item/clothing/head/helmet/solgov/command, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" +/obj/machinery/vitals_monitor, +/obj/machinery/light{ + dir = 1 }, -/area/map_template/rescue_base/base) +/obj/machinery/vending/wallmed1{ + name = "Emergency NanoMed"; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/white/monotile, +/area/map_template/rescue_base/start) "em" = ( /obj/structure/reagent_dispensers/fueltank, /turf/unsimulated/floor{ @@ -2168,15 +1975,6 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"eo" = ( -/obj/floor_decal/industrial/outline/yellow, -/obj/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" - }, -/area/map_template/rescue_base/base) "ep" = ( /obj/machinery/door/blast/regular{ id_tag = "rescuegarage"; @@ -2189,26 +1987,45 @@ /area/map_template/rescue_base/base) "eq" = ( /obj/machinery/mech_recharger, +<<<<<<< ours /mob/living/exosuit/premade/ert, +======= +>>>>>>> theirs /turf/unsimulated/floor{ dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) "er" = ( -/obj/item/clothing/head/solgov/dress/fleet/command{ - dir = 4; - icon_state = "console" +/obj/item/reagent_containers/food/snacks/meat/beef, +/obj/item/reagent_containers/food/snacks/meat/beef, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/structure/closet/fridge/meat, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" }, -/obj/item/card/id/centcom, +/area/map_template/rescue_base/base) +<<<<<<< ours +======= +"es" = ( +/obj/structure/table/steel, +/obj/random/clipboard, +/obj/item/stamp/solgov, /turf/unsimulated/floor{ icon_state = "dark" }, /area/map_template/rescue_base/base) +>>>>>>> theirs "et" = ( /obj/structure/table/rack, -/obj/item/storage/secure/briefcase, -/obj/item/clothing/head/beret/centcom/captain, +/obj/item/roller_bed, +/obj/item/roller_bed, +/obj/item/roller_bed, +/obj/item/roller_bed, +/obj/item/defibrillator/compact/loaded, +/obj/item/defibrillator/compact/loaded, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" @@ -2265,233 +2082,141 @@ }, /area/map_template/rescue_base/base) "ey" = ( -/obj/structure/table/rack, -/obj/item/storage/backpack/ert/engineer, -/obj/item/storage/backpack/ert/engineer, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/clothing/gloves/insulated, -/obj/item/clothing/gloves/insulated, -/obj/item/clothing/gloves/insulated, -/obj/item/clothing/gloves/insulated, +/obj/structure/table/reinforced, +/obj/item/modular_computer/tablet/lease/preset/command, +/obj/item/modular_computer/tablet/lease/preset/command, +/obj/item/modular_computer/tablet/lease/preset/command, +/obj/item/modular_computer/tablet/lease/preset/command, +/obj/item/modular_computer/tablet/lease/preset/command, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) -"ez" = ( +"eA" = ( /obj/structure/table/rack, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/welding/superior, -/obj/item/clothing/glasses/welding/superior, +/obj/item/clothing/under/scga/utility, +/obj/item/clothing/under/scga/utility, +/obj/item/clothing/under/scga/utility, +/obj/item/clothing/under/scga/utility, +/obj/item/clothing/under/scga/utility, +/obj/item/clothing/under/scga/utility, +/obj/item/clothing/head/scga/utility, +/obj/item/clothing/head/scga/utility, +/obj/item/clothing/head/scga/utility, +/obj/item/clothing/head/scga/utility, +/obj/item/clothing/head/scga/utility, +/obj/item/clothing/head/scga/utility, +/obj/item/clothing/head/scga/utility/drill, +/obj/item/clothing/head/scga/service/wheel_command, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"eA" = ( +"eB" = ( /obj/structure/table/rack, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/melee/baton/loaded, -/obj/item/melee/baton/loaded, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/inflatable_dispenser, -/obj/item/inflatable_dispenser, -/obj/item/pickaxe/diamonddrill, -/obj/item/pickaxe/diamonddrill, -/obj/item/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 +/obj/item/stack/material/plasteel/fifty, +/obj/item/stack/material/plasteel/fifty, +/obj/item/stack/material/glass/reinforced/fifty, +/obj/item/stack/material/glass/reinforced/fifty, +/obj/item/stack/material/plastic/fifty, +/obj/item/stack/material/glass/boron_reinforced/ten, +/obj/item/stack/material/glass/boron_reinforced/ten, +/obj/item/stack/material/steel/fifty, +/obj/item/stack/material/steel/fifty, +/obj/item/stack/material/steel/fifty, +/obj/item/stack/material/rods/fifty, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" }, -/obj/item/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 +/area/map_template/rescue_base/base) +"eC" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 32 }, -/obj/item/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 +/obj/floor_decal/techfloor, +/obj/structure/table/steel_reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"eD" = ( +/obj/structure/window/reinforced/crescent{ + dir = 4 }, -/obj/item/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 +/obj/structure/window/reinforced/crescent{ + dir = 1 }, +/obj/structure/table/rack, +/obj/item/mop/advanced, +/obj/item/mop/advanced, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"eB" = ( -/obj/structure/table/reinforced, -/obj/item/taperoll/engineering, -/obj/item/taperoll/engineering, -/obj/item/taperoll/atmos, -/obj/item/taperoll/atmos, -/obj/item/device/multitool, -/obj/item/device/multitool, -/obj/item/tape_roll, -/obj/item/tape_roll, -/obj/item/tape_roll, -/obj/item/tape_roll, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, +"eE" = ( +/obj/item/stock_parts/circuitboard/smes, +/obj/item/stock_parts/circuitboard/smes, +/obj/item/stock_parts/smes_coil, +/obj/item/stock_parts/smes_coil, +/obj/item/stock_parts/smes_coil/super_capacity, +/obj/item/stock_parts/smes_coil/super_capacity, +/obj/item/stock_parts/smes_coil/super_io, +/obj/item/stock_parts/smes_coil/super_io, +/obj/structure/table/rack, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"eC" = ( -/obj/structure/table/reinforced, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd, -/obj/item/rcd, -/obj/item/rcd, -/obj/item/rcd, +"eF" = ( +/obj/structure/table/rack, +/obj/item/clothing/accessory/glassesmod/nvg, +/obj/item/clothing/accessory/glassesmod/nvg, +/obj/item/clothing/accessory/glassesmod/nvg, +/obj/item/clothing/accessory/glassesmod/nvg, +/obj/item/clothing/accessory/glassesmod/nvg, +/obj/item/clothing/accessory/glassesmod/nvg, +/obj/item/clothing/accessory/helmet_cover/navy, +/obj/item/clothing/accessory/helmet_cover/navy, +/obj/item/clothing/accessory/helmet_cover/navy, +/obj/item/clothing/accessory/helmet_cover/navy, +/obj/item/clothing/accessory/helmet_cover/navy, +/obj/item/clothing/accessory/helmet_cover/navy, +/obj/item/clothing/head/helmet/merc, +/obj/item/clothing/head/helmet/merc, +/obj/item/clothing/head/helmet/merc, +/obj/item/clothing/head/helmet/merc, +/obj/item/clothing/head/helmet/merc, +/obj/item/clothing/head/helmet/merc, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"eD" = ( -/obj/structure/table/reinforced, -/obj/item/stack/material/glass{ - amount = 50 - }, -/obj/item/stack/material/glass{ - amount = 50 - }, -/obj/item/stack/material/glass{ - amount = 50 - }, -/obj/item/stack/material/glass{ - amount = 50 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/material/plasteel{ - amount = 50 - }, -/obj/item/stack/material/plasteel{ - amount = 50 - }, -/obj/item/stack/material/plasteel{ - amount = 50 - }, -/obj/item/stack/material/plasteel{ - amount = 50 - }, -/obj/item/stack/material/glass/reinforced{ - amount = 50 - }, -/obj/item/stack/material/glass/reinforced{ - amount = 50 - }, -/obj/item/stack/material/glass/reinforced{ - amount = 50 - }, -/obj/item/stack/material/glass/reinforced{ - amount = 50 - }, -/obj/item/stack/material/plastic{ - amount = 50 - }, -/obj/item/stack/material/plastic{ - amount = 50 - }, -/obj/item/stack/material/plastic{ - amount = 50 - }, -/obj/item/stack/material/plastic{ - amount = 50 - }, -/obj/item/stack/material/glass/boron_reinforced{ - amount = 20 - }, -/obj/item/stack/material/glass/boron_reinforced{ - amount = 20 - }, -/obj/item/stack/material/glass/boron_reinforced{ - amount = 20 - }, -/obj/item/stack/material/glass/boron_reinforced{ - amount = 20 - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"eE" = ( -/obj/structure/table/reinforced, -/obj/item/stock_parts/circuitboard/smes, -/obj/item/stock_parts/circuitboard/smes, -/obj/item/stock_parts/smes_coil, -/obj/item/stock_parts/smes_coil, -/obj/item/stock_parts/smes_coil/super_capacity, -/obj/item/stock_parts/smes_coil/super_capacity, -/obj/item/stock_parts/smes_coil/super_io, -/obj/item/stock_parts/smes_coil/super_io, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "vault" - }, -/area/map_template/rescue_base/base) -"eF" = ( -/obj/machinery/portable_atmospherics/canister/air, +"eG" = ( +/obj/structure/table/rack, +/obj/item/shield/riot/metal, +/obj/item/shield/riot/metal, +/obj/item/shield/riot/metal, +/obj/item/shield/riot/metal, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"eG" = ( -/obj/item/device/radio/intercom/specops{ - pixel_y = 22 - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/map_template/rescue_base/base) "eH" = ( /obj/structure/table/woodentable{ dir = 5 @@ -2535,69 +2260,48 @@ icon_state = "vault" }, /area/map_template/rescue_base/base) -"eL" = ( -/obj/floor_decal/industrial/outline/yellow, -/obj/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" - }, -/area/map_template/rescue_base/base) "eM" = ( -/obj/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" - }, -/area/map_template/rescue_base/base) -"eN" = ( -/obj/floor_decal/industrial/warning{ - dir = 1 - }, +/obj/structure/undies_wardrobe, /turf/unsimulated/floor{ - icon_state = "asteroidfloor" + dir = 8; + icon_state = "vault" }, /area/map_template/rescue_base/base) -"eO" = ( -/obj/floor_decal/industrial/warning{ - dir = 5 +"eP" = ( +/obj/floor_decal/techfloor{ + dir = 6 }, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/area/map_template/rescue_base/base) -"eP" = ( -/obj/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 }, -/area/map_template/rescue_base/base) +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) "eQ" = ( /turf/unsimulated/floor{ icon_state = "asteroidfloor" }, /area/map_template/rescue_base/base) -"eR" = ( -/obj/floor_decal/industrial/loading, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" - }, -/area/map_template/rescue_base/base) "eS" = ( -/obj/floor_decal/industrial/warning{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" - }, -/area/map_template/rescue_base/base) +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) "eT" = ( +<<<<<<< ours /obj/machinery/light{ dir = 8 +======= +/obj/machinery/porta_turret/crescent, +/turf/unsimulated/floor{ + icon_state = "asteroidfloor" +>>>>>>> theirs }, /obj/structure/closet/crate/secure{ req_access = list("ACCESS_CENT_SPECOPS") @@ -2605,38 +2309,61 @@ /turf/simulated/floor/plating, /area/map_template/rescue_base/start) "eU" = ( -/obj/paint/hull, -/turf/simulated/wall/titanium, +/obj/floor_decal/techfloor, +/obj/structure/table/steel_reinforced, +/obj/item/device/radio/intercom/specops{ + pixel_y = 22 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/turretid/lethal{ + ailock = 1; + check_arrest = 0; + check_records = 0; + enabled = 0; + req_access = list("ACCESS_CENT_SPECOPS") + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +<<<<<<< ours +======= +"eV" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) +>>>>>>> theirs "eW" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id_tag = "rescuedock"; - name = "Blast Shutters"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 }, -/obj/wallframe_spawn/reinforced/titanium, -/obj/paint/hull, -/turf/simulated/floor/plating, +/obj/paint/sun, +/turf/simulated/wall/titanium, /area/map_template/rescue_base/start) "eX" = ( -/obj/machinery/door/airlock/external{ - frequency = 1331; - id_tag = "rescue_shuttle_outer"; - name = "Ship External Access" +/obj/structure/roller_bed, +/obj/machinery/light{ + dir = 8 }, -/obj/shuttle_landmark/ert/start, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/white, /area/map_template/rescue_base/start) "eY" = ( +<<<<<<< ours /obj/machinery/computer/prisoner{ name = "Implant Management"; +======= +/obj/machinery/atmospherics/unary/vent_scrubber/on{ +>>>>>>> theirs dir = 8 }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "eZ" = ( +<<<<<<< ours /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, @@ -2657,31 +2384,60 @@ /obj/structure/table/steel_reinforced, /obj/item/storage/fancy/smokable/dromedaryco, /turf/simulated/floor/tiled/dark, -/area/map_template/rescue_base/start) -"fc" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{ - dir = 4; - id_tag = "rescue_shuttle_pump" +======= +/obj/structure/closet{ + name = "emergency response team wardrobe" }, -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "rescue_shuttle_sensor"; - pixel_x = 8; - pixel_y = 25 +/obj/item/storage/backpack/ert/security, +/obj/item/clothing/accessory/solgov/department/security/fleet, +/obj/item/clothing/accessory/armor_tag/solgov/sec, +/obj/item/clothing/accessory/solgov/fleet_patch/fifth, +/obj/item/clothing/accessory/badge/solgov/tags, +/obj/item/clothing/head/solgov/utility/fleet, +/obj/item/device/hailer, +/obj/item/clothing/glasses/ballistic/security, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" }, -/obj/machinery/light{ - dir = 8 +/area/map_template/rescue_base/base) +"fa" = ( +/obj/machinery/portable_atmospherics/canister/air/airlock{ + start_pressure = 6000 }, -/obj/structure/closet/emcloset, -/turf/simulated/floor/plating, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"fb" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 4 + }, +/obj/structure/table/rack, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +>>>>>>> theirs +/area/map_template/rescue_base/start) +"fc" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white/monotile, /area/map_template/rescue_base/start) "fd" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/paint/sun, +/turf/simulated/wall/titanium, /area/map_template/rescue_base/start) "fe" = ( +<<<<<<< ours /obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{ dir = 8; id_tag = "rescue_shuttle_pump" @@ -2710,6 +2466,19 @@ "fg" = ( /obj/floor_decal/corner/paleblue{ dir = 4 +======= +/obj/structure/bed/padded, +/obj/item/bedsheet/ce, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"ff" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/floor_decal/techfloor{ + dir = 1 +>>>>>>> theirs }, /obj/floor_decal/floordetail/edgedrain{ dir = 10 @@ -2725,20 +2494,27 @@ /turf/simulated/floor/tiled/white, /area/map_template/rescue_base/start) "fh" = ( +<<<<<<< ours /obj/machinery/atmospherics/unary/freezer{ icon_state = "freezer" }, /turf/simulated/floor/tiled/white, +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +>>>>>>> theirs /area/map_template/rescue_base/start) "fi" = ( -/obj/structure/table/steel_reinforced, -/obj/item/device/radio/intercom/specops{ - dir = 8; - pixel_x = 22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "fj" = ( +<<<<<<< ours /obj/machinery/sleeper{ dir = 8 }, @@ -2763,11 +2539,21 @@ }, /turf/simulated/floor/tiled/white, /area/map_template/rescue_base/start) +======= +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/cell/hyper, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/map_template/rescue_base/base) +>>>>>>> theirs "fk" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/cryo_cell, +/turf/simulated/floor/tiled/white/monotile, /area/map_template/rescue_base/start) "fl" = ( +<<<<<<< ours /obj/machinery/door/airlock/external{ frequency = 1331; id_tag = "rescue_shuttle_outer"; @@ -2779,15 +2565,20 @@ id_tag = "ert_starboard_airlock_blast_door" }, /turf/simulated/floor/plating, +======= +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/obj/paint/sun, +/turf/simulated/wall/titanium, +>>>>>>> theirs /area/map_template/rescue_base/start) "fn" = ( /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) -"fo" = ( -/obj/machinery/hologram/holopad/longrange, -/turf/simulated/floor/tiled/dark, -/area/map_template/rescue_base/start) "fp" = ( +<<<<<<< ours +<<<<<<< ours /obj/machinery/body_scanconsole{ dir = 4 }, @@ -2799,9 +2590,21 @@ pixel_x = 22; pixel_y = -10 }, +======= +======= +/obj/paint/merc, +>>>>>>> theirs +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/wall/titanium, +/area/map_template/rescue_base/start) +"fq" = ( +>>>>>>> theirs /obj/structure/handrail{ - dir = 8 + dir = 4 }, +<<<<<<< ours /obj/machinery/button/blast_door{ id_tag = "ert_starboard_airlock_blast_door"; name = "Port Exit Shutters Control"; @@ -2817,63 +2620,124 @@ }, /obj/structure/bed/chair{ dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/map_template/rescue_base/start) -"ft" = ( +======= /obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{ dir = 4; id_tag = "rescue_shuttle_pump" }, -/obj/machinery/light{ - dir = 8 +/turf/simulated/floor/tiled/techfloor/grid, +/area/map_template/rescue_base/start) +"fr" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 }, -/turf/simulated/floor/plating, +/obj/item/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" +>>>>>>> theirs + }, +/area/map_template/rescue_base/base) +"fs" = ( +/obj/structure/table/rack, +/obj/item/clothing/under/pcrc, +/obj/item/clothing/under/pcrc, +/obj/item/clothing/under/pcrc, +/obj/item/clothing/under/pcrc, +/obj/item/clothing/under/pcrc, +/obj/item/clothing/under/pcrc, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"ft" = ( +/obj/paint/merc, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/wall/titanium, /area/map_template/rescue_base/start) "fu" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible, -/turf/simulated/floor/plating, -/area/map_template/rescue_base/start) +/obj/structure/table/rack, +/obj/item/clothing/gloves/scga/duty, +/obj/item/clothing/gloves/scga/duty, +/obj/item/clothing/gloves/scga/duty, +/obj/item/clothing/gloves/scga/duty, +/obj/item/clothing/gloves/scga/duty, +/obj/item/clothing/gloves/scga/duty, +/obj/item/clothing/shoes/scga/utility, +/obj/item/clothing/shoes/scga/utility, +/obj/item/clothing/shoes/scga/utility, +/obj/item/clothing/shoes/scga/utility, +/obj/item/clothing/shoes/scga/utility, +/obj/item/clothing/shoes/scga/utility, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) "fv" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible, -/obj/machinery/meter, -/turf/simulated/floor/plating, -/area/map_template/rescue_base/start) +/obj/machinery/recharger/wallcharger{ + pixel_x = -25 + }, +/obj/machinery/vending/medical, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) "fw" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{ - dir = 8; + dir = 4; id_tag = "rescue_shuttle_pump" }, -/obj/machinery/light{ +/obj/structure/handrail{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor/grid, /area/map_template/rescue_base/start) "fx" = ( -/obj/wallframe_spawn/reinforced/titanium, -/obj/paint/hull, +/obj/wallframe_spawn/reinforced, +/obj/paint/merc, /turf/simulated/floor/plating, /area/map_template/rescue_base/start) "fy" = ( +<<<<<<< ours /obj/structure/bed/chair/office/dark{ dir = 4 }, /turf/simulated/floor/tiled/dark, +======= +/obj/structure/catwalk, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plating, +>>>>>>> theirs /area/map_template/rescue_base/start) "fz" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/wallframe_spawn/reinforced/titanium, -/obj/paint/hull, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/map_template/rescue_base/start) "fA" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/door/airlock/external{ - frequency = 1331; - id_tag = "rescue_shuttle_inner"; - name = "Ship External Access" +/obj/machinery/light, +/obj/floor_decal/techfloor{ + dir = 10 }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "fB" = ( /obj/structure/flora/ausbushes/palebush, @@ -2881,6 +2745,7 @@ icon_state = "asteroidplating" }, /area/map_template/rescue_base/base) +<<<<<<< ours "fC" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/head/solgov/dress/fleet/command, @@ -2896,91 +2761,111 @@ "fE" = ( /obj/machinery/computer/modular/preset/medical{ dir = 8 +======= +"fE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 +>>>>>>> theirs }, -/turf/simulated/floor/tiled/dark, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/map_template/rescue_base/start) "fF" = ( -/obj/machinery/atmospherics/unary/tank/air{ - dir = 4; - start_pressure = 740.5 - }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/floor_decal/techfloor{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) "fG" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/machinery/meter, -/turf/simulated/floor/tiled/dark, +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white/monotile, /area/map_template/rescue_base/start) "fH" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "rescue_shuttle"; - name = "interior access button"; - pixel_x = 25; - pixel_y = 25; - req_access = list("ACCESS_CENT_SPECOPS") +/obj/structure/handrail{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{ + dir = 4; + id_tag = "rescue_shuttle_pump" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/map_template/rescue_base/start) "fI" = ( -/obj/machinery/atmospherics/unary/tank/air{ - dir = 8 +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/obj/floor_decal/techfloor{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "fJ" = ( -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id_tag = "rescueeva"; - name = "Blast Shutters"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/door/airlock/external{ + frequency = 1331; + id_tag = "rescue_shuttle_inner"; + name = "Ship External Access" }, -/obj/wallframe_spawn/reinforced/titanium, -/obj/paint/hull, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor/grid, /area/map_template/rescue_base/start) +<<<<<<< ours "fL" = ( /obj/structure/closet/bombclosetsecurity, /turf/simulated/floor/tiled/dark, +======= +"fK" = ( +/turf/simulated/floor/tiled/techfloor/grid, +>>>>>>> theirs /area/map_template/rescue_base/start) "fM" = ( -/obj/structure/table/rack, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/turf/simulated/floor/tiled/dark, +/obj/machinery/body_scanconsole{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/map_template/rescue_base/start) "fN" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/unary/tank/air{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/tank/air{ + dir = 4; + start_pressure = 4559.63 + }, +/obj/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) "fO" = ( -/obj/structure/closet, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/floor_decal/techfloor{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "fP" = ( +<<<<<<< ours /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, @@ -2989,13 +2874,24 @@ dir = 4 }, /turf/simulated/floor/tiled/white, +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +>>>>>>> theirs /area/map_template/rescue_base/start) "fQ" = ( -/obj/structure/table/rack, -/obj/item/tank/oxygen_emergency_double, -/obj/item/tank/oxygen_emergency_double, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/unary/engine{ + dir = 8 + }, +/obj/paint/sun, +/turf/simulated/wall/titanium, /area/map_template/rescue_base/start) +<<<<<<< ours "fS" = ( /obj/machinery/door/airlock/centcom{ name = "Cell"; @@ -3007,10 +2903,43 @@ /obj/machinery/door/airlock/centcom{ name = "Storage"; icon_state = "closed" +======= +"fR" = ( +/obj/item/device/radio/intercom/specops{ + dir = 8; + pixel_x = 24 + }, +/obj/structure/table/standard, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 32 + }, +/obj/floor_decal/techfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"fS" = ( +/obj/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/computer/modular/preset/engineering{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"fT" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/floor_decal/techfloor{ + dir = 1 +>>>>>>> theirs }, /turf/simulated/floor/plating, /area/map_template/rescue_base/start) "fU" = ( +<<<<<<< ours /obj/machinery/door/airlock/centcom{ name = "Flight Deck"; icon_state = "closed" @@ -3019,19 +2948,30 @@ /area/map_template/rescue_base/start) "fV" = ( /obj/structure/closet/l3closet/general, +======= +/obj/machinery/power/apc/hyper{ + dir = 1; + pixel_y = 18; + req_access = list("ACCESS_SYNDICATE") + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/floor_decal/techfloor{ + dir = 1 + }, +>>>>>>> theirs /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) -"fW" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/tiled/dark, -/area/map_template/rescue_base/start) -"fX" = ( -/obj/item/device/radio/intercom/specops{ - dir = 1; - pixel_y = -22 +"fV" = ( +/obj/structure/handrail, +/obj/floor_decal/techfloor{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) +<<<<<<< ours "fY" = ( /obj/structure/table/rack, /obj/machinery/light, @@ -3049,10 +2989,34 @@ /obj/machinery/door/airlock/centcom{ name = "Brig"; icon_state = "closed" +======= +"fX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"fZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 +>>>>>>> theirs }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/floor_decal/techfloor, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "ga" = ( +<<<<<<< ours /obj/structure/shuttle/engine/heater, /obj/paint/sun, /turf/simulated/wall/titanium, @@ -3076,41 +3040,131 @@ /obj/machinery/door/airlock/centcom{ name = "Passageway"; icon_state = "closed" +======= +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/map_template/rescue_base/start) -"ge" = ( -/obj/structure/handrail, -/turf/simulated/floor/tiled/dark, -/area/map_template/rescue_base/start) -"gf" = ( -/obj/structure/closet, -/obj/item/storage/box/donkpocket_premium, -/obj/item/storage/box/donkpocket_premium, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/floor_decal/techfloor, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) -"gh" = ( -/obj/structure/bed, -/obj/item/bedsheet/orange, +"gb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/floor_decal/techfloor, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) -"gi" = ( -/obj/machinery/flasher{ - id_tag = "rescueflash"; - pixel_y = 28 +"gc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/techfloor, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) -"gj" = ( -/obj/machinery/light{ - dir = 1 +"gd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 +>>>>>>> theirs + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"gf" = ( +<<<<<<< ours +/obj/structure/closet, +/obj/item/storage/box/donkpocket_premium, +/obj/item/storage/box/donkpocket_premium, +/obj/machinery/light{ +======= +/obj/structure/table/rack, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/device/flash, +/obj/item/device/flash, +/obj/item/device/flash, +/obj/item/device/flash, +/obj/item/device/flash, +/obj/item/device/flash, +/obj/item/melee/telebaton, +/obj/item/melee/telebaton, +/obj/item/melee/telebaton, +/obj/item/melee/telebaton, +/obj/item/melee/telebaton, +/obj/item/melee/telebaton, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"gg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +>>>>>>> theirs + dir = 4 + }, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"gh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/obj/machinery/meter, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"gi" = ( +/obj/structure/catwalk, +/obj/machinery/porta_turret{ + req_access = list("ACCESS_CENT_SPECOPS") + }, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"gj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "gk" = ( +<<<<<<< ours /obj/structure/table/steel_reinforced, /obj/machinery/recharger{ pixel_y = 4 @@ -3121,22 +3175,46 @@ /obj/floor_decal/corner/paleblue, /obj/floor_decal/floordetail/edgedrain{ dir = 9 +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"gl" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide{ + maximum_pressure = 12000; + start_pressure = 12000 +>>>>>>> theirs + }, +/obj/machinery/atmospherics/portables_connector, +/obj/floor_decal/industrial/outline/orange, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) "gm" = ( -/obj/machinery/atmospherics/unary/cryo_cell, -/obj/machinery/light{ - dir = 8 +/obj/structure/bed/chair/shuttle/blue{ + dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) "gn" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, -/turf/simulated/floor/tiled/white, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "go" = ( +<<<<<<< ours /obj/item/device/radio/intercom/specops{ dir = 8; pixel_x = 22 @@ -3145,40 +3223,84 @@ dir = 8 }, /turf/simulated/floor/tiled/white, +======= +/obj/structure/bed/chair/shuttle/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +>>>>>>> theirs /area/map_template/rescue_base/start) "gp" = ( -/obj/item/stool, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "gq" = ( -/obj/structure/hygiene/toilet{ +/obj/structure/table/steel_reinforced, +/obj/item/newspaper, +/obj/item/storage/fancy/smokable/dromedaryco, +/obj/floor_decal/techfloor{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) "gr" = ( -/obj/structure/table/rack, -/obj/random/solgov, -/turf/simulated/floor/tiled/dark, +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) "gs" = ( -/obj/structure/closet/crate/freezer/rations, -/turf/simulated/floor/plating, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1331; + id_tag = "rescue_shuttle"; + pixel_x = -8; + pixel_y = 25 + }, +/obj/machinery/airlock_sensor{ + frequency = 1331; + id_tag = "rescue_shuttle_sensor"; + pixel_x = 8; + pixel_y = 25 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/map_template/rescue_base/start) "gt" = ( -/turf/simulated/floor/plating, +/obj/structure/closet/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) "gu" = ( -/obj/machinery/shieldwallgen, -/turf/simulated/floor/plating, -/area/map_template/rescue_base/start) -"gv" = ( -/obj/structure/closet/secure_closet/chemical, -/turf/simulated/floor/tiled/white, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "gw" = ( /turf/simulated/floor/tiled/white, /area/map_template/rescue_base/start) +<<<<<<< ours "gx" = ( /turf/simulated/floor/reinforced, /area/map_template/rescue_base/start) @@ -3192,9 +3314,28 @@ /obj/item/device/radio/intercom/hailing{ dir = 8; pixel_x = 24 +======= +"gy" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"gz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 +>>>>>>> theirs }, +/obj/floor_decal/techfloor, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) +<<<<<<< ours "gz" = ( /obj/machinery/door/airlock/external{ frequency = 1331; @@ -3251,15 +3392,68 @@ }, /obj/floor_decal/floordetail/edgedrain{ dir = 1 +======= +"gA" = ( +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/steel_reinforced, +/obj/item/newspaper, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"gB" = ( +/obj/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"gC" = ( +/obj/structure/bed/chair/shuttle/blue{ + dir = 4 + }, +/obj/machinery/vending/wallmed1{ + dir = 4; + name = "Emergency NanoMed"; + pixel_x = -30 + }, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"gF" = ( +/obj/structure/bed/chair/shuttle/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/obj/floor_decal/techfloor{ + dir = 8 +>>>>>>> theirs + }, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) "gG" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = -25 +/obj/structure/closet/secure_closet/guncabinet{ + locked = 0; + req_access = list("ACCESS_CENT_SPECOPS") }, -/turf/simulated/floor/tiled/dark, +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/ammo/doublestack, +/obj/item/storage/box/ammo/doublestack, +/obj/item/gun/projectile/pistol/m22f, +/obj/item/gun/projectile/pistol/m22f, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) +<<<<<<< ours "gJ" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled/dark, @@ -3298,23 +3492,72 @@ /obj/machinery/optable, /obj/machinery/light{ dir = 4 +======= +"gH" = ( +/obj/machinery/computer/shuttle_control/multi/rescue{ + dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) -"gP" = ( -/obj/machinery/button/flasher{ - id_tag = "rescueflash"; - name = "Flasher"; - pixel_x = 27 +"gI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/structure/bed/chair{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/light{ +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"gJ" = ( +/obj/machinery/computer/prisoner{ + dir = 4; + name = "Implant Management" + }, +/obj/floor_decal/techfloor{ dir = 4 }, +/obj/item/device/radio/intercom/hailing{ + dir = 1; + pixel_y = -28 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"gK" = ( +/obj/machinery/mech_recharger, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/light, +/obj/floor_decal/techfloor{ + dir = 1 +>>>>>>> theirs + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"gL" = ( +/obj/floor_decal/techfloor/corner{ + dir = 1 + }, +/obj/machinery/vending/tool, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"gM" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/floor_decal/techfloor{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) +<<<<<<< ours "gQ" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, @@ -3341,53 +3584,88 @@ /obj/structure/hygiene/sink{ dir = 4; pixel_x = 22 +======= +"gN" = ( +/obj/structure/closet/hydrant{ + pixel_x = -32 }, -/turf/simulated/floor/tiled/white, +/obj/structure/bed/chair/shuttle/blue{ + dir = 4 + }, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) -"gT" = ( -/obj/item/device/flashlight/lantern, +"gP" = ( +/obj/item/device/radio/intercom/specops{ + pixel_y = 22 + }, +/obj/structure/table/rack, +/obj/item/mech_equipment/ballistic_shield, +/obj/item/mech_equipment/shields, /turf/unsimulated/floor{ - icon_state = "asteroid" + icon_state = "dark" +>>>>>>> theirs }, /area/map_template/rescue_base/base) -"gU" = ( -/obj/wallframe_spawn/reinforced/titanium, +"gQ" = ( +/obj/structure/table/rack, +/obj/item/storage/box/ammo/doublestack, +/obj/item/storage/box/ammo/doublestack, +/obj/item/gun/projectile/pistol/m22f, +/obj/item/gun/projectile/pistol/m22f, +/obj/item/gun/projectile/pistol/m22f, +/obj/item/gun/projectile/pistol/m22f, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"gR" = ( /obj/machinery/door/blast/regular{ density = 0; - dir = 4; icon_state = "pdoor0"; - id_tag = "rescuebridge"; + id_tag = "rescuedock"; name = "Blast Shutters"; opacity = 0 }, -/obj/paint/hull, +/obj/wallframe_spawn/reinforced, +/obj/paint/merc, /turf/simulated/floor/plating, /area/map_template/rescue_base/start) -"gV" = ( -/obj/structure/bed/chair{ +"gS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/map_template/rescue_base/start) -"gW" = ( -/obj/structure/closet{ - name = "Prisoner's Locker" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/item/clothing/shoes/orange, -/obj/item/clothing/under/color/orange, -/obj/item/device/radio/intercom/specops{ - dir = 8; - pixel_x = 22 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, +/obj/floor_decal/techfloor, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) -"gX" = ( -/obj/paint/sun, -/turf/simulated/wall/titanium, -/area/map_template/rescue_base/start) -"gY" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 +"gT" = ( +/obj/item/device/flashlight/lantern, +/turf/unsimulated/floor{ + icon_state = "asteroid" + }, +/area/map_template/rescue_base/base) +"gU" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"gY" = ( +<<<<<<< ours +/obj/structure/bed/chair/shuttle{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) @@ -3413,18 +3691,40 @@ /obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /turf/simulated/floor/tiled/dark/monotile, +======= +/obj/structure/table/steel_reinforced, +/obj/item/material/ashtray/glass, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) -"hb" = ( -/obj/wallframe_spawn/reinforced/titanium, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id_tag = "rescueinfirm"; - name = "Blast Shutters"; - opacity = 0 +"gZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"ha" = ( +/obj/structure/handrail, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/floor_decal/techfloor{ + dir = 1 }, -/obj/paint/hull, +/turf/simulated/floor/tiled/dark, +>>>>>>> theirs +/area/map_template/rescue_base/start) +"hb" = ( +/obj/structure/catwalk, +/obj/machinery/shipsensors, /turf/simulated/floor/plating, /area/map_template/rescue_base/start) "hc" = ( @@ -3434,28 +3734,33 @@ }, /area/map_template/rescue_base/base) "hd" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/cans/cola, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" }, -/turf/simulated/floor/tiled/dark, -/area/map_template/rescue_base/start) +/area/map_template/rescue_base/base) "he" = ( -/obj/structure/closet{ - name = "Prisoner's Locker" +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/obj/floor_decal/techfloor{ + dir = 1 }, -/obj/item/clothing/shoes/orange, -/obj/item/clothing/under/color/orange, /turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) "hf" = ( -/obj/structure/shuttle/engine/propulsion, -/obj/paint/sun, -/turf/simulated/wall/titanium, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/light{ + dir = 1 + }, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/map_template/rescue_base/start) "hg" = ( +<<<<<<< ours /obj/machinery/computer/shuttle_control/multi/rescue, /obj/machinery/light{ dir = 8 @@ -3472,155 +3777,1659 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, +======= +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plating, /area/map_template/rescue_base/start) -"hj" = ( -/obj/floor_decal/industrial/warning{ - dir = 10 +"hi" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 }, -/turf/unsimulated/floor{ - icon_state = "asteroidfloor" +/turf/simulated/floor/plating, +>>>>>>> theirs +/area/map_template/rescue_base/start) +"hn" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 }, -/area/map_template/rescue_base/base) -"hk" = ( -/obj/floor_decal/industrial/warning, /turf/unsimulated/floor{ - icon_state = "asteroidfloor" + icon_state = "dark" }, /area/map_template/rescue_base/base) -"hl" = ( -/obj/floor_decal/industrial/warning{ - dir = 6 +"hs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/map_template/rescue_base/start) +"hx" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 26 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"hF" = ( +/obj/structure/closet{ + name = "Prisoner's Locker" + }, +/obj/item/clothing/shoes/orange, +/obj/item/clothing/shoes/orange, +/obj/item/clothing/under/color/orange, +/obj/item/clothing/under/color/orange, +/obj/floor_decal/techfloor/corner{ + dir = 1 }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"hL" = ( +/obj/structure/table/rack, +/obj/item/clothing/under/iccgn/utility, +/obj/item/clothing/under/iccgn/utility, +/obj/item/clothing/under/iccgn/utility, +/obj/item/clothing/under/iccgn/utility, +/obj/item/clothing/under/iccgn/utility, +/obj/item/clothing/under/iccgn/utility, +/obj/item/clothing/head/iccgn/beret, +/obj/item/clothing/head/iccgn/beret, +/obj/item/clothing/head/iccgn/beret, +/obj/item/clothing/head/iccgn/beret, +/obj/item/clothing/head/iccgn/beret, +/obj/item/clothing/head/iccgn/beret, /turf/unsimulated/floor{ - icon_state = "asteroidfloor" + dir = 1; + icon_state = "vault" }, /area/map_template/rescue_base/base) -"qv" = ( +"hU" = ( +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"ia" = ( /obj/structure/table/reinforced, -/obj/item/mech_equipment/sleeper, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) -"to" = ( +"ic" = ( /obj/structure/table/reinforced, -/obj/item/mech_equipment/ballistic_shield, +/obj/machinery/cell_charger, +/obj/item/cell/super, +/obj/item/cell/super, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"xA" = ( -/obj/structure/table/reinforced, -/obj/item/robot_parts/robot_component/actuator, -/obj/item/robot_parts/robot_component/actuator, +"ir" = ( +/obj/structure/table/rack, +/obj/item/storage/backpack/dufflebag/iccgn_accessories, +/obj/item/storage/backpack/dufflebag/iccgn_accessories, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"zv" = ( -/obj/machinery/mech_recharger, -/mob/living/exosuit/premade/light, +"iA" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 26 + }, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"je" = ( +/obj/structure/table/rack, +/obj/item/clothing/accessory/helmet_cover/pcrc, +/obj/item/clothing/accessory/helmet_cover/pcrc, +/obj/item/clothing/accessory/helmet_cover/pcrc, +/obj/item/clothing/accessory/helmet_cover/pcrc, +/obj/item/clothing/accessory/helmet_cover/pcrc, +/obj/item/clothing/accessory/helmet_cover/pcrc, +/obj/item/clothing/accessory/armor_tag/pcrc, +/obj/item/clothing/accessory/armor_tag/pcrc, +/obj/item/clothing/accessory/armor_tag/pcrc, +/obj/item/clothing/accessory/armor_tag/pcrc, +/obj/item/clothing/accessory/armor_tag/pcrc, +/obj/item/clothing/accessory/armor_tag/pcrc, /turf/unsimulated/floor{ - dir = 8; + dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"CM" = ( -/obj/machinery/mech_recharger, -/mob/living/exosuit/premade/powerloader, +"jh" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/SCG, +/turf/simulated/floor/wood/walnut, +/area/map_template/rescue_base/base) +"jw" = ( +/obj/structure/table/rack, +/obj/item/flamethrower/full/mech, +/obj/item/mech_equipment/mounted_system/melee/mechete, +/obj/item/mech_equipment/mounted_system/taser/laser, +/obj/item/mech_equipment/mounted_system/taser/ion, /turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/map_template/rescue_base/base) -"DF" = ( +"jG" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"jV" = ( +/obj/structure/iv_stand, /obj/structure/handrail{ dir = 4 }, -/obj/item/device/radio/intercom/hailing{ - dir = 4; - pixel_x = -24; - pixel_y = -10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/button/blast_door{ - id_tag = "ert_port_airlock_blast_door"; - name = "Port Exit Shutters Control"; - pixel_x = -24; +/turf/simulated/floor/tiled/white, +/area/map_template/rescue_base/start) +"kg" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + controlled = 0; dir = 4; - pixel_y = 8 + icon_state = "map_vent_in"; + pressure_checks = 2; + pressure_checks_default = 2; + use_power = 1 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/map_template/rescue_base/start) -"Es" = ( -/obj/machinery/telecomms/allinone/ert, -/turf/simulated/floor/plating, +"kC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/map_template/rescue_base/start) -"Fo" = ( -/obj/structure/table/reinforced, -/obj/item/circuitboard/exosystem/medical, -/obj/item/circuitboard/exosystem/utility, -/obj/item/circuitboard/exosystem/engineering, -/obj/item/circuitboard/exosystem/weapons, +"kF" = ( +/obj/structure/table/steel_reinforced, +/obj/item/device/flashlight/lamp, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"kK" = ( +/obj/structure/closet{ + name = "emergency response team wardrobe" + }, +/obj/item/storage/backpack/ert/commander, +/obj/item/clothing/accessory/badge/solgov/tags, +/obj/item/clothing/accessory/solgov/fleet_patch/fifth, +/obj/item/clothing/accessory/armor_tag/solgov/lead, +/obj/item/clothing/head/solgov/dress/fleet/command, +/obj/item/device/personal_shield, +/obj/item/device/hailer, +/obj/item/clothing/glasses/ballistic/security, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"Mv" = ( +"kY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/map_template/rescue_base/start) +"lD" = ( +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"lP" = ( /obj/structure/table/reinforced, -/obj/item/device/kit/mech, +/obj/item/reagent_containers/spray/cleaner, +/obj/machinery/vending/wallmed1{ + dir = 8; + name = "Emergency NanoMed"; + pixel_x = 28 + }, +/obj/item/reagent_containers/spray/sterilizine, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"Tc" = ( -/obj/machinery/mech_recharger, -/obj/structure/heavy_vehicle_frame, +"lV" = ( +/obj/structure/closet/emcloset, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"ml" = ( +/obj/machinery/computer/arcade, +/turf/simulated/floor/wood/walnut, +/area/map_template/rescue_base/base) +"mt" = ( +/obj/machinery/vending/dinnerware, /turf/unsimulated/floor{ dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) -"Vo" = ( -/obj/structure/table/reinforced, -/obj/item/ammo_magazine/shotgunmag/mech, -/obj/item/ammo_magazine/shotgunmag/mech, -/obj/item/ammo_magazine/shotgunmag/mech, -/obj/item/ammo_magazine/shotgunmag/mech, +"mA" = ( +/obj/structure/table/rack, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/box/masks, +/obj/item/storage/box/nitrilegloves, +/obj/item/storage/box/latexgloves, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, /turf/unsimulated/floor{ dir = 1; icon_state = "vault" }, /area/map_template/rescue_base/base) -"Wf" = ( -/obj/structure/table/reinforced, -/obj/item/robot_parts/robot_component/armour/exosuit/combat, +"nq" = ( +/obj/structure/bed/chair, +/obj/machinery/light{ + dir = 1 + }, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"nt" = ( +/obj/machinery/bodyscanner{ + dir = 4 + }, +/turf/simulated/floor/tiled/white/monotile, +/area/map_template/rescue_base/start) +"nF" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/unsimulated/floor{ - dir = 1; + dir = 8; icon_state = "vault" }, /area/map_template/rescue_base/base) - -(1,1,1) = {" -ab -an -at -aA -aJ -aY -bl -ac -ac -ac -ac -ac -ac -ac -ac +"nM" = ( +/obj/structure/catwalk, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"oz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/paint/sun, +/turf/simulated/wall/titanium, +/area/map_template/rescue_base/start) +"oF" = ( +/obj/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/computer/modular/preset/security{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"oK" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"pw" = ( +/obj/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"pT" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"qc" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"qs" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"qM" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/map_template/rescue_base/start) +"ro" = ( +/obj/structure/table/rack, +/obj/item/clothing/accessory/storage/pouches/large/navy, +/obj/item/clothing/accessory/storage/pouches/large/navy, +/obj/item/clothing/accessory/storage/pouches/large/navy, +/obj/item/clothing/accessory/storage/pouches/large/navy, +/obj/item/clothing/accessory/storage/pouches/large/navy, +/obj/item/clothing/accessory/storage/pouches/large/navy, +/obj/item/clothing/accessory/storage/pouches/navy, +/obj/item/clothing/accessory/storage/pouches/navy, +/obj/item/clothing/accessory/storage/pouches/navy, +/obj/item/clothing/accessory/storage/pouches/navy, +/obj/item/clothing/accessory/storage/pouches/navy, +/obj/item/clothing/accessory/storage/pouches/navy, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"rs" = ( +/obj/machinery/pipedispenser, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"rx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"rF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"rQ" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{ + dir = 4; + id_tag = "rescue_shuttle_pump" + }, +/obj/structure/handrail{ + dir = 4 + }, +/obj/machinery/oxygen_pump{ + pixel_x = -32 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor/grid, +/area/map_template/rescue_base/start) +"sb" = ( +/obj/structure/bed/chair/shuttle/blue{ + dir = 8 + }, +/obj/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"sI" = ( +/obj/machinery/door/airlock/centcom{ + name = "Break Room" + }, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/map_template/rescue_base/base) +"tj" = ( +/obj/paint/sfv_arbiter, +/obj/structure/sign/directions/security{ + dir = 8; + pixel_y = -4 + }, +/turf/simulated/wall/r_wall, +/area/map_template/rescue_base/base) +"tw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"tH" = ( +/obj/machinery/jukebox/old, +/turf/simulated/floor/wood/walnut, +/area/map_template/rescue_base/base) +"uv" = ( +/obj/structure/roller_bed, +/obj/machinery/recharger/wallcharger{ + pixel_x = -25 + }, +/turf/simulated/floor/tiled/white, +/area/map_template/rescue_base/start) +"ux" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/floor_decal/techfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"uO" = ( +/obj/machinery/portable_atmospherics/powered/scrubber, +/obj/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"vd" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"vk" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/map_template/rescue_base/start) +"vv" = ( +/obj/structure/table/rack, +/obj/item/clothing/shoes/iccgn/utility, +/obj/item/clothing/shoes/iccgn/utility, +/obj/item/clothing/shoes/iccgn/utility, +/obj/item/clothing/shoes/iccgn/utility, +/obj/item/clothing/shoes/iccgn/utility, +/obj/item/clothing/shoes/iccgn/utility, +/obj/item/clothing/gloves/iccgn/duty, +/obj/item/clothing/gloves/iccgn/duty, +/obj/item/clothing/gloves/iccgn/duty, +/obj/item/clothing/gloves/iccgn/duty, +/obj/item/clothing/gloves/iccgn/duty, +/obj/item/clothing/gloves/iccgn/duty, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"vH" = ( +/obj/machinery/door/airlock/centcom{ + name = "Storage" + }, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"vZ" = ( +/obj/structure/handrail{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"wn" = ( +/obj/machinery/vending/lavatory{ + prices = list(); + pixel_x = -32 + }, +/turf/unsimulated/floor{ + icon_state = "freezerfloor" + }, +/area/map_template/rescue_base/base) +"wu" = ( +/obj/structure/table/reinforced, +/obj/item/cell/high, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 32 + }, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"wy" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"xl" = ( +/obj/structure/table/rack, +/obj/item/clothing/accessory/arm_guards, +/obj/item/clothing/accessory/arm_guards, +/obj/item/clothing/accessory/arm_guards, +/obj/item/clothing/accessory/arm_guards, +/obj/item/clothing/accessory/arm_guards, +/obj/item/clothing/accessory/arm_guards, +/obj/item/clothing/accessory/leg_guards, +/obj/item/clothing/accessory/leg_guards, +/obj/item/clothing/accessory/leg_guards, +/obj/item/clothing/accessory/leg_guards, +/obj/item/clothing/accessory/leg_guards, +/obj/item/clothing/accessory/leg_guards, +/obj/item/clothing/suit/armor/pcarrier, +/obj/item/clothing/suit/armor/pcarrier, +/obj/item/clothing/suit/armor/pcarrier, +/obj/item/clothing/suit/armor/pcarrier, +/obj/item/clothing/suit/armor/pcarrier, +/obj/item/clothing/suit/armor/pcarrier, +/obj/item/clothing/accessory/storage/pouches, +/obj/item/clothing/accessory/storage/pouches, +/obj/item/clothing/accessory/storage/pouches, +/obj/item/clothing/accessory/storage/pouches, +/obj/item/clothing/accessory/storage/pouches, +/obj/item/clothing/accessory/storage/pouches, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"xr" = ( +/obj/structure/bed/chair/shuttle/blue{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"xR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"yz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/centcom{ + name = "Brig" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/map_template/rescue_base/start) +"yK" = ( +/obj/machinery/telecomms/allinone/ert, +/obj/floor_decal/industrial/warning/full, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"zn" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"zq" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/simulated/floor/wood/walnut, +/area/map_template/rescue_base/base) +"Av" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/button/blast_door{ + icon_state = "doorctrl0"; + id_tag = "rescuedock"; + name = "Window Shutters Control"; + pixel_x = 24; + pixel_y = -4 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"AK" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/beaglemug{ + pixel_x = -4; + pixel_y = 1 + }, +/turf/simulated/floor/wood/walnut, +/area/map_template/rescue_base/base) +"AR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/paint/sun, +/turf/simulated/wall/titanium, +/area/map_template/rescue_base/start) +"Bg" = ( +/obj/structure/bed/chair/shuttle/blue{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"BR" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/map_template/rescue_base/start) +"BS" = ( +/obj/machinery/recharge_station, +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"BY" = ( +/obj/paint/sun, +/turf/simulated/wall/titanium, +/area/map_template/rescue_base/start) +"Cd" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{ + id_tag = "merc_shuttle_pump_out_external" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"CG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/obj/paint/sun, +/turf/simulated/wall/titanium, +/area/map_template/rescue_base/start) +"CL" = ( +/obj/structure/table/reinforced, +/obj/item/deck/cards, +/turf/simulated/floor/wood/walnut, +/area/map_template/rescue_base/base) +"Da" = ( +/obj/item/taperoll/engineering, +/obj/item/taperoll/engineering, +/obj/item/taperoll/atmos, +/obj/item/taperoll/atmos, +/obj/structure/table/rack, +/obj/item/cell/super, +/obj/item/cell/super, +/obj/item/cell/super, +/obj/item/cell/super, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Dp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/map_template/rescue_base/start) +"Ds" = ( +/obj/landmark{ + name = "Response Team" + }, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/map_template/rescue_base/base) +"DD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"DF" = ( +/obj/structure/table/standard, +/obj/item/storage/firstaid/surgery, +/obj/item/stack/nanopaste, +/obj/item/stack/medical/advanced/bruise_pack, +/obj/item/stack/medical/advanced/bruise_pack, +/obj/item/reagent_containers/dropper/peridaxon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white/monotile, +/area/map_template/rescue_base/start) +"DZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/centcom{ + name = "Passageway" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/map_template/rescue_base/start) +"Ep" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Es" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/map_template/rescue_base/start) +"Ew" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/button/flasher{ + id_tag = "rescueflash"; + name = "Flasher"; + pixel_y = 24 + }, +/obj/item/reagent_containers/food/drinks/decafcoffee, +/obj/item/reagent_containers/spray/pepper, +/obj/item/clothing/mask/chewable/candy/lolli/weak_meds, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"Fl" = ( +/obj/machinery/door/airlock/external{ + frequency = 1331; + id_tag = "rescue_shuttle_outer"; + name = "Ship External Access" + }, +/obj/shuttle_landmark/ert/start, +/turf/simulated/floor/tiled/techfloor/grid, +/area/map_template/rescue_base/start) +"Fw" = ( +/obj/machinery/power/smes/buildable/preset{ + _fully_charged = 1; + _input_maxed = 1; + _input_on = 1; + _output_maxed = 1; + _output_on = 1; + uncreated_component_parts = list(/obj/item/stock_parts/smes_coil/super_io=1,/obj/item/stock_parts/smes_coil/super_capacity=1) + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"Fz" = ( +/obj/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/access_button{ + name = "interior access button"; + pixel_x = 25; + pixel_y = 25; + frequency = 1331; + req_access = list("ACCESS_CENT_SPECOPS"); + command = "cycle_interior"; + master_tag = "rescue_shuttle" + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"Gq" = ( +/obj/structure/closet{ + name = "emergency response team wardrobe" + }, +/obj/item/storage/backpack/ert/medical, +/obj/item/clothing/accessory/solgov/department/medical/fleet, +/obj/item/clothing/accessory/armor_tag/solgov/medic, +/obj/item/clothing/accessory/solgov/fleet_patch/fifth, +/obj/item/clothing/accessory/badge/solgov/tags, +/obj/item/clothing/head/solgov/utility/fleet, +/obj/item/clothing/glasses/ballistic/medic, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Gz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"GU" = ( +/obj/structure/bed/chair, +/turf/simulated/floor/wood/walnut, +/area/map_template/rescue_base/base) +"He" = ( +/obj/structure/table/reinforced, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + pixel_y = 8 + }, +/turf/simulated/floor/wood/walnut, +/area/map_template/rescue_base/base) +"Hh" = ( +/obj/machinery/power/port_gen/pacman, +/obj/item/stack/material/phoron/fifty, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Hn" = ( +/obj/paint/merc, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/wall/titanium, +/area/map_template/rescue_base/start) +"Hw" = ( +/obj/structure/bed/chair/shuttle/blue{ + dir = 8 + }, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"HQ" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/obj/paint/sun, +/turf/simulated/wall/titanium, +/area/map_template/rescue_base/start) +"Ic" = ( +/obj/structure/table/rack, +/obj/item/clothing/suit/armor/pcarrier/navy, +/obj/item/clothing/suit/armor/pcarrier/navy, +/obj/item/clothing/suit/armor/pcarrier/navy, +/obj/item/clothing/suit/armor/pcarrier/navy, +/obj/item/clothing/suit/armor/pcarrier/navy, +/obj/item/clothing/suit/armor/pcarrier/navy, +/obj/item/clothing/accessory/leg_guards/navy, +/obj/item/clothing/accessory/leg_guards/navy, +/obj/item/clothing/accessory/leg_guards/navy, +/obj/item/clothing/accessory/leg_guards/navy, +/obj/item/clothing/accessory/leg_guards/navy, +/obj/item/clothing/accessory/leg_guards/navy, +/obj/item/clothing/accessory/arm_guards/navy, +/obj/item/clothing/accessory/arm_guards/navy, +/obj/item/clothing/accessory/arm_guards/navy, +/obj/item/clothing/accessory/arm_guards/navy, +/obj/item/clothing/accessory/arm_guards/navy, +/obj/item/clothing/accessory/arm_guards/navy, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Il" = ( +/obj/machinery/computer/teleporter, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Iq" = ( +/obj/structure/bed, +/obj/item/bedsheet/orange, +/obj/machinery/flasher{ + id_tag = "rescueflash"; + pixel_y = 28 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"Iu" = ( +/obj/structure/handrail{ + dir = 8 + }, +/obj/item/device/radio/intercom/hailing{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"Jl" = ( +/obj/structure/handrail{ + dir = 8 + }, +/obj/machinery/hologram/holopad/longrange, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"Jv" = ( +/obj/structure/handrail, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"Jw" = ( +/obj/structure/bed/chair/shuttle/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"Ke" = ( +/obj/item/stool, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"KG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"Ly" = ( +/obj/structure/table/rack, +/obj/item/clothing/head/beret/pcrc, +/obj/item/clothing/head/beret/pcrc, +/obj/item/clothing/head/beret/pcrc, +/obj/item/clothing/head/beret/pcrc, +/obj/item/clothing/head/beret/pcrc, +/obj/item/clothing/head/beret/pcrc, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"LE" = ( +/obj/structure/table/rack, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/beakers, +/obj/item/storage/box/syringes, +/obj/item/storage/box/autoinjectors, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"LI" = ( +/obj/structure/bed/chair/shuttle/blue{ + dir = 4 + }, +/obj/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"LQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/centcom{ + name = "Storage" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/map_template/rescue_base/start) +"Mh" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, +/turf/simulated/floor/tiled/white/monotile, +/area/map_template/rescue_base/start) +"MJ" = ( +/obj/item/device/radio/intercom/specops{ + dir = 8; + pixel_x = 24 + }, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/machinery/atmospherics/unary/freezer{ + dir = 8 + }, +/turf/simulated/floor/tiled/white/monotile, +/area/map_template/rescue_base/start) +"MZ" = ( +/obj/paint/merc, +/turf/simulated/wall/titanium, +/area/map_template/rescue_base/start) +"Nw" = ( +/obj/structure/table/rack, +/obj/item/gun/energy/xray, +/obj/item/gun/energy/xray, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Nz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/centcom{ + name = "Engineering" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/map_template/rescue_base/start) +"NC" = ( +/obj/wallframe_spawn/reinforced, +/obj/paint/sun, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"NG" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/cell_charger, +/obj/item/cell/hyper, +/obj/structure/fireaxecabinet{ + pixel_y = 32 + }, +/obj/floor_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"NO" = ( +/obj/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"Oc" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"OS" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/hygiene/toilet{ + dir = 8 + }, +/obj/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"OY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/centcom{ + name = "Seating Area" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/map_template/rescue_base/start) +"OZ" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/head/welding/demon, +/obj/item/weldingtool/largetank, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Po" = ( +/obj/structure/table/rack, +/obj/item/mech_equipment/mounted_system/taser, +/obj/item/mech_equipment/mounted_system/taser, +/obj/item/mech_equipment/ionjets, +/obj/item/mech_equipment/ionjets, +/obj/item/mech_equipment/flash, +/obj/item/mech_equipment/flash, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"PV" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/floor_decal/techfloor, +/obj/machinery/shieldgen, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"Qa" = ( +/obj/structure/table/standard, +/obj/item/storage/firstaid/adv, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/defibrillator/loaded, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/storage/firstaid/combat, +/obj/structure/closet/medical_wall{ + pixel_x = -32 + }, +/obj/item/reagent_containers/dropper/peridaxon, +/obj/item/storage/box/nitrilegloves, +/turf/simulated/floor/tiled/white/monotile, +/area/map_template/rescue_base/start) +"QA" = ( +/obj/structure/table/reinforced, +/obj/item/inducer, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/map_template/rescue_base/base) +"QJ" = ( +/obj/structure/table/rack, +/obj/item/clothing/accessory/armor_plate/tactical, +/obj/item/clothing/accessory/armor_plate/tactical, +/obj/item/clothing/accessory/armor_plate/tactical, +/obj/item/clothing/accessory/armor_plate/tactical, +/obj/item/clothing/accessory/armor_plate/tactical, +/obj/item/clothing/accessory/armor_plate/tactical, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Rl" = ( +/obj/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"Rr" = ( +/obj/machinery/vending/cigarette{ + prices = list() + }, +/turf/simulated/floor/wood/walnut, +/area/map_template/rescue_base/base) +"RM" = ( +/obj/item/device/radio/intercom/specops{ + pixel_y = 22 + }, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"RY" = ( +/obj/structure/table/rack, +/obj/item/storage/belt/holster/security/tactical, +/obj/item/storage/belt/holster/security/tactical, +/obj/item/storage/belt/holster/security/tactical, +/obj/item/storage/belt/holster/security/tactical, +/obj/item/storage/belt/holster/security/tactical, +/obj/item/storage/belt/holster/security/tactical, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Sm" = ( +/obj/machinery/vending/engineering, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Sq" = ( +/obj/structure/table/rack, +/obj/item/clothing/under/saare, +/obj/item/clothing/under/saare, +/obj/item/clothing/under/saare, +/obj/item/clothing/under/saare, +/obj/item/clothing/under/saare, +/obj/item/clothing/head/beret/saare, +/obj/item/clothing/head/beret/saare, +/obj/item/clothing/head/beret/saare, +/obj/item/clothing/head/beret/saare, +/obj/item/clothing/head/beret/saare, +/obj/item/clothing/head/beret/saare, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Sy" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"Tn" = ( +/obj/structure/table/rack, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Tu" = ( +/obj/structure/table/rack, +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"TA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/centcom{ + name = "Infirmary" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/map_template/rescue_base/start) +"Ug" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id_tag = "rescuedock"; + name = "Blast Shutters"; + opacity = 0 + }, +/obj/wallframe_spawn/reinforced, +/obj/paint/sun, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"UV" = ( +/obj/structure/table/rack, +/obj/item/device/scanner/health/mech, +/obj/item/device/scanner/health/mech, +/obj/item/mech_equipment/sleeper, +/obj/item/mech_equipment/sleeper, +/obj/item/mech_equipment/mender, +/obj/item/mech_equipment/mender, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Vz" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"VG" = ( +/obj/machinery/fabricator/hacked, +/obj/item/stack/material/steel{ + amount = 50; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stack/material/steel{ + amount = 50; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stack/material/glass{ + amount = 50 + }, +/obj/item/device/radio/intercom/specops{ + pixel_y = 22 + }, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"VO" = ( +/obj/structure/table/rack, +/obj/item/gun/projectile/automatic/bullpup_rifle/light, +/obj/item/gun/projectile/automatic/bullpup_rifle/light, +/obj/item/gun/projectile/automatic/bullpup_rifle/light, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Ww" = ( +/obj/machinery/vending/medical, +/turf/simulated/floor/tiled/white/monotile, +/area/map_template/rescue_base/start) +"Wy" = ( +/obj/structure/handrail{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{ + dir = 4; + id_tag = "rescue_shuttle_pump" + }, +/obj/machinery/oxygen_pump{ + pixel_x = 32 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor/grid, +/area/map_template/rescue_base/start) +"WA" = ( +/obj/item/device/radio/intercom/specops{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/wood/walnut, +/area/map_template/rescue_base/base) +"WB" = ( +/obj/structure/table/rack, +/obj/item/clothing/accessory/storage/pouches/tan, +/obj/item/clothing/accessory/storage/pouches/tan, +/obj/item/clothing/accessory/storage/pouches/tan, +/obj/item/clothing/accessory/storage/pouches/tan, +/obj/item/clothing/accessory/storage/pouches/large/tan, +/obj/item/clothing/accessory/storage/pouches/large/tan, +/obj/item/clothing/accessory/storage/pouches/large/tan, +/obj/item/clothing/accessory/storage/pouches/large/tan, +/obj/item/clothing/accessory/storage/pouches/green, +/obj/item/clothing/accessory/storage/pouches/green, +/obj/item/clothing/accessory/storage/pouches/green, +/obj/item/clothing/accessory/storage/pouches/green, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +<<<<<<< ours +"qv" = ( +/obj/structure/table/reinforced, +/obj/item/mech_equipment/sleeper, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"to" = ( +/obj/structure/table/reinforced, +/obj/item/mech_equipment/ballistic_shield, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"xA" = ( +/obj/structure/table/reinforced, +/obj/item/robot_parts/robot_component/actuator, +/obj/item/robot_parts/robot_component/actuator, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"zv" = ( +/obj/machinery/mech_recharger, +/mob/living/exosuit/premade/light, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"CM" = ( +/obj/machinery/mech_recharger, +/mob/living/exosuit/premade/powerloader, +======= +"WJ" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 26 + }, +/obj/item/device/radio/intercom/specops{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{ + dir = 4; + id_tag = "rescue_shuttle_pump" + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/map_template/rescue_base/start) +"XF" = ( +/obj/structure/table/rack, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/box/glowsticks, +/obj/item/inflatable_dispenser, +>>>>>>> theirs +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +<<<<<<< ours +"DF" = ( +/obj/structure/handrail{ + dir = 4 + }, +/obj/item/device/radio/intercom/hailing{ + dir = 4; + pixel_x = -24; + pixel_y = -10 + }, +/obj/machinery/button/blast_door{ + id_tag = "ert_port_airlock_blast_door"; + name = "Port Exit Shutters Control"; + pixel_x = -24; + dir = 4; + pixel_y = 8 + }, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"Es" = ( +/obj/machinery/telecomms/allinone/ert, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"Fo" = ( +/obj/structure/table/reinforced, +/obj/item/circuitboard/exosystem/medical, +/obj/item/circuitboard/exosystem/utility, +/obj/item/circuitboard/exosystem/engineering, +/obj/item/circuitboard/exosystem/weapons, +======= +"XO" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/map_template/rescue_base/start) +"Yv" = ( +/obj/structure/table/rack, +/obj/item/storage/backpack/dufflebag/scga_accessories, +/obj/item/storage/backpack/dufflebag/scga_accessories, +>>>>>>> theirs +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +<<<<<<< ours +"Mv" = ( +/obj/structure/table/reinforced, +/obj/item/device/kit/mech, +======= +"YA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +"YD" = ( +/obj/structure/closet/bombclosetsecurity, +/obj/item/clothing/suit/bomb_suit/security, +/obj/item/clothing/head/bomb_hood/security, +/obj/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"ZC" = ( +/obj/item/device/radio/intercom/specops{ + pixel_y = 22 + }, +/obj/machinery/pipedispenser, +>>>>>>> theirs +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +<<<<<<< ours +"Tc" = ( +/obj/machinery/mech_recharger, +/obj/structure/heavy_vehicle_frame, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Vo" = ( +/obj/structure/table/reinforced, +/obj/item/ammo_magazine/shotgunmag/mech, +/obj/item/ammo_magazine/shotgunmag/mech, +/obj/item/ammo_magazine/shotgunmag/mech, +/obj/item/ammo_magazine/shotgunmag/mech, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +"Wf" = ( +/obj/structure/table/reinforced, +/obj/item/robot_parts/robot_component/armour/exosuit/combat, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "vault" + }, +/area/map_template/rescue_base/base) +======= +"ZD" = ( +/obj/structure/closet/crate/freezer/rations, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/map_template/rescue_base/start) +"ZO" = ( +/obj/machinery/vending/wallmed1{ + dir = 8; + name = "Emergency NanoMed"; + pixel_x = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/map_template/rescue_base/start) +>>>>>>> theirs + +(1,1,1) = {" +ac +ac +ab +an +at +aA +aJ +aY +bl +ac +ac +ac +ac +ac +ac ac ac ac @@ -3685,12 +5494,12 @@ ac ac ac ac -bA -bB ac -bA -bB -dp +ac +ac +ac +ac +ac ac ac ac @@ -3744,26 +5553,29 @@ ac ac ac ac +aE +aE +aE +aE +aE +aE +aE +aE +aE +aE +aE +aE +aE +aE ac ac ac ac -bK -bA -bA -bA -dd -bA -bA ac ac ac ac ac -ad -ad -ad -ad ac ac ac @@ -3793,11 +5605,258 @@ ac ac ac ac +"} +(4,1,1) = {" +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +aE +gf +Tn +gQ +ds +Ic +vv +xl +dF +dq +Yv +cI +dm +aE +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +"} +(5,1,1) = {" +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +aE +RY +ao +ao +ao +ao +ao +ao +ao +ao +ao +ao +je +aE +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +"} +(6,1,1) = {" +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +aE +cV +ao +ao +ao +ao +ao +ao +ao +ao +ao +ao +Ly +aE +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +"} +(7,1,1) = {" +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +aE +QJ +ao +ao +ao +ao +ao +ao +ao +ao +ao +ao +fs +aE +ac +ac +ac +ac +ad +ad +ad +ad +ac +ac +ac +ac +ac +ac +ac +<<<<<<< ours +ac +======= +>>>>>>> theirs +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ac ac ac -"} -(4,1,1) = {" ac ac ac @@ -3806,20 +5865,32 @@ ac ac ac ac +"} +(8,1,1) = {" ac ac ac ac ac -bB -bA -bA -bC -bA -bA -bA -bB -bK +aE +aE +aE +aE +aE +aE +ro +eF +dP +ao +ei +ir +hL +fu +WB +eA +Sq +aP +aE ac ac ac @@ -3850,9 +5921,13 @@ ac ac ac ac +<<<<<<< ours ac ac ac +======= +bA +>>>>>>> theirs ac ac ac @@ -3861,30 +5936,32 @@ ac ac ac "} -(5,1,1) = {" -ac -ac -ac +(9,1,1) = {" ac ac ac ac ac +aE +aK +ar +ar +bu +aE +aE +tj +vH +ah +aE +aE +aE +aE +aE +aE +aE +aE +aE ac -ad -ad -ad -ad -bA -bA -bA -bA -bB -bB -bK -bA -bA -bA ac ac ac @@ -3913,11 +5990,17 @@ ac ac ac ac +<<<<<<< ours ac ac ac ac ac +======= +gT +bA +hc +>>>>>>> theirs ac ac ac @@ -3925,29 +6008,31 @@ ac ac ac "} -(6,1,1) = {" +(10,1,1) = {" +ac +ac +ac +ac +ac +aE +aL +ar +ar +bv +aE +aE +bQ +dP +dP +dP +aE +ac +ac +ac +ac ac ac ac -ad -ad -ad -ad -ad -ad -ad -bU -bY -ad -ad -ad -bg -bg -bg -bg -bg -ad -ad ac ac ac @@ -3959,7 +6044,10 @@ ad ac ac ac +<<<<<<< ours +======= ac +>>>>>>> theirs ac ac ac @@ -3989,30 +6077,32 @@ ac ac ac "} -(7,1,1) = {" +(11,1,1) = {" ac ac ac -ad -aK -aZ -aZ -bu -ad -bO -ao -ao -bO -ad -ar -ar -ar -ar +ac +aE +aE +aE +ba +aE +aE +aE +aE +bP ar ar -dq -ad +bP +aE ac +dp +bA +dd +bA +bA +bA +bK ac ac ac @@ -4022,8 +6112,12 @@ ad ad ac ac +<<<<<<< ours +======= +ac ac ac +>>>>>>> theirs ac ac ac @@ -4040,6 +6134,7 @@ ac ac ac ac +<<<<<<< ours ac ac ac @@ -4047,35 +6142,44 @@ ac ac ac ac +======= +bB +bA +>>>>>>> theirs +ac +ac ac ac ac ac ac "} -(8,1,1) = {" +(12,1,1) = {" ac ac ac -ad -aL -aZ -aZ -bv -ad -bP -bV -bV -bP -ad +ac +aE +bz ar -cA ar -cP -cP ar -dr -ad +ar +bw +aE +fe +Ds +Ds +fe +aE +bA +bC +bB +bA +bA +bB +bK +ek ac ac ac @@ -4095,6 +6199,7 @@ ac ac ac ac +<<<<<<< ours ac ac ac @@ -4111,35 +6216,51 @@ hc ac ac ac +======= +bB +bB +bB +bB +bB +bB +fB +bB +>>>>>>> theirs ac ac ac ac ac "} -(9,1,1) = {" +(13,1,1) = {" ac ac ac -ad -ad -ba -ad -ad -ad -bO -ao -ao -bO -ad -cv -cB +ac +aE +mt ar -cP -cP +Ep +Ep ar -ds -ad +by +aE +Gq +ar +ar +Gq +aE +bA +bA +bB +bB +bK +bA +bA +bA +ac +ac +ac ac ac ac @@ -4147,6 +6268,21 @@ ac ac ac ac +<<<<<<< ours +======= +bB +bB +bB +bB +bA +bA +fB +bB +bB +>>>>>>> theirs +ac +ac +ac ac ac ac @@ -4163,56 +6299,56 @@ ac ac ac ac +bA +bA +<<<<<<< ours ac ac ac +======= +bB +>>>>>>> theirs ac ac ac ac -bA -bA ac +"} +(14,1,1) = {" ac ac ac ac +aE +aM +ar +hd +cW +ar +cz +ah +bO +Ds +Ds +bO +aE +bK +bB +bB +cc +bA +bB +dd ac ac ac -"} -(10,1,1) = {" ac ac ac -ad -aM -aZ -bm -bw -ad -bP -bV -bV -bP -ad -ar -cC -ar -cP -cP -ar -dt -ad -ad -ad -ad -ad -ad -ad ac ac ac +<<<<<<< ours ac ac ac @@ -4240,46 +6376,76 @@ bB ac ac ac +======= +bB +bB +bB +bB +bB +bB +bB +bB +bB +bB +bB +bB +bB +bB +bB +bB +bB +bB +bB +bA +bB +bB +bB +bB +bA +>>>>>>> theirs ac ac ac ac "} -(11,1,1) = {" +(15,1,1) = {" ac ac ac -ad +ac +aE aN -aZ -aZ -bx -ad -bO -ao -ao -bO -ad -ar ar +ia +fr ar +cf +ah +eZ ar ar -ar -du -bg -ar -ar -dS -ef -er -ad +eZ +aE +aE +ah +ah +ah +ah +aE +aE +ac +ac +ac ac ac ac ac ac ac +<<<<<<< ours +ac +ac +ac ac ac ac @@ -4310,34 +6476,75 @@ ac ac "} (12,1,1) = {" +======= +bB +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +bB +dd +bA ac ac ac -ad -aO -aZ -aZ -by -ad -bQ -bV -bV -bP -ad +"} +(16,1,1) = {" +>>>>>>> theirs +ac +ac +ac +ac +aE +er ar +vd +vd ar ar +aE +cU +Ds +Ds +aV +dn ar ar ar -dv -bg ar +<<<<<<< ours dO ef eg +======= +>>>>>>> theirs ar -ad +dr +aE +ac +ac +ac +ac +ac +ac ac ac ac @@ -4363,27 +6570,53 @@ ac ac ac bB +<<<<<<< ours bA bB ac ac ac ac +======= +bC +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +bB +bA +bA +>>>>>>> theirs ac ac ac "} -(13,1,1) = {" +(17,1,1) = {" ac ac ac -ad -aP -aZ -aZ -aZ -bJ +ac +aE ar +<<<<<<< ours ao ao ao @@ -4402,18 +6635,85 @@ dU ao dP ad +======= +ar +ar +ar +ar +ar +bJ +ar +ar +ar +eM +ef +ar +cA +ar +zn +zn +ar +aE +ac +ac +ac +ac +ac +ac +>>>>>>> theirs +ac +ac ac ac ac ac +bB +<<<<<<< ours +ac +ac +ac +ac +ac +bB +bB ac ac +ac +ac +ac +ac +ac +ac +ac +======= +bA +eQ +eT +eQ +eQ +eQ +eQ +eQ +eQ +MZ +gR +gR +gR +gR +MZ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +>>>>>>> theirs bB -ac -ac -ac -ac -ac +bB +bB +fB bB bB ac @@ -4423,54 +6723,68 @@ ac ac ac ac +"} +(18,1,1) = {" ac -ac -bB -bB -bB -fB -bB -bB +aE +aE +aE +aE +bb +aE +aE +ah +sI +ah +aE +aE +bW +bW +aE +aE +aU +cB +ar +zn +zn +ar +aE ac ac ac ac ac -"} -(14,1,1) = {" ac -ad -ad -ad -ad -bb -ad -bz -ad -bR -ar -ar -ca -ad -cw -cD -cL -cQ -de -ao -ao -bg -ar -ao -ao -ao -et -ad ac ac ac ac bB +<<<<<<< ours +======= +eQ +eQ +eQ +eQ +eQ +eQ +eQ +MZ +MZ +oF +aR +gH +gJ +MZ +MZ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +>>>>>>> theirs bB ac ac @@ -4479,6 +6793,7 @@ ac bB ac ac +<<<<<<< ours bB ac ac @@ -4498,38 +6813,42 @@ bB ac ac ac +======= +>>>>>>> theirs ac ac "} -(15,1,1) = {" +(19,1,1) = {" ac -ad +aE au -aB aQ +wn aB -ad -ad -ad -ad -bW -bW -ad -ad -bg -bg -bg -ad -ad -dl -dl -ad -bg -bg -dV -ad -ad -ad +aE +Rr +aA +aA +aA +tH +aE +ar +ar +ah +ar +ar +cC +ar +zn +zn +ar +aE +ac +ac +ac +ac +ac +ac ac ac bB @@ -4538,6 +6857,7 @@ bB bB ac bB +<<<<<<< ours bB bB bB @@ -4563,43 +6883,100 @@ ac ac ac ac +======= +eQ +eQ +eQ +eQ +eQ +eQ +eQ +MZ +eU +fn +xr +xr +fn +fS +MZ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +bB +bB +bA +bC +>>>>>>> theirs +ac ac "} -(16,1,1) = {" -ac -ad -ad -ad -aR +(20,1,1) = {" +aE +aE +aE +aE bc -ad -bA -bB -bg +aB +aE +ml +aA +aA +GU +CL +ah ar ar -ad -cc -cx -cE -cM -cR -bg -ao -ao -bg -dD +cb ar ar -eh -ad -ac +ar +ar +ar +ar +ar +aE +aE +aE +aE +aE +aE +aE ac ac bB bB +<<<<<<< ours +======= +eQ +eQ +eQ +eQ +eQ +eQ +gi +MZ +eC +Jl +KG +Av +Iu +ct +MZ +gi +eQ +eQ +eQ +eQ +eQ +eQ +>>>>>>> theirs bB bB +bA bB bB bB @@ -4628,40 +7005,68 @@ ac ac ac ac -"} -(17,1,1) = {" ac -ad -av +"} +(21,1,1) = {" +aE av -aR +dE +aE bc -ad -bB -bK -bg +aB +aE +AK +aA +aA +GU +jh +ah ar ar -bg -cd +ah +ey ar ar ar +dD ar -bg +ar +aE +db +eg ao ao -bg -dE -ar -ar -ei -bg -bB -bB +bR +aE +ac bB bB bA +<<<<<<< ours +======= +eQ +eQ +eQ +eQ +eQ +MZ +MZ +MZ +MZ +MZ +aO +MZ +MZ +MZ +MZ +MZ +MZ +eQ +eQ +eQ +eQ +eQ +>>>>>>> theirs bB bB bB @@ -4692,40 +7097,45 @@ ac ac ac ac -"} -(18,1,1) = {" ac -ad -aw -aB +ac +"} +(22,1,1) = {" +aE +bm +bm aS aB -ad -bC -bA -bg +aB +aE +He +aA +aA +WA +zq +ah ar ar -bg -ce +ah +cx +cw +cD ar ar ar ar -df +aE +aW +dU +es ao -dw -ad -dF -ar -ar -ej -bg +kK +aE bB -bA bB bA bB +<<<<<<< ours bB bB bA @@ -4754,42 +7164,73 @@ bB ac ac ac +======= +eQ +eQ +eQ +eQ +eQ +MZ +rs +ej +aC +MZ +aD +pw +MZ +Iq +qs +Ke +MZ +eQ +eQ +eQ +eQ +eQ +bB +bA +bB +>>>>>>> theirs +ac ac ac "} -(19,1,1) = {" -ac -ad -ad -ad -ad -ad -ad -ad -ad -ad +(23,1,1) = {" +aE +aE +aE +aE +aE +aE +aE +aE +aE +aE +aE +aE +aE ar ar -bg -cf -ao -ao -ao -ao -dg -ao -ao -dz -ao +aE +ah +ah +ah +aE +aE +dl +dl +aE ao +hn +ar ao -ek -bg -bB -bC +dc +ah +bA bB bB bB +<<<<<<< ours bB bB bB @@ -4816,44 +7257,73 @@ bB bB bB bB +======= +eQ +eQ +eQ +eQ +MZ +MZ +fy +hg +qc +MZ +ha +hU +MZ +OS +cv +gA +MZ +MZ +eQ +eQ +eQ +eQ +>>>>>>> theirs bB bB +bA ac ac -"} -(20,1,1) = {" -ac ac +"} +(24,1,1) = {" ac -ad +aE +aE aT bd -ad -bD -bL -ad +aE +cE +cM +be +bo +eG +cR +aE ar ar -ad -cg -ao -cF -cN -ao -dg -ao +ah +et ao -dz ao +fv +ah +ar +ar +ah ao +ar +ar ao -el -bg -bB -bB +bt +ah +bC bB bA bB +<<<<<<< ours bB bB bB @@ -4946,47 +7416,142 @@ eP eP eP hj +======= +eQ +eQ +eQ +eQ +MZ +NG +hi +gI +tw +Nz +fO +fZ +MZ +Ew +fn +fn +kF +MZ +eQ +eQ +eQ +eQ +bB +bB +bA +>>>>>>> theirs ac ac -"} -(22,1,1) = {" -ac ac +"} +(25,1,1) = {" ac -ad +aE +bL ao ao +aE +dg +ao ao ao ao -ad +cd +aE ar ar -ad -ch -ao -ao -ao +ah +ca ao -dh ao +cT +ah +ar +ar +dz ao -dA ao ao ao +ai +aE +bB +bB +bB +bB +eQ +eQ +eQ +eQ +MZ +PV +nM +fE +cS +MZ +NO +gg +MZ +nq +Sy +eS +gr +MZ +eQ +eQ +eQ +eQ +bB +bC +ac +ac +ac +ac +"} +(26,1,1) = {" +ac +aE +bD ao ao -ch -ad +aE +ar +ar +ar +ar +ar +ar +bS +ar +ar +ah +cm +ar +ar +cj +aE +ar +ar +aE +aE +ah +ah +ah +aE +aE +aE bB bB dd -eN eQ eQ eQ eQ +<<<<<<< ours +<<<<<<< ours eQ eQ eQ @@ -5010,47 +7575,76 @@ eQ eQ eQ hk +======= +fp +======= +MZ +>>>>>>> theirs +gl +jG +gh +uO +MZ +RM +YA +MZ +fR +Gz +vZ +hF +MZ +eQ +eQ +eQ +eQ +bB +bB +bB +>>>>>>> theirs ac ac -"} -(23,1,1) = {" ac +"} +(27,1,1) = {" ac -ad -ad -ad -ad -ad +aE +VG +ao +ao bE -ad -ad ar ar -bg -ci -ao -ao -ao -ao +ar +ar +ar +ar +bS +ar +ar +ah +mA +ar +ar +ar dh -ao -ao +ar +ar dA ao ao ao ao ao -ci -bg +Da +aE bB bA bB -eN eQ gZ eQ eQ +<<<<<<< ours eQ eQ eQ @@ -5074,52 +7668,73 @@ gX gX eQ hk +======= +kg +MZ +yK +hx +XO +dT +MZ +fT +ga +MZ +MZ +yz +MZ +MZ +MZ +eQ +eQ +eQ +eQ +bB +bA +bB ac +>>>>>>> theirs ac -"} -(24,1,1) = {" ac +"} +(28,1,1) = {" ac -ad -aC -aV -be -bo +aE +VO +ao +ao +aE +bM +ao +ao +ao ao +cV +aE ar -ad +ar +ah +LE ar ar -bg -cj ar -cG +dh ar ar -di +dA ao ao -dB -ar -ar -dW -em -ar -ey -bg +ao +ao +ao +cK +ah bB bB bA -eN -eQ -eQ -eQ -eQ -eQ -eQ eQ eQ eQ +<<<<<<< ours gx eU gh @@ -5138,48 +7753,74 @@ ga hf eQ hk +======= +ft +MZ +fp +MZ +MZ +MZ +MZ +fU +gb +MZ +YD +gk +ZD +gt +MZ +MZ +eQ +eQ +eQ +bB +bA +ac +ac +>>>>>>> theirs ac ac "} -(25,1,1) = {" -ad -ad -ad -aD -ao -ao -ao -ao -ao -bS +(29,1,1) = {" +ac +aE +da ao ao -bg -ck +aE +aG +dS +cF +bf +dL +bN +aE ar -cH ar -cS -dj -ao -ao -bg +aE +cO +cJ +cy +lP +df +ar +ar +aE dG ar -dX -en +dW +em ar -ez -bg +dK +ah bB bB bB -eN -eQ -eQ eQ eQ eQ +<<<<<<< ours +<<<<<<< ours eQ eQ gx @@ -5202,47 +7843,76 @@ ga hf eQ hk +======= +MZ +======= +Hn +>>>>>>> theirs +DF +jV +uv +eX +Qa +MZ +ff +gS +MZ +wy +gj +gU +Rl +Fw +MZ +eQ +eQ +eQ +bB +bB +bA +ac +>>>>>>> theirs ac ac "} -(26,1,1) = {" -ae -ao -ad +(30,1,1) = {" +ac aE -ao -ao -ao -ao -ao -bS -ao -ao -bg -cl +aE +Tu +Nw +aE +aE +aE +aE +aE +aE +aE +di ar -cI ar -cT -dj -ao -ao -bg +cH +ah +ah +ah +aE +aE +aU +ar +ah dH ar -dX -en +fa +Hh ar -eA -bg +dv +ah bA bC bB -eN -eQ eQ eQ eQ +<<<<<<< ours eQ gx gx @@ -5265,45 +7935,72 @@ gs ga hf eQ -hk +hk +======= +MZ +fc +gw +fz +gw +Ww +MZ +fV +gc +MZ +hf +xR +fn +gu +gK +MZ +eQ +eQ +eQ +bB +bB +bA +bB +>>>>>>> theirs ac ac "} -(27,1,1) = {" -af -ao -ad -aF -ao -ao -ao -ao -bM -ad -ao -ao -bg -cm +(31,1,1) = {" +ac +ac +aE +aE +aE +aE +aE +aE +aE ar ar ar -cU -dj -ao -ao -bg +ar +ar +ar +ar +ar +ar +ar +ar +ar +ar +ar +ah dI ar dX -en +bY ar eB -ad +ah bB bB bB -eN eQ +<<<<<<< ours eU eU gz @@ -5330,44 +8027,137 @@ gX gX gX hk +======= +eQ +eQ +MZ +el +BR +Dp +hs +hs +TA +kC +rx +LQ +fX +oK +gp +eV +gG +MZ +eQ +eQ +eQ +bB +bB +bB +>>>>>>> theirs +ac ac ac "} -(28,1,1) = {" -ag -ao -ad -aG -aW -bf -bp -bF -bN -ad -aU -ao -ad -cm -cy -cJ -cO -cV -dj -ao +(32,1,1) = {" +ac +ac +ac +ac +aE +wu +XF ao -ad -dJ +dO +ar +ar +ar +ar +ar +ar +ar +ar +ar +ar +ar +ar +ar +ar +ah +Sm ar dX en ar -eC -ad +cg +ah +bB +bB +bB +eQ +eQ +eQ +MZ +Mh +qM +kY +gw +fM +MZ +fV +YA +MZ +ux +iA +gB +gB +gL +MZ +eQ +eQ +eQ +bB +bA +bB +ac +ac +ac +"} +(33,1,1) = {" +ac +ac +ac +ac +aE +Il +ao +ao +aE +ah +ah +bT +bT +ah +aE +aE +aE +aE +aE +aE +aE +ar +ar +aE +ZC +ar +ar +ar +ar +eE +ah bB bB bB -eN eQ +<<<<<<< ours eU fc gt @@ -5394,37 +8184,61 @@ fD ga hf hk +======= +eQ +eQ +MZ +fk +cu +MJ +fG +nt +MZ +fI +eP +MZ +MZ +MZ +MZ +MZ +MZ +MZ +eQ +eQ +eQ +bB +bB +ac +>>>>>>> theirs +ac ac ac "} -(29,1,1) = {" -ad -ap -ad -ad -ad -ad -ad -ad -ad -ad -ao +(34,1,1) = {" +ac +ac +ac +ac +aE +af ao -ad -ad -bg -bg -bg -ad -ad -aU ao -ad -dK +aE +ap +ar ar ar +bZ +aE +cn +ao +ao +ao +ao +dk ar ar +<<<<<<< ours eD ad dZ @@ -5458,53 +8272,102 @@ fn ga hf hk -ac -ac -"} -(30,1,1) = {" -ah -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao +======= +aE +bU +dP +dY +dY +eu +eu +aE +bB +bB +bA +eQ +eQ +eQ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +DZ +fx +MZ +lV +gm +Bg +gC +gN +gR +eQ +eQ +eQ +bB +bB +bB +ac +>>>>>>> theirs +ac +ac +"} +(35,1,1) = {" +ac +ac +ac +ac +aE +ag ao +nF +aE +ce +bq +ar +ar +bZ +aE +co ao +ar ao ao -ad -dL -ar -ar +dk ar ar -eE -ad -dZ -dZ -dZ -dZ -eR -eX -fd -fk -fk -fv +eb +aE +aE +aE +ah +ah +aE +aE +bA +bA +bB +eQ +eQ +eQ +gR +fq +fw +rQ +MZ +fN +gM +dM fA -fH +MZ +gZ +rF +gU fn fn +<<<<<<< ours fX eU ge @@ -5522,44 +8385,46 @@ ff ga hf hk +======= +gR +eQ +eQ +eQ +bB +bB +bB +bB +>>>>>>> theirs ac ac "} -(31,1,1) = {" -ah -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao -ao +(36,1,1) = {" +ac +ac +ac +aE +aE +aE +aE +aE +aE +bi +br +ar +ar +bh +aE +cp ao +ar ao -ad -dM -dP -dY -dY -eu -eF -ad -dZ -dZ -bB -eN +cX +aE +ar +ar +dC eQ +<<<<<<< ours eU fe gt @@ -5650,48 +8515,77 @@ gX gX gX hk +======= +dQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +Fl +vk +Es +Es +fJ +he +gd +fi +gz +OY +fP +sb +Hw +Hw +gq +gR +eQ +eQ +eQ +bB +bB +bB +fB +>>>>>>> theirs ac ac "} -(33,1,1) = {" -ai +(37,1,1) = {" +ac +ac +ac +aE +cG aq ax aH -ad -bh -bq +aE ar ar ar ar -bZ -ad -cn -ao -ao -ao -ao -dk +bh +aE +cq ao +ar ao +aw +aE +ar +ar dC -dN -dQ -dZ -dZ -dZ -dZ -dZ -dZ -dZ -bB -eN -eQ eQ +dQ eQ eQ eQ +<<<<<<< ours gx gx gx @@ -5714,46 +8608,81 @@ ga hf eQ hk +======= +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +BY +gs +fK +fK +NC +Fz +eY +Oc +DD +NC +fh +LI +gm +gm +gY +Ug +eQ +eQ +eQ +bB +bB +bC +bB +>>>>>>> theirs ac ac "} -(34,1,1) = {" +(38,1,1) = {" +ac +ac +ac +aE aj ar ar ar -ad -bi -br -bG +aX ar ar ar -bZ -ad -co -ao ar +bh +aE +cr ao +ar ao -dk -ao -ao -dC -dN -dQ -ea -eo -eo -eo -eo -eL -dZ +cY +aE +ar +dV +aE +aE +aE +aE +ep +ep +ep +aE +aE +bB bA -eN eQ eQ eQ +<<<<<<< ours eQ eQ eQ @@ -5778,52 +8707,92 @@ ga hf eQ hk +======= +BY +WJ +fH +Wy +BY +fF +ZO +bx +fb +AR +Jv +gn +gy +fn +lD +BY +eQ +eQ +eQ +bB +bB +bB +bB +>>>>>>> theirs ac ac "} -(35,1,1) = {" +(39,1,1) = {" +ac +ac +ac +aE ak ar ay ar -aX -ar +aE +bs ar ar +bs ar +aE +cs +ao ar +ao +cZ +aE ar ar -ad -cp +dR ao -ar ao -cW -ad +bX ao ao -ad -ad -ad -ad -ep -ep -ep -ep -ad -ad +ao +OZ +aE +bB bB -eN -eQ -eQ -eQ eQ eQ eQ +BY +fd +HQ +CG +fl +fl +oz +BY +BY +BY +BS +go +Jw +gF +BY +BY eQ eQ eQ +<<<<<<< ours gx eU gn @@ -5842,27 +8811,111 @@ ga hf eQ hk +======= +bB +fB +bB +ac ac ac "} -(36,1,1) = {" +(40,1,1) = {" +ac +ac +ac +aE al ar ar ar -ad +aE +cL +ah +aE +dy +ah +aE +aE +eD +du +nF +aE +aE ar -bs ar +dR +ao +ao +ao +ao +ao +ao +pT +aE +bB +bB +eQ +eT +eQ +Cd +eW +fQ +fQ +fQ +fQ +BY +gi +gi +BY +fQ +fQ +fQ +fQ +BY +hb +eQ +eQ +eQ +bB +bA +bB +>>>>>>> theirs +ac +ac +ac +"} +(41,1,1) = {" +ac +ac +ac +aE +am +as +az +aI +aE +ar +bj +ah +ar +bj +aE +aE +aE +aE +aE +aE +aE +ar +ar +aE +Po ar ar -bs ar -ad -cq -ao ar ao +<<<<<<< ours cX ad ao @@ -5877,11 +8930,20 @@ ao ao Fo ad +======= +ic +aE +>>>>>>> theirs bB -eN +bC +eQ +eQ eQ +<<<<<<< ours +======= eQ eQ +>>>>>>> theirs eQ eQ eQ @@ -5889,6 +8951,9 @@ eQ eQ eQ eQ +eQ +eQ +<<<<<<< ours eU eU eU @@ -5906,27 +8971,55 @@ gX gX eQ hk +======= +eQ +eQ +eQ +eQ +eQ +eQ +eQ +eQ +bB +bB +ac +>>>>>>> theirs +ac ac ac "} -(37,1,1) = {" -am -as -az -aI -ad -bg -bt -bg -ad -bg -bX -bg -ad -cr -ao +(42,1,1) = {" +ac +ac +ac +aE +aE +aE +aE +aE +aE +ar +bH +ah +ar +bH +aE +ac +ac +ac +ac +ac +aE +do +do +aE +ed +ar +ar +ar ar ao +<<<<<<< ours cY ad aU @@ -5945,6 +9038,12 @@ bC eN eQ eQ +======= +UV +aE +bB +bA +>>>>>>> theirs eQ eQ eQ @@ -5967,6 +9066,7 @@ eQ eQ eQ eQ +<<<<<<< ours eQ eQ hk @@ -6034,50 +9134,57 @@ eS eS eS hl +======= +bB +bA +bB +ac ac ac "} -(39,1,1) = {" +(43,1,1) = {" +>>>>>>> theirs ac ac ac ac -ad +ac +ac +ac +ac +aE bk -ar -bI -ad bI -ar +aE bk -ad -ct -ao +bI +aE +ac +ac +ac +ac +ac +ac +ac +ac +aE +ee +ar +eq +eq ar ao -da -ad -ao -ao -ad +em +aE +ac ac -ad -ed -ao -ao -ao -ao -ec -ad -bA -bB -bB bB +fB bB bB bB bB -bA +bK bB bB bB @@ -6096,35 +9203,17 @@ bB bB bB bB -bB ac ac ac "} -(40,1,1) = {" +(44,1,1) = {" ac ac ac ac -ad -ad -ad -ad -ad -ad -ad -ad -ad -cu -ao -ao -ao -db -ad -dn -dn -ad ac +<<<<<<< ours ad ee zv @@ -6136,6 +9225,38 @@ ad bB bC bB +======= +ac +ac +ac +aE +aE +aE +aE +aE +aE +aE +ac +ac +ac +ac +ac +ac +ac +ac +aE +aE +aE +aE +aE +aE +eK +aE +aE +aE +ac +ac +>>>>>>> theirs bA bB bB @@ -6163,9 +9284,8 @@ bA ac ac ac -ac "} -(41,1,1) = {" +(45,1,1) = {" ac ac ac @@ -6178,27 +9298,28 @@ ac ac ac ac -ad -ad -cz -cK -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +aE +gP ao ao -ad +ao +fj +aE ac -ad -ad -ad -ad -ad -eK -ad -ad -bA -bA ac ac ac @@ -6227,9 +9348,8 @@ bB ac ac ac -ac "} -(42,1,1) = {" +(46,1,1) = {" ac ac ac @@ -6243,25 +9363,26 @@ ac ac ac ac -ad -ad -ad -ad -dc -ao -ao -ao -ad ac ac ac ac -ad -eG +ac +ac +ac +ac +ac +ac +ac +ac +ac +aE +jw ao ar -ad -bB +ao +QA +aE ac ac ac @@ -6291,9 +9412,8 @@ ac ac ac ac -ac "} -(43,1,1) = {" +(47,1,1) = {" ac ac ac @@ -6310,27 +9430,36 @@ ac ac ac ac -ad -dc -ao -ao -ao -ad ac ac ac ac +<<<<<<< ours ad Wf eq Vo ad +======= ac ac ac ac ac ac +aE +Vz +ao +eq +ao +ec +aE +>>>>>>> theirs +ac +ac +ac +ac +ac ac ac ac @@ -6347,7 +9476,6 @@ ac ac ac ac -bB ac ac ac @@ -6357,7 +9485,7 @@ ac ac ac "} -(44,1,1) = {" +(48,1,1) = {" ac ac ac @@ -6374,21 +9502,23 @@ ac ac ac ac -ad -ad -ad -ao -ao -ad ac ac ac ac -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +aE +aE +aE +aE +aE +aE +aE ac ac ac @@ -6410,8 +9540,6 @@ ac ac ac ac -bA -bA ac ac ac @@ -6421,7 +9549,75 @@ ac ac ac "} -(45,1,1) = {" +(49,1,1) = {" +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +"} +(50,1,1) = {" +ac +ac +ac +ac ac ac ac @@ -6440,10 +9636,6 @@ ac ac ac ac -ad -do -do -ad ac ac ac