From 51fde3130023ebcb6382d5b5fd971a5984df3251 Mon Sep 17 00:00:00 2001 From: Zenith <109559450+Zenith00000@users.noreply.github.com> Date: Fri, 5 Jul 2024 14:40:03 +0100 Subject: [PATCH] survivor loot changes + light fixes & minor map fixes. --- .../LV759_Hybrisa_Prospera.dmm | 1374 ++++++++--------- 1 file changed, 625 insertions(+), 749 deletions(-) diff --git a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm index f39e32267724..f4837f1b83fd 100644 --- a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm +++ b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm @@ -204,8 +204,12 @@ }, /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo) "abC" = ( -/obj/structure/machinery/door/airlock/almayer/secure/autoname{ - locked = 1 +/obj/structure/machinery/door/poddoor/hybrisa/secure_red_door{ + name = "Armory Lockdown"; + id = "hybrisa_armory"; + needs_power = 0; + unacidable = 1; + dir = 8 }, /turf/open/floor/corsat{ icon_state = "officetiles" @@ -669,6 +673,7 @@ icon_state = "trash_8"; pixel_y = 12 }, +/obj/effect/hybrisa/decal/dirt_2, /turf/open/hybrisa/street/sidewalk/north, /area/lv759/outdoors/colony_streets/north_west_street) "afc" = ( @@ -1277,7 +1282,6 @@ /obj/structure/machinery/door/window/brigdoor/northleft{ dir = 4 }, -/obj/item/ammo_magazine/flamer_tank/empty, /obj/item/ammo_casing/bullet, /turf/open/floor/corsat{ icon_state = "officetiles" @@ -1474,13 +1478,6 @@ /obj/structure/prop/hybrisa/boulders/smallboulderdark/boulder_dark2, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/north_caves) -"ald" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/lv759/outdoors/colony_streets/north_street) "alg" = ( /obj/effect/hybrisa/decal/road/road_edge{ icon_state = "road_edge_decal8" @@ -2033,7 +2030,9 @@ dir = 8; layer = 4 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/derelict_ship) "apv" = ( @@ -3063,6 +3062,9 @@ /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo) "axi" = ( /obj/structure/pipes/standard/manifold/hidden/dark, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, /turf/open/floor/hybrisa/metal/zbrownfloor1{ dir = 8 }, @@ -4016,7 +4018,9 @@ }, /area/lv759/indoors/electical_systems/substation2) "aEQ" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/engineer_ship, /area/lv759/indoors/derelict_ship) "aET" = ( @@ -5972,15 +5976,6 @@ /obj/structure/pipes/standard/simple/hidden/dark, /turf/open/floor/plating, /area/lv759/indoors/wy_research_complex/southeastexit) -"aTm" = ( -/obj/structure/machinery/light/small/blue{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/lv759/outdoors/colony_streets/north_west_street) "aTu" = ( /obj/structure/platform/strata/metal{ dir = 4 @@ -6958,7 +6953,6 @@ /area/lv759/outdoors/colony_streets/central_streets) "baw" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/metal/large_stack, /obj/item/clothing/glasses/welding{ layer = 3.6; pixel_x = 2; @@ -6969,6 +6963,7 @@ pixel_y = 4 }, /obj/structure/pipes/standard/simple/hidden/dark, +/obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" @@ -7084,7 +7079,9 @@ }, /area/lv759/indoors/wy_research_complex/dormsfoyer) "bbz" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/effect/decal/warning_stripes{ icon_state = "W" }, @@ -7769,9 +7766,6 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 8 }, -/obj/structure/machinery/light/blue{ - dir = 8 - }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/outdoors/mining_outpost/south_entrance) "bgK" = ( @@ -8855,7 +8849,9 @@ /obj/effect/decal/cleanable/blood{ layer = 3 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/central_caves) @@ -10161,6 +10157,7 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/spawner/random/technology_scanner, /turf/open/floor/corsat{ icon_state = "officetiles" }, @@ -10320,7 +10317,9 @@ icon_state = "E"; layer = 3.33 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/machinery/power/apc{ dir = 8; start_charge = 0 @@ -11079,7 +11078,9 @@ /turf/open/hybrisa/street/sidewalk/west, /area/lv759/outdoors/colony_streets/north_street) "bHE" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/pipes/standard/simple/hidden/dark{ dir = 4 }, @@ -11288,7 +11289,9 @@ /turf/open/floor/hybrisa/wood/blackwood, /area/lv759/indoors/weyyu_office/vip) "bJt" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/floor/plating{ dir = 8; icon_state = "platingdmg3" @@ -11903,24 +11906,6 @@ "bON" = ( /turf/open/floor/plating, /area/lv759/indoors/spaceport/communications_office) -"bOT" = ( -/obj/structure/machinery/light/blue, -/obj/structure/prop/hybrisa/misc/fake/wire/blue{ - pixel_x = -4; - level = 1; - plane = -7 - }, -/obj/structure/prop/hybrisa/misc/fake/wire/red{ - pixel_x = 4; - level = 1; - layer = 2.3; - plane = -7 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/outdoors/colony_streets/east_central_street) "bOU" = ( /obj/effect/decal/strata_decals/grime/grime3{ dir = 4; @@ -12522,7 +12507,9 @@ /obj/structure/platform_decoration/hybrisa/engineer_corner{ dir = 4 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/hybrisa/engineership/engineer_floor9, /area/lv759/indoors/derelict_ship) "bSY" = ( @@ -12656,7 +12643,9 @@ }, /area/lv759/indoors/meridian/meridian_factory) "bTT" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/largecrate/random/mini/small_case/c{ pixel_x = 11; pixel_y = 15 @@ -13439,9 +13428,6 @@ "bZk" = ( /obj/structure/barricade/handrail/hybrisa/handrail, /obj/effect/hybrisa/decal/dirt, -/obj/structure/machinery/light/small/blue{ - dir = 1 - }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/central_caves) "bZp" = ( @@ -13708,7 +13694,7 @@ /turf/open/floor/plating, /area/lv759/indoors/colonial_marshals/south_maintenance) "caG" = ( -/obj/structure/machinery/light{ +/obj/structure/machinery/light/blue{ dir = 1 }, /turf/open/floor/prison{ @@ -13961,7 +13947,9 @@ /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/south_east_street) "ccn" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/north_west_caves) "ccw" = ( @@ -14007,9 +13995,6 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 1 }, -/obj/structure/machinery/light/small/blue{ - dir = 8 - }, /obj/structure/platform/hybrisa/metalplatform6{ dir = 8 }, @@ -14084,9 +14069,6 @@ /obj/structure/platform/hybrisa/metalplatform2{ dir = 1 }, -/obj/structure/machinery/light{ - dir = 1 - }, /obj/effect/hybrisa/decal/dirt, /obj/structure/prop/hybrisa/misc/buildinggreebliessmall/smallvent3{ pixel_y = 28; @@ -15027,9 +15009,6 @@ }, /obj/item/stack/sheet/wood, /obj/effect/decal/cleanable/blood/drip, -/obj/structure/machinery/light/blue{ - dir = 1 - }, /obj/structure/prop/hybrisa/signs/high_voltage/small{ pixel_y = 32 }, @@ -15051,7 +15030,9 @@ /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/central_streets) "clm" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/west_caves) "clr" = ( @@ -15507,14 +15488,6 @@ }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/east_central_street) -"cnS" = ( -/obj/item/device/flashlight/lamp/tripod/grey{ - pixel_y = 12 - }, -/turf/open/floor/prison{ - icon_state = "ramptop" - }, -/area/lv759/indoors/caves/wy_research_complex_entrance) "cnV" = ( /obj/structure/fence/dark/warning, /obj/effect/decal/warning_stripes{ @@ -15694,7 +15667,6 @@ dir = 8; icon_state = "trash_11" }, -/obj/structure/machinery/light/double/blue, /turf/open/hybrisa/street/sidewalk/south, /area/lv759/outdoors/colony_streets/central_streets) "cpB" = ( @@ -16088,7 +16060,9 @@ /obj/effect/hybrisa/decal/doubleroad/lines4{ pixel_x = 4 }, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/north_street) "csE" = ( @@ -16251,6 +16225,9 @@ dir = 8 }, /obj/structure/pipes/vents/pump_hybrisa, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, /turf/open/floor/hybrisa/metal/zbrownfloor1{ dir = 8 }, @@ -17161,7 +17138,9 @@ /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/north_east_street) "cAw" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform{ layer = 4 }, @@ -17962,17 +17941,6 @@ /obj/structure/prop/hybrisa/cavedecor/stalagmite5, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/south_east_caves) -"cFu" = ( -/obj/effect/hybrisa/decal/dirt, -/obj/structure/machinery/light/double/blue{ - dir = 4 - }, -/obj/structure/prop/hybrisa/lattice_prop/lattice_6{ - pixel_y = 16; - layer = 6 - }, -/turf/open/hybrisa/street/sidewalk/east, -/area/lv759/outdoors/colony_streets/central_streets) "cFx" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/camera_film, @@ -18923,10 +18891,10 @@ }, /area/lv759/indoors/hospital/emergency_room) "cLK" = ( -/obj/structure/largecrate/guns, /obj/structure/pipes/standard/simple/hidden/dark{ dir = 4 }, +/obj/structure/largecrate/mule, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -19019,6 +18987,13 @@ /mob/living/simple_animal/rat/gray, /turf/open/hybrisa/street/cement3, /area/lv759/outdoors/colony_streets/north_street) +"cMJ" = ( +/obj/structure/pipes/standard/simple/hidden/dark, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, +/turf/open/floor/prison, +/area/lv759/outdoors/colony_streets/south_west_street) "cMT" = ( /obj/structure/machinery/light{ dir = 4 @@ -19187,7 +19162,9 @@ /turf/open/hybrisa/street/sidewalk/north, /area/lv759/outdoors/colony_streets/central_streets) "cNO" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/structure/machinery/light/spot/blue{ dir = 8; pixel_x = -8 @@ -20815,7 +20792,6 @@ /obj/structure/machinery/door/window/brigdoor/northleft{ dir = 4 }, -/obj/item/weapon/gun/flamer, /obj/item/ammo_casing/bullet, /turf/open/floor/corsat{ icon_state = "officetiles" @@ -21081,7 +21057,7 @@ /obj/item/trash/cigbutt, /obj/item/trash/cigbutt, /turf/open/auto_turf/hybrisa_auto_turf/layer1, -/area/lv759/outdoors/colony_streets/south_east_street) +/area/lv759/outdoors/colony_streets/east_central_street) "dbD" = ( /obj/effect/hybrisa/decal/dirt, /obj/effect/hybrisa/decal/dirt, @@ -21706,7 +21682,9 @@ /turf/open/floor/hybrisa/tile/supermartfloor2, /area/lv759/indoors/power_plant/workers_canteen_kitchen) "dfX" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/structure/barricade/handrail/hybrisa/road/plastic/red{ dir = 4 }, @@ -21749,6 +21727,9 @@ dir = 4; pixel_y = -4 }, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, /turf/open/hybrisa/street/underground_unweedable, /area/lv759/outdoors/landing_zone_2) "dgn" = ( @@ -22201,7 +22182,9 @@ /turf/open/floor/hybrisa/tile/tilewhitecheckered, /area/lv759/indoors/hospital/medical_storage) "djj" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/structure/machinery/light/blue, /obj/structure/pipes/standard/simple/hidden/dark{ dir = 4 @@ -23234,6 +23217,24 @@ }, /turf/open/floor/hybrisa/carpet/carpetorangered, /area/lv759/indoors/bar/entertainment) +"dqR" = ( +/obj/structure/prop/hybrisa/misc/fake/wire/blue{ + pixel_x = -4; + level = 1; + plane = -7 + }, +/obj/structure/prop/hybrisa/misc/fake/wire/red{ + pixel_x = 4; + level = 1; + layer = 2.3; + plane = -7 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv759/outdoors/colony_streets/east_central_street) "dqS" = ( /obj/structure/prop/hybrisa/lattice_prop/lattice_6{ pixel_y = 16; @@ -24392,7 +24393,6 @@ /turf/open/floor/plating, /area/lv759/indoors/caves/south_west_caves) "dAo" = ( -/obj/structure/machinery/light/double/blue, /obj/structure/prop/hybrisa/misc/deco_edging/corner{ dir = 4; color = "#7e7d72" @@ -25654,7 +25654,6 @@ }, /obj/effect/decal/warning_stripes{ icon_state = "W"; - pixel_x = -1; pixel_y = 1 }, /obj/structure/prop/hybrisa/misc/commandosuitemptyprop{ @@ -25790,6 +25789,10 @@ pixel_y = 28; pixel_x = 20 }, +/obj/structure/machinery/light/small/blue{ + dir = 1; + pixel_x = 6 + }, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" @@ -26868,7 +26871,7 @@ pixel_y = 5 }, /obj/effect/hybrisa/decal/dirt, -/obj/structure/machinery/light/small/blue{ +/obj/structure/machinery/light/blue{ dir = 8 }, /turf/open/hybrisa/street/asphalt, @@ -26917,7 +26920,9 @@ pixel_x = -9; pixel_y = 20 }, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/structure/sign/safety/maint{ pixel_y = 32 }, @@ -27142,13 +27147,11 @@ /obj/structure/surface/rack{ layer = 4 }, -/obj/item/stack/sheet/plasteel/med_small_stack{ - layer = 4 - }, /obj/item/stack/cable_coil/blue{ layer = 4 }, /obj/effect/landmark/objective_landmark/science, +/obj/effect/spawner/random/technology_scanner, /turf/open/floor/strata{ dir = 4; icon_state = "cyan4" @@ -27360,7 +27363,9 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/outdoors/caveplateau) "dXr" = ( @@ -27589,7 +27594,9 @@ /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/south_east_caves) "dZk" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/structure/machinery/light/small{ dir = 1 }, @@ -27864,12 +27871,6 @@ icon_state = "blue" }, /area/lv759/indoors/hospital/pharmacy) -"eba" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8 - }, -/turf/open/hybrisa/street/cement3, -/area/lv759/outdoors/colony_streets/south_east_street) "ebj" = ( /obj/effect/hybrisa/decal/road/road_edge{ icon_state = "road_edge_decal2" @@ -27887,6 +27888,9 @@ pixel_x = -20; layer = 3 }, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, /turf/open/floor/hybrisa/metal/zbrownfloor1{ dir = 8 }, @@ -28133,9 +28137,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "NW-out" }, -/obj/structure/machinery/light/blue{ - dir = 1 - }, /obj/structure/prop/hybrisa/signs/high_voltage{ desc = null; pixel_y = 32 @@ -29488,7 +29489,9 @@ /obj/structure/platform/strata/metal{ dir = 1 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform/hybrisa/metalplatform6{ dir = 8 }, @@ -31000,9 +31003,6 @@ /obj/effect/hybrisa/decal/trash{ icon_state = "trash_14" }, -/obj/structure/machinery/light/small/blue{ - dir = 1 - }, /obj/structure/prop/hybrisa/misc/buildinggreebliessmall/smallvent3{ pixel_y = 28 }, @@ -31873,6 +31873,7 @@ /obj/item/ammo_magazine/smg/p90, /obj/item/ammo_magazine/smg/p90, /obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_box/magazine/p90, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/wy_research_complex/securityarmory) "eGI" = ( @@ -32152,7 +32153,9 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 4 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/strata{ dir = 4; icon_state = "orange_edge" @@ -32984,7 +32987,9 @@ /turf/open/floor/interior/wood, /area/lv759/indoors/mining_outpost/south) "eOU" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/blocker/forcefield/vehicles, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/north_west_caves) @@ -33051,7 +33056,9 @@ icon_state = "lattice12"; pixel_y = 16 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/strata{ dir = 4; icon_state = "orange_edge" @@ -33467,7 +33474,9 @@ /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/wy_research_complex_entrance) "eSF" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating{ dir = 8; icon_state = "platingdmg3" @@ -35898,9 +35907,9 @@ pixel_y = 2 }, /obj/structure/surface/rack, -/obj/item/stack/sheet/metal/large_stack, /obj/item/storage/toolkit, /obj/item/stack/cable_coil/green, +/obj/item/stack/sheet/metal/small_stack, /turf/open/floor/corsat{ icon_state = "box" }, @@ -37806,6 +37815,7 @@ /turf/open/floor/plating, /area/lv759/indoors/spaceport/docking_bay_1) "fAt" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ dir = 8; icon_state = "darkyellow2" @@ -39080,13 +39090,6 @@ dir = 10 }, /area/lv759/indoors/wy_research_complex/reception) -"fKI" = ( -/obj/structure/platform/hybrisa/rockdark, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/auto_turf/hybrisa_auto_turf/layer3, -/area/lv759/outdoors/caves/north_west_caves_outdoors) "fKJ" = ( /obj/effect/hybrisa/decal/dirt, /obj/effect/hybrisa/decal/tiretrack{ @@ -39368,8 +39371,8 @@ /area/lv759/indoors/apartment/eastfoyer) "fNf" = ( /obj/structure/cargo_container/hybrisa/containersextended/tanleft, -/turf/open/floor/hybrisa/metal/zbrownfloor1{ - dir = 1 +/turf/open/floor/prison{ + icon_state = "cell_stripe" }, /area/lv759/indoors/meridian/meridian_factory) "fNg" = ( @@ -40258,10 +40261,11 @@ /turf/open/floor/plating/plating_catwalk, /area/lv759/indoors/wy_research_complex/xenoarcheology) "fTU" = ( -/obj/structure/platform/hybrisa/metalplatform6, /obj/structure/platform_decoration/hybrisa/metalplatformdeco6{ dir = 8 }, +/obj/structure/platform_decoration/hybrisa/metalplatformdeco6, +/obj/effect/hybrisa/decal/dirt, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" @@ -40309,10 +40313,6 @@ /area/lv759/indoors/hospital/virology) "fUi" = ( /obj/structure/janitorialcart, -/obj/structure/sign/nosmoking_1{ - pixel_y = 32; - layer = 2.8 - }, /turf/open/floor/hybrisa/metal/bluemetal1, /area/lv759/indoors/weyyu_office/pressroom) "fUm" = ( @@ -41844,7 +41844,6 @@ dir = 8 }, /obj/structure/barricade/handrail/hybrisa/road/plastic/black, -/obj/structure/machinery/light/blue, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/outdoors/colony_streets/north_west_street) "gfW" = ( @@ -42040,8 +42039,8 @@ icon_state = "N" }, /obj/structure/largecrate/random/mini/med{ - pixel_x = -6; - pixel_y = -3 + pixel_y = -3; + pixel_x = -10 }, /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -42177,13 +42176,6 @@ icon_state = "whitegreen" }, /area/lv759/indoors/hospital/cryo_room) -"giZ" = ( -/obj/structure/machinery/light/blue, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/outdoors/colony_streets/east_central_street) "gjf" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 2; @@ -42476,7 +42468,7 @@ /obj/structure/window/reinforced{ layer = 3.3 }, -/obj/effect/spawner/random/gun/special/midchance, +/obj/effect/spawner/random/gun/special/highchance, /turf/open/floor/strata{ dir = 8; icon_state = "red3" @@ -42494,15 +42486,6 @@ }, /turf/open/floor/plating, /area/lv759/indoors/landing_zone_2/kmcc_hub_maintenance_north) -"glK" = ( -/obj/structure/machinery/light/small/blue{ - dir = 1 - }, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/lv759/indoors/caves/central_caves) "glM" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -42548,7 +42531,7 @@ /area/lv759/outdoors/caveplateau) "gmh" = ( /obj/item/device/flashlight/lamp/tripod/grey{ - pixel_y = 12 + on = 0 }, /turf/open/floor/prison{ dir = 8; @@ -43095,9 +43078,6 @@ /area/lv759/indoors/mining_outpost/south) "gqq" = ( /obj/effect/hybrisa/decal/dirt, -/obj/structure/machinery/light/small{ - dir = 4 - }, /turf/open/floor/plating{ dir = 8; icon_state = "platingdmg3" @@ -43231,7 +43211,6 @@ /area/lv759/outdoors/colony_streets/central_streets) "gru" = ( /obj/structure/prop/hybrisa/fakeplatforms/platform5, -/obj/structure/machinery/light/double/blue, /obj/effect/hybrisa/decal/trash{ icon_state = "trash_14"; pixel_y = 27 @@ -43473,7 +43452,6 @@ }, /area/lv759/indoors/apartment/westrestroom) "gtz" = ( -/obj/structure/machinery/light/double/blue, /obj/structure/prop/hybrisa/misc/deco_edging/corner{ dir = 8; color = "#7e7d72" @@ -43602,6 +43580,9 @@ pixel_y = 23; layer = 4.2 }, +/obj/item/stock_parts/matter_bin{ + pixel_x = 12 + }, /turf/open/floor/plating, /area/lv759/indoors/caves/west_caves) "guG" = ( @@ -43683,7 +43664,9 @@ pixel_x = 5; pixel_y = 13 }, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/south_east_street) "gvj" = ( @@ -44397,15 +44380,6 @@ icon_state = "bright_clean2" }, /area/lv759/indoors/hospital/operation) -"gAS" = ( -/obj/structure/machinery/light/small/blue{ - dir = 4 - }, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/lv759/indoors/caves/west_caves) "gAU" = ( /turf/closed/wall/hybrisa/colony/engineering, /area/lv759/indoors/power_plant/workers_canteen) @@ -44649,7 +44623,7 @@ pixel_y = 2 }, /obj/structure/pipes/standard/simple/hidden/dark, -/obj/item/stack/sheet/plasteel/large_stack, +/obj/item/stack/sheet/plasteel/small_stack, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -45740,7 +45714,9 @@ }, /area/lv759/indoors/wy_research_complex/vehicledeploymentbay) "gKu" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/barricade/handrail/hybrisa/road/plastic/black{ dir = 1 }, @@ -46260,7 +46236,6 @@ /area/lv759/oob) "gOS" = ( /obj/item/storage/belt/marine, -/obj/item/weapon/gun/rifle/m41a/corporate, /obj/structure/closet/secure_closet/guncabinet{ locked = 0 }, @@ -46268,6 +46243,7 @@ /obj/item/ammo_magazine/rifle/ap, /obj/item/ammo_magazine/rifle/ap, /obj/item/ammo_magazine/rifle/ap, +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -46372,7 +46348,9 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/outdoors/colony_streets/north_west_street) "gPE" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 @@ -47680,12 +47658,6 @@ }, /area/lv759/indoors/weyyu_office) "gZf" = ( -/obj/structure/machinery/colony_floodlight/street{ - pixel_y = 18 - }, -/obj/structure/machinery/colony_floodlight/street{ - pixel_y = 18 - }, /obj/item/tool/warning_cone{ layer = 4; pixel_x = -20 @@ -48001,10 +47973,6 @@ "hbS" = ( /obj/effect/hybrisa/decal/dirt, /obj/effect/hybrisa/decal/dirt, -/obj/structure/machinery/colony_floodlight/street{ - pixel_y = 12; - pixel_x = 1 - }, /obj/structure/prop/hybrisa/lattice_prop/lattice_6{ pixel_y = 16; layer = 6 @@ -50284,7 +50252,9 @@ /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/south_east_street) "htz" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/item/storage/pouch/shotgun/large, /obj/effect/hybrisa/decal/dirt, /turf/open/floor/prison{ @@ -50558,7 +50528,9 @@ /area/lv759/indoors/colonial_marshals/armory) "hvD" = ( /obj/structure/platform_decoration/hybrisa/metalplatformdeco6, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/central_caves) "hvE" = ( @@ -50753,7 +50725,9 @@ }, /area/lv759/indoors/spaceport/hallway_east) "hwR" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/floor/plating{ dir = 8; icon_state = "platingdmg3" @@ -52173,7 +52147,9 @@ /obj/structure/barricade/handrail/hybrisa/handrail{ dir = 1 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/derelict_ship) "hGG" = ( @@ -52205,14 +52181,6 @@ }, /turf/open/floor/plating, /area/lv759/indoors/recycling_plant_office) -"hHb" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/outdoors/colony_streets/central_streets) "hHe" = ( /turf/open/floor/prison{ dir = 6; @@ -52361,6 +52329,14 @@ }, /turf/open/floor/plating, /area/lv759/indoors/mining_outpost/processing) +"hHZ" = ( +/obj/effect/hybrisa/decal/dirt, +/obj/structure/pipes/standard/simple/hidden/dark, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, +/turf/open/floor/prison, +/area/lv759/outdoors/colony_streets/south_west_street) "hIb" = ( /obj/structure/platform_decoration/hybrisa/rockdark{ dir = 8 @@ -52456,7 +52432,9 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 4 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/effect/hybrisa/decal/dirt, /turf/open/floor/plating, /area/lv759/indoors/caves/south_west_caves) @@ -52722,7 +52700,9 @@ /area/lv759/indoors/weyyu_office/floor) "hLc" = ( /obj/effect/hybrisa/decal/dirt, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, @@ -52925,7 +52905,9 @@ icon_state = "E"; layer = 3.33 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/prison{ dir = 4; icon_state = "ramptop" @@ -53273,6 +53255,14 @@ dir = 8 }, /area/lv759/indoors/colonial_marshals/prisoners_recreation_area) +"hOW" = ( +/obj/structure/barricade/handrail/hybrisa/handrail, +/obj/item/storage/backpack/marine/satchel/rto/small{ + pixel_x = 7; + pixel_y = 19 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv759/indoors/derelict_ship) "hOZ" = ( /obj/effect/hybrisa/decal/road/road_edge{ icon_state = "road_edge_decal4" @@ -54039,6 +54029,32 @@ }, /turf/open/hybrisa/street/sidewalk/east, /area/lv759/outdoors/landing_zone_2) +"hUJ" = ( +/obj/structure/prop/hybrisa/misc/fake/lattice/full, +/obj/structure/prop/hybrisa/misc/floorprops/grate, +/obj/structure/platform/hybrisa/metalplatform1{ + dir = 1 + }, +/obj/structure/platform/hybrisa/metalplatform1{ + dir = 4 + }, +/obj/structure/prop/hybrisa/misc/fake/pipes/pipe1, +/obj/structure/prop/hybrisa/misc/fake/pipes/pipe1{ + dir = 4 + }, +/obj/structure/prop/hybrisa/misc/fake/wire/red{ + pixel_x = 4 + }, +/obj/structure/prop/hybrisa/misc/fake/wire/yellow, +/obj/structure/prop/hybrisa/misc/fake/wire/blue{ + dir = 4; + pixel_y = -4 + }, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/hybrisa/street/underground_unweedable, +/area/lv759/outdoors/colony_streets/south_east_street) "hUL" = ( /turf/closed/shuttle/ert{ icon_state = "wy14" @@ -54631,14 +54647,6 @@ }, /turf/open/auto_turf/hybrisa_auto_turf/layer3, /area/lv759/outdoors/colony_streets/east_central_street) -"hZL" = ( -/obj/structure/prop/hybrisa/misc/redmeter{ - pixel_y = 32 - }, -/turf/open/floor/corsat{ - icon_state = "officetiles" - }, -/area/lv759/indoors/wy_research_complex/securityarmory) "hZM" = ( /obj/effect/hybrisa/decal/road/lines3, /obj/effect/hybrisa/decal/dirt, @@ -55155,9 +55163,6 @@ pixel_x = -8; pixel_y = 12 }, -/obj/structure/machinery/light/double/blue{ - dir = 4 - }, /turf/open/hybrisa/street/sidewalk/east, /area/lv759/outdoors/colony_streets/north_street) "ieg" = ( @@ -56654,15 +56659,6 @@ icon_state = "plate" }, /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo) -"ipA" = ( -/obj/structure/machinery/light/blue{ - dir = 4 - }, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/lv759/indoors/caves/central_caves) "ipB" = ( /obj/effect/landmark/static_comms/net_one, /turf/open/floor/prison{ @@ -58256,16 +58252,6 @@ }, /turf/open/floor/hybrisa/engineership/engineer_floor9, /area/lv759/indoors/derelict_ship) -"iAv" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4 - }, -/obj/structure/prop/hybrisa/lattice_prop/lattice_6{ - pixel_y = 16; - layer = 6 - }, -/turf/open/hybrisa/street/sidewalk/east, -/area/lv759/outdoors/colony_streets/central_streets) "iAB" = ( /obj/effect/hybrisa/decal/dirt, /obj/structure/prop/hybrisa/vehicles/Small_Truck/Mining{ @@ -60628,7 +60614,9 @@ /turf/open/hybrisa/street/cement3, /area/lv759/outdoors/colony_streets/north_street) "iTS" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/prop/invuln/ice_prefab/roof_greeble{ icon_state = "windsock"; indestructible = 0; @@ -60995,6 +60983,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, +/obj/structure/machinery/light/blue, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/outdoors/colony_streets/north_east_street_LZ) "iXe" = ( @@ -61305,12 +61294,6 @@ /obj/structure/platform_decoration/hybrisa/metalplatformdeco6, /turf/open/hybrisa/street/sidewalk/south, /area/lv759/outdoors/colony_streets/north_street) -"iZo" = ( -/obj/structure/machinery/colony_floodlight/street{ - pixel_y = 6 - }, -/turf/open/hybrisa/street/cement2, -/area/lv759/outdoors/colony_streets/north_west_street) "iZq" = ( /obj/effect/hybrisa/decal/road/roadmiddle{ dir = 8; @@ -61817,8 +61800,8 @@ /area/lv759/indoors/wy_research_complex/hallwaysoutheast) "jdr" = ( /obj/structure/cargo_container/hybrisa/containersextended/redright, -/turf/open/floor/hybrisa/metal/zbrownfloor1{ - dir = 1 +/turf/open/floor/prison{ + icon_state = "cell_stripe" }, /area/lv759/indoors/meridian/meridian_factory) "jdu" = ( @@ -61845,7 +61828,9 @@ dir = 4; layer = 4 }, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/item/tool/warning_cone{ pixel_x = -22; pixel_y = -7 @@ -63295,13 +63280,6 @@ }, /turf/open/floor/plating, /area/lv759/outdoors/colony_streets/north_west_street) -"joo" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/light/double/blue{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/outdoors/colony_streets/south_east_street) "jor" = ( /obj/effect/hybrisa/decal/road/road_stop{ icon_state = "stop_decal5" @@ -64046,7 +64024,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, -/obj/structure/machinery/light/blue, /obj/structure/pipes/standard/simple/hidden/dark{ dir = 4 }, @@ -64438,7 +64415,9 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 8 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/central_caves) "jxI" = ( @@ -65004,7 +64983,9 @@ /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/outdoors/caves/north_west_caves_outdoors) "jBL" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/effect/hybrisa/decal/dirt, /obj/structure/barricade/handrail/hybrisa/handrail{ dir = 8; @@ -65198,7 +65179,6 @@ /area/lv759/indoors/hospital/emergency_room) "jDi" = ( /obj/effect/hybrisa/decal/dirt, -/obj/item/defenses/handheld/planted_flag, /obj/structure/platform_decoration/shiva, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/central_caves) @@ -65744,13 +65724,6 @@ icon_state = "multi_tiles" }, /area/lv759/indoors/wy_research_complex/hangarbay) -"jHw" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_x = -17; - pixel_y = 32 - }, -/turf/open/hybrisa/street/roadlines4, -/area/lv759/outdoors/colony_streets/north_east_street) "jHK" = ( /obj/structure/platform/hybrisa/metalplatform1{ dir = 1 @@ -65804,17 +65777,6 @@ /obj/effect/hybrisa/decal/dirt, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/north_street) -"jIo" = ( -/obj/structure/barricade/handrail/strata{ - dir = 4; - layer = 4 - }, -/obj/structure/machinery/light/spot/blue{ - dir = 8; - pixel_x = -8 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/outdoors/colony_streets/south_east_street) "jIq" = ( /turf/closed/wall/hybrisa/research/reinforced, /area/lv759/indoors/wy_research_complex/hangarbay) @@ -65936,15 +65898,6 @@ icon_state = "plating" }, /area/lv759/indoors/weyyu_office/pressroom) -"jJc" = ( -/obj/structure/machinery/light/small/blue{ - dir = 8 - }, -/obj/structure/prop/hybrisa/fakeplatforms/platform5{ - dir = 8 - }, -/turf/open/hybrisa/street/cement3, -/area/lv759/outdoors/colony_streets/central_streets) "jJd" = ( /obj/structure/platform_decoration/hybrisa/metalplatformdeco6{ layer = 4 @@ -66327,9 +66280,6 @@ }, /area/lv759/indoors/landing_zone_2/kmcc_hub_lounge_hallway) "jNd" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4 - }, /obj/effect/hybrisa/decal/dirt, /obj/structure/prop/hybrisa/lattice_prop/lattice_6{ pixel_y = 16; @@ -66366,9 +66316,6 @@ }, /area/lv759/indoors/apartment/westfoyer) "jNu" = ( -/obj/structure/machinery/light/blue{ - dir = 4 - }, /obj/structure/sign/safety/restrictedarea{ pixel_x = 32 }, @@ -67156,7 +67103,9 @@ pixel_x = -13; pixel_y = 11 }, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/structure/barricade/handrail/hybrisa/road/plastic/blue{ dir = 1; layer = 3 @@ -67662,10 +67611,6 @@ layer = 4.1 }, /obj/structure/prop/hybrisa/fakeplatforms/platform4, -/obj/structure/machinery/colony_floodlight/street{ - pixel_y = 6; - layer = 4.01 - }, /turf/open/hybrisa/street/cement2, /area/lv759/outdoors/colony_streets/north_west_street) "jWU" = ( @@ -67936,11 +67881,6 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/lv759/indoors/spaceport/baggagehandling) -"jZx" = ( -/obj/item/device/flashlight/lamp/tripod/grey, -/obj/structure/pipes/standard/simple/hidden/dark, -/turf/open/floor/prison, -/area/lv759/outdoors/colony_streets/south_west_street) "jZC" = ( /obj/effect/hybrisa/decal/road/road_edge{ icon_state = "road_edge_decal3" @@ -68418,7 +68358,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/outdoors/caveplateau) "kda" = ( @@ -68567,11 +68509,10 @@ /turf/open/floor/hybrisa/tile/tileblue, /area/lv759/indoors/mining_outpost/south) "kee" = ( -/obj/structure/largecrate/guns/merc, -/obj/item/prop/folded_anti_tank_sadar, /obj/structure/platform{ dir = 8 }, +/obj/effect/spawner/random/sentry/lowchance, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/central_caves) "kej" = ( @@ -68688,7 +68629,9 @@ /obj/structure/platform/strata/metal{ dir = 1 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/almayer{ dir = 4; icon_state = "black" @@ -68748,12 +68691,6 @@ icon_state = "cell_stripe" }, /area/lv759/indoors/power_plant/south_hallway) -"kfK" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/hybrisa/street/sidewalk/west, -/area/lv759/outdoors/colony_streets/north_west_street) "kfL" = ( /obj/item/ammo_casing/bullet, /obj/item/ammo_casing/bullet, @@ -69043,11 +68980,6 @@ /obj/structure/blocker/forcefield/vehicles, /turf/open/auto_turf/hybrisa_auto_turf/layer1, /area/lv759/indoors/caves/north_west_caves) -"khW" = ( -/obj/effect/hybrisa/decal/dirt, -/obj/effect/hybrisa/decal/dirt, -/turf/open/hybrisa/street/sidewalk/east, -/area/lv759/outdoors/colony_streets/south_east_street) "khX" = ( /obj/structure/window/framed/hybrisa/colony/office, /obj/structure/machinery/door/poddoor/hybrisa/open_shutters{ @@ -69383,12 +69315,6 @@ }, /turf/open/floor/plating, /area/lv759/indoors/mining_outpost/northeast) -"kkE" = ( -/obj/structure/machinery/light/small/blue{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/outdoors/colony_streets/east_central_street) "kkF" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ use_power = 0; @@ -69402,6 +69328,10 @@ pixel_y = 6 }, /obj/item/tool/mop, +/obj/structure/sign/nosmoking_1{ + pixel_y = 32; + layer = 2.8 + }, /turf/open/floor/hybrisa/metal/bluemetalcorner, /area/lv759/indoors/weyyu_office/pressroom) "kkQ" = ( @@ -69660,6 +69590,12 @@ /obj/structure/machinery/door/window/brigdoor/eastleft{ dir = 2 }, +/obj/structure/machinery/door_control{ + id = "hybrisa_armory"; + name = "Armory Lockdown"; + pixel_x = 22; + pixel_y = 2 + }, /turf/open/floor/strata{ dir = 4; icon_state = "red3" @@ -69922,7 +69858,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "blackfull" @@ -70317,7 +70255,10 @@ pixel_x = 6; pixel_y = 11 }, -/obj/item/explosive/plastic/breaching_charge, +/obj/item/clothing/head/bio_hood/wy_bio{ + pixel_x = -8; + pixel_y = 2 + }, /turf/open/floor/plating, /area/lv759/indoors/caves/west_caves) "kqr" = ( @@ -73331,7 +73272,9 @@ /area/lv759/indoors/weyyu_office/pressroom) "kLQ" = ( /obj/item/ammo_magazine/m56d, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform{ dir = 8 }, @@ -73704,6 +73647,15 @@ icon_state = "whitegreen" }, /area/lv759/indoors/hospital/central_hallway) +"kPC" = ( +/obj/structure/platform/hybrisa/rockdark{ + dir = 1 + }, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, +/turf/open/auto_turf/hybrisa_auto_turf/layer2, +/area/lv759/outdoors/colony_streets/north_street) "kPD" = ( /obj/effect/hybrisa/decal/dirt, /obj/structure/ore_box{ @@ -73922,7 +73874,9 @@ icon_state = "SW-out"; pixel_y = -1 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/outdoors/colony_streets/south_west_street_comms) "kQV" = ( @@ -74134,7 +74088,6 @@ layer = 2.3; plane = -7 }, -/obj/structure/machinery/light/double/blue, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -74344,7 +74297,9 @@ }, /area/lv759/indoors/wy_research_complex/hallwaysoutheast) "kUG" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/hybrisa/metal/zbrownfloor1{ dir = 10 }, @@ -75050,7 +75005,9 @@ /obj/structure/platform/strata/metal{ dir = 1 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform/hybrisa/metalplatform6{ dir = 4 }, @@ -75804,7 +75761,6 @@ icon_state = "SE-out" }, /obj/effect/hybrisa/decal/dirt, -/obj/structure/machinery/light/blue, /obj/structure/pipes/standard/simple/hidden/dark{ dir = 4 }, @@ -75891,9 +75847,6 @@ dir = 4 }, /obj/effect/hybrisa/decal/dirt, -/obj/structure/machinery/light/double/blue{ - dir = 4 - }, /obj/structure/prop/hybrisa/misc/trash/green, /obj/structure/sign/poster/ad{ pixel_y = 32 @@ -76491,7 +76444,9 @@ }, /area/lv759/indoors/colonial_marshals/reception) "lky" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/effect/decal/warning_stripes{ icon_state = "S"; layer = 3.3 @@ -78727,9 +78682,6 @@ /turf/closed/wall/hybrisa/marhsalls/reinforced, /area/lv759/indoors/colonial_marshals/armory) "lAv" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4 - }, /obj/item/trash/uscm_mre, /obj/effect/hybrisa/decal/trash{ icon_state = "trash_2"; @@ -78854,7 +78806,9 @@ }, /area/lv759/indoors/wy_research_complex/head_research_office) "lBa" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/hybrisa/engineership/engineer_floor3, /area/lv759/indoors/derelict_ship) "lBd" = ( @@ -78914,6 +78868,13 @@ icon_state = "plate" }, /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo) +"lBD" = ( +/obj/structure/window/framed/hybrisa/colony/reinforced, +/obj/structure/machinery/door/poddoor/hybrisa/shutters{ + dir = 8 + }, +/turf/open/floor/plating, +/area/lv759/indoors/meridian/meridian_foyer) "lBG" = ( /obj/effect/decal/cleanable/generic{ color = "#5d524b" @@ -82549,14 +82510,14 @@ }, /area/lv759/indoors/spaceport/docking_bay_2) "mdH" = ( -/obj/structure/machinery/sentry_holder/wy{ - pixel_y = 26 - }, /obj/item/tool/warning_cone{ pixel_x = 5; pixel_y = 13 }, /obj/effect/hybrisa/decal/dirt, +/obj/structure/machinery/sentry_holder/wy{ + pixel_y = 26 + }, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" @@ -83175,7 +83136,9 @@ /turf/open/floor/plating, /area/lv759/indoors/caves/north_caves) "mii" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform/hybrisa/rockdark{ dir = 4 }, @@ -83192,7 +83155,9 @@ /turf/open/hybrisa/street/sidewalk/south, /area/lv759/outdoors/colony_streets/north_west_street) "mil" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/outdoors/caveplateau) "min" = ( @@ -84466,7 +84431,9 @@ layer = 3.3 }, /obj/effect/hybrisa/decal/dirt, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/floor/prison{ dir = 4; icon_state = "ramptop" @@ -85400,7 +85367,7 @@ pixel_y = 32 }, /turf/open/floor/hybrisa/metal/zbrownfloor1{ - dir = 9 + dir = 8 }, /area/lv759/indoors/meridian/meridian_factory) "mzL" = ( @@ -86471,7 +86438,9 @@ /turf/open/auto_turf/hybrisa_auto_turf/layer1, /area/lv759/indoors/caves/north_east_caves) "mHO" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform/hybrisa/rockdark{ dir = 1 }, @@ -86714,7 +86683,9 @@ /obj/structure/platform/strata/metal{ dir = 1 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform/strata/metal{ dir = 4 }, @@ -87156,12 +87127,6 @@ icon_state = "officetiles" }, /area/lv759/indoors/wy_research_complex/changingroom) -"mNe" = ( -/obj/structure/platform/hybrisa/rockdark{ - dir = 1 - }, -/turf/open/auto_turf/hybrisa_auto_turf/layer2, -/area/lv759/outdoors/caves/north_west_caves_outdoors) "mNg" = ( /obj/structure/platform/stair_cut, /obj/effect/decal/warning_stripes{ @@ -87785,7 +87750,9 @@ "mSo" = ( /obj/effect/hybrisa/decal/dirt, /obj/item/device/m56d_gun, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform{ dir = 1 }, @@ -88348,7 +88315,9 @@ icon_state = "W"; layer = 3.3 }, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/floor/strata{ icon_state = "yellow3"; dir = 8 @@ -89501,10 +89470,6 @@ /area/lv759/indoors/colonial_marshals/hallway_north_locker) "nfD" = ( /obj/item/stack/rods, -/obj/structure/machinery/light/spot/blue{ - dir = 1; - pixel_y = 22 - }, /obj/structure/prop/hybrisa/misc/buildinggreebliessmall/smallvent2{ pixel_x = 19; pixel_y = 25 @@ -90518,7 +90483,9 @@ /turf/open/floor/prison, /area/lv759/indoors/landing_zone_2/kmcc_hub_fuel) "noP" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer3, /area/lv759/indoors/caves/central_caves) "noT" = ( @@ -90774,7 +90741,9 @@ /turf/open/floor/plating, /area/lv759/indoors/spaceport/engineering) "nqH" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform_decoration/hybrisa/rockdark{ dir = 8 }, @@ -91763,7 +91732,9 @@ /turf/open/floor/plating, /area/lv759/indoors/power_plant/transformers_north) "nzf" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/prop/invuln/ice_prefab/roof_greeble{ icon_state = "smokestack"; indestructible = 0 @@ -92033,6 +92004,13 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/hybrisa/tile/tilewhite, /area/lv759/indoors/south_public_restroom) +"nBn" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv759/outdoors/colony_streets/east_central_street) "nBo" = ( /obj/structure/prop/hybrisa/vehicles/Colony_Crawlers/Science_2, /turf/open/floor/plating/plating_catwalk/prison, @@ -93449,13 +93427,6 @@ icon_state = "cell_stripe" }, /area/lv759/outdoors/power_plant/transformers_south) -"nMm" = ( -/obj/structure/platform/hybrisa/rockdark{ - dir = 4 - }, -/obj/structure/platform/hybrisa/rockdark, -/turf/open/auto_turf/hybrisa_auto_turf/layer2, -/area/lv759/outdoors/caves/north_west_caves_outdoors) "nMp" = ( /obj/structure/machinery/newscaster{ pixel_y = 30 @@ -93520,7 +93491,9 @@ }, /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo) "nME" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/hybrisa/engineership/engineer_floor9, /area/lv759/indoors/derelict_ship) "nMH" = ( @@ -95130,7 +95103,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/floor/strata{ icon_state = "yellow3"; dir = 5 @@ -95787,7 +95762,9 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 8 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/pipes/vents/pump_hybrisa, /turf/open/floor/strata{ dir = 8; @@ -97078,6 +97055,7 @@ icon_state = "2-6"; layer = 5 }, +/obj/effect/spawner/random/technology_scanner, /turf/open/floor/corsat{ icon_state = "officetiles" }, @@ -97518,7 +97496,9 @@ /turf/open/floor/plating, /area/lv759/indoors/mining_outpost/south) "opH" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/item/ammo_casing/bullet, /turf/open/floor/plating{ icon_state = "platingdmg1" @@ -97659,7 +97639,7 @@ }, /obj/structure/prop/hybrisa/misc/floorprops/grate, /obj/structure/platform/hybrisa/metalplatform1, -/obj/structure/machinery/light/small/blue, +/obj/structure/machinery/light/blue, /turf/open/hybrisa/street/underground_unweedable, /area/lv759/outdoors/colony_streets/central_streets) "orh" = ( @@ -98226,7 +98206,9 @@ /area/lv759/outdoors/colony_streets/south_east_street) "ovp" = ( /obj/structure/platform_decoration/hybrisa/engineer_corner, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/hybrisa/engineership/engineer_floor9, /area/lv759/indoors/derelict_ship) "ovq" = ( @@ -98593,12 +98575,6 @@ }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/north_west_caves) -"oyM" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/hybrisa/street/cement3, -/area/lv759/outdoors/colony_streets/north_street) "oyP" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor{ @@ -98731,6 +98707,15 @@ /obj/structure/blocker/forcefield/vehicles, /turf/open/auto_turf/hybrisa_auto_turf/layer1, /area/lv759/indoors/caves/wy_research_complex_entrance) +"ozu" = ( +/obj/structure/pipes/standard/simple/hidden/dark{ + dir = 4 + }, +/obj/structure/largecrate/random/barrel/black, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/lv759/indoors/wy_research_complex/cargo) "ozy" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecaltop"; @@ -98821,7 +98806,9 @@ /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/north_west_street) "oAc" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/north_west_caves) "oAg" = ( @@ -99122,7 +99109,9 @@ /turf/open/floor/corsat, /area/lv759/indoors/recycling_plant_waste_disposal_incinerator) "oCs" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/largecrate/random/barrel{ layer = 4; pixel_x = 6; @@ -99184,7 +99173,7 @@ /turf/open/floor/plating, /area/lv759/indoors/caves/south_caves) "oDf" = ( -/obj/structure/machinery/light, +/obj/structure/machinery/light/blue, /turf/open/hybrisa/street/sidewalk/south, /area/lv759/outdoors/colony_streets/north_west_street) "oDs" = ( @@ -101588,8 +101577,8 @@ /area/lv759/indoors/wy_research_complex/hallwaysoutheast) "oUP" = ( /obj/structure/cargo_container/hybrisa/containersextended/redleft, -/turf/open/floor/hybrisa/metal/zbrownfloor1{ - dir = 1 +/turf/open/floor/prison{ + icon_state = "cell_stripe" }, /area/lv759/indoors/meridian/meridian_factory) "oUS" = ( @@ -102850,14 +102839,6 @@ }, /turf/open/floor/hybrisa/tile/supermartfloor2, /area/lv759/indoors/power_plant/workers_canteen_kitchen) -"peN" = ( -/obj/effect/hybrisa/decal/dirt, -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 4 - }, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/outdoors/colony_streets/central_streets) "peO" = ( /obj/structure/window/reinforced{ dir = 4; @@ -105853,6 +105834,9 @@ /obj/structure/pipes/standard/simple/hidden/dark{ dir = 4 }, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/prison{ icon_state = "ramptop" }, @@ -106037,7 +106021,9 @@ /turf/open/hybrisa/street/sidewalk/west, /area/lv759/outdoors/colony_streets/north_street) "pCr" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/south_caves) "pCs" = ( @@ -106483,7 +106469,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" @@ -107126,7 +107114,9 @@ /obj/structure/platform/strata/metal{ dir = 1 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform/strata/metal{ dir = 8 }, @@ -108163,7 +108153,9 @@ /turf/open/auto_turf/hybrisa_auto_turf/layer1, /area/lv759/indoors/caves/central_caves) "pSI" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/central_caves) "pSJ" = ( @@ -108226,7 +108218,9 @@ /obj/structure/platform_decoration/hybrisa/engineer_corner{ dir = 8 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/engineer_ship, /area/lv759/indoors/derelict_ship) "pTi" = ( @@ -110532,6 +110526,9 @@ /obj/structure/machinery/light/double/blue{ dir = 1 }, +/obj/structure/prop/hybrisa/misc/redmeter{ + pixel_y = 32 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/wy_research_complex/securityarmory) "qmc" = ( @@ -111447,7 +111444,7 @@ dir = 4 }, /turf/open/hybrisa/street/sidewalkcenter/west, -/area/lv759/outdoors/colony_streets/south_east_street) +/area/lv759/outdoors/colony_streets/east_central_street) "qtb" = ( /obj/structure/machinery/light{ dir = 1 @@ -111645,7 +111642,9 @@ /turf/open/floor/plating, /area/lv759/indoors/hospital/icu) "quu" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -111957,7 +111956,6 @@ /obj/structure/platform_decoration/hybrisa/metalplatformdeco2{ dir = 1 }, -/obj/structure/machinery/light/spot/blue, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/wy_research_complex_entrance) "qwB" = ( @@ -112511,16 +112509,6 @@ icon_state = "blue" }, /area/lv759/indoors/hospital/outgoing) -"qAn" = ( -/obj/item/tool/warning_cone{ - pixel_x = 5; - pixel_y = 13 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8 - }, -/turf/open/hybrisa/street/cement3, -/area/lv759/outdoors/colony_streets/south_east_street) "qAp" = ( /obj/effect/decal/strata_decals/grime/grime3{ dir = 8 @@ -112621,15 +112609,6 @@ icon_state = "blue" }, /area/lv759/indoors/hospital/pharmacy) -"qBv" = ( -/obj/structure/platform/hybrisa/rockdark{ - dir = 1 - }, -/obj/structure/platform/hybrisa/rockdark{ - dir = 4 - }, -/turf/open/auto_turf/hybrisa_auto_turf/layer2, -/area/lv759/outdoors/caves/north_west_caves_outdoors) "qBz" = ( /obj/structure/machinery/door/airlock/multi_tile/hybrisa/black_double/autoname{ dir = 1 @@ -113215,7 +113194,9 @@ /turf/open/floor/plating/plating_catwalk, /area/lv759/indoors/wy_research_complex/head_research_office) "qHc" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/outdoors/caveplateau) "qHd" = ( @@ -113788,7 +113769,9 @@ pixel_y = 13 }, /obj/item/stack/rods, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" @@ -116194,14 +116177,6 @@ /obj/structure/grille, /turf/open/floor/plating, /area/lv759/indoors/mining_outpost/south) -"rcs" = ( -/obj/effect/hybrisa/decal/dirt, -/obj/item/device/flashlight/lamp/tripod/grey{ - layer = 5 - }, -/obj/structure/pipes/standard/simple/hidden/dark, -/turf/open/floor/prison, -/area/lv759/outdoors/colony_streets/south_west_street) "rcw" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -116556,10 +116531,6 @@ /obj/item/reagent_container/glass/beaker/large, /turf/open/floor/hybrisa/tile/tilewhite, /area/lv759/indoors/wy_research_complex/mainlabs) -"rfa" = ( -/obj/structure/platform_decoration/hybrisa/rockdark, -/turf/open/auto_turf/hybrisa_auto_turf/layer3, -/area/lv759/outdoors/caves/north_west_caves_outdoors) "rfb" = ( /obj/structure/barricade/sandbags{ dir = 1; @@ -116960,7 +116931,6 @@ /obj/item/ammo_magazine/rifle/mar40, /obj/item/ammo_magazine/rifle/mar40, /obj/item/ammo_magazine/rifle/mar40, -/obj/item/ammo_magazine/rifle/mar40, /obj/structure/closet/crate/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/central_caves) @@ -117460,13 +117430,6 @@ dir = 8 }, /area/lv759/indoors/spaceport/communications_office) -"rlD" = ( -/obj/structure/machinery/light/double/blue, -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/outdoors/colony_streets/central_streets) "rlE" = ( /obj/structure/pipes/standard/simple/hidden/dark, /turf/open/floor/prison{ @@ -117952,6 +117915,9 @@ dir = 4 }, /obj/structure/platform/hybrisa/metalplatform1, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, /turf/open/hybrisa/street/underground_unweedable, /area/lv759/outdoors/colony_streets/south_east_street) "rpB" = ( @@ -118369,10 +118335,6 @@ /turf/open/hybrisa/street/cement1, /area/lv759/outdoors/colony_streets/north_east_street_LZ) "rsE" = ( -/obj/item/device/flashlight/lamp/tripod{ - light_pixel_y = 1; - pixel_y = 12 - }, /obj/structure/machinery/light{ dir = 1 }, @@ -118386,6 +118348,7 @@ }, /area/lv759/indoors/wy_research_complex/hallwayeast) "rtk" = ( +/obj/structure/largecrate/supply/supplies/metal, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -119335,7 +119298,9 @@ /obj/structure/platform_decoration/hybrisa/engineer_corner{ dir = 1 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/hybrisa/engineership/engineer_floor9, /area/lv759/indoors/derelict_ship) "rzV" = ( @@ -120074,9 +120039,6 @@ /obj/structure/platform/hybrisa/metalplatform2{ dir = 1 }, -/obj/structure/machinery/light{ - dir = 8 - }, /obj/item/stack/sheet/cardboard{ layer = 1 }, @@ -120084,6 +120046,9 @@ /obj/structure/prop/hybrisa/misc/buildinggreebliessmall/smallvent3{ pixel_y = 28 }, +/obj/structure/machinery/light/blue{ + dir = 8 + }, /turf/open/hybrisa/street/cement3, /area/lv759/outdoors/colony_streets/central_streets) "rEL" = ( @@ -120290,7 +120255,6 @@ }, /area/lv759/indoors/hospital/cryo_room) "rFZ" = ( -/obj/structure/largecrate/supply/floodlights, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 2 @@ -120305,6 +120269,7 @@ layer = 2.7; pixel_y = 8 }, +/obj/structure/largecrate/guns, /turf/open/floor/prison{ icon_state = "ramptop" }, @@ -121647,9 +121612,6 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 4 }, -/obj/structure/machinery/light/blue{ - dir = 4 - }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/outdoors/mining_outpost/south_entrance) "rPx" = ( @@ -121876,10 +121838,6 @@ /turf/open/floor/hybrisa/carpet/carpetbeige, /area/lv759/indoors/apartment/eastfoyer) "rRi" = ( -/obj/item/device/flashlight/lamp/tripod{ - layer = 6; - pixel_y = 11 - }, /obj/item/tool/warning_cone{ layer = 5; pixel_y = 19 @@ -122230,7 +122188,9 @@ /obj/structure/platform_decoration/hybrisa/engineer_corner{ dir = 4 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/engineer_ship, /area/lv759/indoors/derelict_ship) "rTB" = ( @@ -122355,12 +122315,12 @@ locked = 0 }, /obj/item/storage/belt/marine, -/obj/item/weapon/gun/rifle/m41a/corporate, /obj/structure/machinery/light/double/blue, /obj/item/ammo_magazine/rifle/ap, /obj/item/ammo_magazine/rifle/ap, /obj/item/ammo_magazine/rifle/ap, /obj/item/ammo_magazine/rifle/ap, +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -122559,12 +122519,6 @@ icon_state = "cell_stripe" }, /area/lv759/indoors/wy_research_complex/hallwaysouthwest) -"rVO" = ( -/obj/structure/platform/hybrisa/rockdark{ - dir = 1 - }, -/turf/open/auto_turf/hybrisa_auto_turf/layer3, -/area/lv759/outdoors/caves/north_west_caves_outdoors) "rVV" = ( /obj/item/tool/warning_cone{ layer = 2; @@ -122694,7 +122648,6 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 1 }, -/obj/structure/machinery/light/blue, /turf/open/hybrisa/street/cement2, /area/lv759/outdoors/colony_streets/north_west_street) "rWK" = ( @@ -123977,9 +123930,6 @@ pixel_x = -13; pixel_y = 11 }, -/obj/item/device/flashlight/lamp/tripod{ - layer = 2 - }, /obj/structure/barricade/handrail/hybrisa/road/plastic/red, /obj/effect/hybrisa/decal/trash{ icon_state = "trash_2"; @@ -124529,12 +124479,6 @@ }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/central_streets) -"sle" = ( -/obj/structure/machinery/light/small/blue{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/indoors/power_plant/workers_canteen_kitchen) "slf" = ( /obj/effect/hybrisa/decal/road/road_stop{ dir = 1; @@ -124966,10 +124910,6 @@ icon_state = "1-4"; color = "#550d0d" }, -/obj/item/storage/backpack/marine/satchel/rto/small{ - pixel_x = 7; - pixel_y = 19 - }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/outdoors/caveplateau) "soY" = ( @@ -124977,16 +124917,11 @@ layer = 1 }, /obj/structure/closet/crate/secure/weyland, -/obj/item/explosive/plastic/breaching_charge, /obj/item/explosive/grenade/high_explosive/pmc, /obj/item/explosive/grenade/high_explosive/pmc{ pixel_x = 6 }, /obj/item/explosive/grenade/high_explosive/pmc, -/obj/item/explosive/grenade/high_explosive/pmc{ - pixel_x = 6 - }, -/obj/item/explosive/plastic/breaching_charge, /obj/effect/spawner/random/technology_scanner, /turf/open/floor/almayer{ icon_state = "cargo" @@ -125803,9 +125738,9 @@ }, /area/lv759/indoors/wy_research_complex/cafeteria) "suC" = ( -/obj/structure/machinery/light, /obj/effect/hybrisa/decal/dirt, /obj/structure/pipes/standard/manifold/hidden/dark, +/obj/structure/machinery/light/blue, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" @@ -128057,13 +127992,6 @@ /obj/item/ammo_casing/bullet, /turf/open/floor/plating/kutjevo, /area/lv759/indoors/colonial_marshals/armory_firingrange) -"sME" = ( -/obj/structure/machinery/light/blue, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/lv759/outdoors/colony_streets/north_east_street_LZ) "sMG" = ( /obj/structure/largecrate/random/barrel/black{ pixel_x = 4; @@ -128276,7 +128204,7 @@ }, /obj/structure/prop/hybrisa/misc/floorprops/grate, /obj/structure/platform/hybrisa/metalplatform1, -/obj/structure/machinery/light/small/blue, +/obj/structure/machinery/light/blue, /turf/open/hybrisa/street/underground_unweedable, /area/lv759/outdoors/colony_streets/central_streets) "sOe" = ( @@ -129078,7 +129006,6 @@ /area/lv759/indoors/derelict_ship) "sUH" = ( /obj/effect/hybrisa/decal/dirt, -/obj/structure/machinery/light/double/blue, /obj/structure/disposalpipe/sortjunction/flipped{ dir = 4 }, @@ -129093,7 +129020,9 @@ "sUK" = ( /obj/effect/hybrisa/decal/dirt, /obj/item/stack/rods, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/structure/sign/safety/airlock{ pixel_x = 14; pixel_y = 32 @@ -129310,9 +129239,6 @@ pixel_y = 9 }, /obj/item/stack/rods, -/obj/structure/machinery/light/blue{ - dir = 4 - }, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -129530,7 +129456,9 @@ /turf/open/floor/plating, /area/lv759/indoors/wy_research_complex/xenoarcheology) "sYf" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer3, /area/lv759/outdoors/caveplateau) "sYg" = ( @@ -130983,15 +130911,6 @@ icon_state = "plating" }, /area/lv759/indoors/spaceport/baggagehandling) -"tih" = ( -/obj/structure/machinery/light/small/blue{ - dir = 4 - }, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/lv759/indoors/caves/central_caves) "tij" = ( /turf/closed/wall/hybrisa/colony/engineering, /area/lv759/indoors/recycling_plant/garage) @@ -132792,9 +132711,6 @@ }, /area/lv759/indoors/spaceport/baggagehandling) "tvm" = ( -/obj/structure/machinery/light/blue{ - dir = 1 - }, /obj/structure/sign/safety/north{ pixel_y = 32 }, @@ -132868,7 +132784,9 @@ }, /area/lv759/indoors/meridian/meridian_office) "tvK" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ dir = 5; @@ -133722,7 +133640,9 @@ dir = 1 }, /obj/effect/decal/cleanable/blood, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/central_caves) "tEE" = ( @@ -134264,16 +134184,6 @@ /obj/structure/pipes/vents/pump_hybrisa, /turf/open/floor/prison, /area/lv759/indoors/landing_zone_2/kmcc_hub_fuel) -"tIx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/structure/machinery/light/spot/blue, -/turf/open/floor/prison{ - icon_state = "cell_stripe" - }, -/area/lv759/indoors/caves/wy_research_complex_entrance) "tIC" = ( /obj/structure/bed/chair/vehicle/white{ pixel_x = 8 @@ -135337,7 +135247,9 @@ }, /area/lv759/indoors/mining_outpost/east_deploymentbay) "tRA" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -135658,18 +135570,6 @@ icon_state = "darkbrown2" }, /area/lv759/indoors/power_plant) -"tUb" = ( -/obj/structure/machinery/light/blue{ - dir = 1 - }, -/obj/structure/sign/safety/landingzone{ - pixel_y = 32 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/lv759/outdoors/colony_streets/north_east_street) "tUd" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -136524,13 +136424,6 @@ }, /turf/open/floor/corsat, /area/lv759/indoors/spaceport/engineering) -"tZB" = ( -/obj/structure/bed/chair/dropship/passenger, -/obj/item/explosive/plastic/breaching_charge, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/lv759/indoors/wy_research_complex/hangarbayshuttle) "tZD" = ( /obj/item/spacecash/c1{ pixel_x = 12; @@ -136637,7 +136530,6 @@ pixel_y = 16 }, /obj/structure/platform_decoration/hybrisa/metalplatformdeco2, -/obj/structure/machinery/light/spot/blue, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/wy_research_complex_entrance) "uaB" = ( @@ -136981,7 +136873,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/prison{ dir = 1; icon_state = "cell_stripe" @@ -138083,7 +137977,9 @@ /turf/open/hybrisa/street/cement3, /area/lv759/outdoors/colony_streets/central_streets) "ulQ" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/hybrisa/engineership/engineer_floor8{ dir = 8 }, @@ -139565,7 +139461,9 @@ /obj/structure/platform/hybrisa/metalplatform6{ dir = 8 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/strata{ dir = 8; icon_state = "orange_edge" @@ -139672,10 +139570,6 @@ icon_state = "red4" }, /area/lv759/indoors/wy_research_complex/securityarmory) -"uyI" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/indoors/caves/north_west_caves) "uyK" = ( /obj/structure/prop/hybrisa/fakeplatforms/platform1{ dir = 8 @@ -140281,7 +140175,9 @@ }, /area/lv759/indoors/spaceport/docking_bay_2) "uDd" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/north_west_caves) "uDg" = ( @@ -141895,7 +141791,6 @@ /obj/structure/machinery/colony_floodlight/street{ pixel_y = 12 }, -/obj/structure/machinery/light/double/blue, /turf/open/hybrisa/street/sidewalk/southwest, /area/lv759/outdoors/colony_streets/east_central_street) "uNP" = ( @@ -142985,8 +142880,8 @@ pixel_y = 7 }, /obj/item/clothing/head/bio_hood/wy_bio{ - pixel_x = 12; - pixel_y = 4 + pixel_x = -8; + pixel_y = 2 }, /turf/open/floor/hybrisa/carpet/carpetblackdeco, /area/lv759/indoors/wy_research_complex/head_research_office) @@ -143296,9 +143191,6 @@ /obj/structure/closet/hydrant{ pixel_y = 32 }, -/obj/item/device/flashlight/lamp/tripod{ - pixel_x = -5 - }, /obj/structure/pipes/standard/simple/hidden/dark{ dir = 4 }, @@ -143368,11 +143260,8 @@ }, /area/lv759/indoors/meridian/meridian_factory) "uYf" = ( -/obj/structure/platform_decoration/hybrisa/rockdark{ - dir = 8 - }, /obj/structure/platform_decoration/hybrisa/rockdark, -/turf/open/auto_turf/hybrisa_auto_turf/layer3, +/turf/open/auto_turf/hybrisa_auto_turf/layer1, /area/lv759/outdoors/caves/north_west_caves_outdoors) "uYg" = ( /turf/open/floor/hybrisa/misc/spaceport2, @@ -145173,7 +145062,6 @@ /obj/structure/barricade/deployable{ dir = 4 }, -/obj/effect/spawner/random/sentry/midchance, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/caves/central_caves) "vnW" = ( @@ -146083,7 +145971,9 @@ /turf/open/auto_turf/hybrisa_auto_turf/layer1, /area/lv759/indoors/caves/south_west_caves) "vuF" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/structure/sign/safety/maint{ pixel_x = 32 }, @@ -146306,8 +146196,7 @@ "vwg" = ( /obj/effect/hybrisa/decal/dirt, /obj/item/device/flashlight/lamp/tripod{ - layer = 6; - pixel_y = 11 + on = 0 }, /turf/open/floor/hybrisa/metal/stripe_red{ dir = 8 @@ -146898,12 +146787,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/plating, /area/lv759/indoors/wy_security/checkpoint_northwest) -"vBj" = ( -/obj/structure/machinery/colony_floodlight/street{ - pixel_y = 18 - }, -/turf/open/hybrisa/street/cement3, -/area/lv759/outdoors/colony_streets/east_central_street) "vBk" = ( /obj/structure/platform/hybrisa/rockdark{ dir = 1 @@ -148299,7 +148182,9 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/casino/casino_vault) "vLE" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /obj/effect/decal/warning_stripes{ icon_state = "N" }, @@ -148631,7 +148516,9 @@ /turf/open/floor/hybrisa/engineership/engineer_floor3, /area/lv759/indoors/derelict_ship) "vNy" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/floor/plating{ dir = 8; icon_state = "platingdmg3" @@ -149520,13 +149407,13 @@ }, /area/lv759/indoors/power_plant) "vUg" = ( -/obj/structure/machinery/sentry_holder/wy{ - pixel_y = 26 - }, /obj/effect/hybrisa/decal/dirt, /obj/structure/pipes/standard/simple/hidden/dark{ dir = 4 }, +/obj/structure/machinery/sentry_holder/wy{ + pixel_y = 26 + }, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" @@ -150009,6 +149896,9 @@ /obj/structure/pipes/standard/simple/hidden/dark, /obj/item/stack/sheet/aluminum, /obj/item/stack/sheet/metal/small_stack, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, /turf/open/floor/hybrisa/metal/zbrownfloor1{ dir = 8 }, @@ -151543,12 +151433,6 @@ icon_state = "officetiles" }, /area/lv759/indoors/colonial_marshals/garage) -"wjS" = ( -/obj/structure/largecrate/supply/supplies/metal, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/lv759/indoors/landing_zone_2/kmcc_hub_cargo) "wjV" = ( /obj/structure/platform_decoration/strata/metal, /obj/structure/pipes/standard/simple/hidden/dark, @@ -151678,7 +151562,6 @@ /obj/item/device/encryptionkey/WY, /obj/item/stack/cable_coil/yellow, /obj/item/device/assembly/prox_sensor, -/obj/item/stack/sheet/plasteel/large_stack, /obj/effect/landmark/objective_landmark/science, /obj/item/prop/almayer/handheld1, /obj/effect/spawner/random/technology_scanner, @@ -152703,7 +152586,9 @@ }, /area/lv759/indoors/meridian/meridian_factory) "wsD" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer1, /area/lv759/indoors/caves/west_caves) "wsK" = ( @@ -153164,8 +153049,8 @@ /area/lv759/oob) "wwo" = ( /obj/structure/cargo_container/hybrisa/containersextended/tanright, -/turf/open/floor/hybrisa/metal/zbrownfloor1{ - dir = 5 +/turf/open/floor/prison{ + icon_state = "cell_stripe" }, /area/lv759/indoors/meridian/meridian_factory) "wwp" = ( @@ -153422,7 +153307,9 @@ }, /area/lv759/indoors/caves/south_west_caves) "wyG" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/hybrisa/engineership/engineer_floor1, /area/lv759/indoors/derelict_ship) "wyI" = ( @@ -154129,12 +154016,6 @@ icon_state = "floor_plate" }, /area/lv759/outdoors/colony_streets/east_central_street) -"wDp" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4 - }, -/turf/open/hybrisa/street/sidewalk/east, -/area/lv759/outdoors/colony_streets/south_east_street) "wDt" = ( /obj/structure/stairs{ color = "#a6aeab" @@ -154327,10 +154208,22 @@ }, /area/lv759/outdoors/colony_streets/central_streets) "wEz" = ( -/obj/structure/platform/hybrisa/metalplatform6, /obj/structure/disposalpipe/tagger{ dir = 4 }, +/obj/structure/platform_decoration/hybrisa/metalplatformdeco6{ + dir = 1 + }, +/obj/structure/prop/hybrisa/misc/fake/wire/blue{ + pixel_x = -4; + level = 1; + plane = -7 + }, +/obj/structure/prop/hybrisa/misc/fake/wire/red{ + pixel_x = 4; + level = 1; + plane = -7 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/outdoors/colony_streets/north_west_street) "wEE" = ( @@ -154868,6 +154761,15 @@ dir = 1 }, /area/lv759/indoors/meridian/meridian_foyer) +"wIO" = ( +/obj/item/stock_parts/matter_bin/adv{ + pixel_x = 6; + pixel_y = 13 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/lv759/indoors/caves/west_caves) "wJc" = ( /obj/structure/pipes/standard/simple/hidden/dark{ dir = 10 @@ -155207,7 +155109,9 @@ /obj/structure/platform_decoration{ dir = 8 }, -/obj/item/device/flashlight/lamp/tripod, +/obj/item/device/flashlight/lamp/tripod{ + on = 0 + }, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -155553,7 +155457,9 @@ /obj/structure/prop/hybrisa/fakeplatforms/platform1{ dir = 1 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/hybrisa/engineership/engineer_floor9, /area/lv759/indoors/derelict_ship) "wOU" = ( @@ -156068,13 +155974,6 @@ icon_state = "ramptop" }, /area/lv759/outdoors/colony_streets/north_street) -"wTe" = ( -/obj/item/trash/cigbutt, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/hybrisa/street/cement3, -/area/lv759/outdoors/colony_streets/north_street) "wTq" = ( /obj/structure/prop/structure_lattice{ dir = 4 @@ -156371,18 +156270,6 @@ "wUM" = ( /turf/open/hybrisa/street/sidewalk/northeast, /area/lv759/outdoors/landing_zone_2) -"wUP" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/machinery/light/double/blue, -/obj/structure/prop/hybrisa/misc/fake/wire/red{ - pixel_x = 4; - level = 1; - plane = -7 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv759/outdoors/colony_streets/central_streets) "wUS" = ( /obj/structure/prop/hybrisa/airport/dropshipnosecone, /turf/open/floor/prison{ @@ -156663,7 +156550,9 @@ /turf/open/auto_turf/hybrisa_auto_turf/layer3, /area/lv759/outdoors/landing_zone_2/kmcc_hub_cargo_entrance_south) "wWZ" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, @@ -156850,12 +156739,6 @@ /obj/structure/pipes/standard/simple/hidden/dark, /turf/open/floor/hybrisa/tile/tilebeige, /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo) -"wYq" = ( -/obj/structure/machinery/colony_floodlight/street{ - pixel_y = 18 - }, -/turf/open/hybrisa/street/cement2, -/area/lv759/outdoors/colony_streets/north_west_street) "wYu" = ( /obj/effect/hybrisa/decal/dirt, /turf/open/hybrisa/street/sidewalk/north, @@ -156870,7 +156753,9 @@ /obj/structure/prop/hybrisa/fakeplatforms/platform1{ dir = 4 }, -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/floor/hybrisa/engineership/engineer_floor9, /area/lv759/indoors/derelict_ship) "wYB" = ( @@ -157797,11 +157682,14 @@ icon_state = "E"; pixel_x = 1 }, -/obj/structure/closet/l3closet/scientist, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" +/obj/structure/window/reinforced{ + dir = 1; + layer = 2 + }, +/obj/structure/machinery/shower{ + dir = 4 }, +/turf/open/floor/plating/plating_catwalk, /area/lv759/indoors/wy_research_complex/hallwaycentral) "xfk" = ( /obj/effect/hybrisa/decal/road/lines1, @@ -158380,7 +158268,9 @@ /turf/open/hybrisa/street/sidewalk/south, /area/lv759/outdoors/colony_streets/north_west_street) "xks" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/effect/decal/warning_stripes{ icon_state = "W" }, @@ -158481,7 +158371,9 @@ }, /area/lv759/indoors/wy_research_complex/hallwaysouthwest) "xld" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/prop/hybrisa/fakeplatforms/platform1{ dir = 1 }, @@ -158825,10 +158717,6 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, -/obj/item/device/flashlight/lamp/tripod{ - light_pixel_y = 1; - pixel_y = 12 - }, /obj/item/tool/warning_cone{ pixel_x = -11; pixel_y = 6 @@ -158837,6 +158725,7 @@ dir = 4 }, /obj/effect/hybrisa/decal/dirt, +/obj/item/device/flashlight/lamp/tripod, /turf/open/hybrisa/street/sidewalk/north, /area/lv759/outdoors/colony_streets/north_east_street) "xoj" = ( @@ -160725,7 +160614,9 @@ /turf/open/auto_turf/hybrisa_auto_turf/layer3, /area/lv759/outdoors/caves/north_west_caves_outdoors) "xAQ" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /turf/open/auto_turf/hybrisa_auto_turf/layer0, /area/lv759/outdoors/caveplateau) "xAW" = ( @@ -161126,7 +161017,6 @@ /area/lv759/indoors/wy_research_complex/weaponresearchlab) "xDD" = ( /obj/item/storage/belt/marine, -/obj/item/weapon/gun/rifle/m41a/corporate, /obj/structure/machinery/light/double/blue, /obj/structure/closet/secure_closet/guncabinet{ locked = 0 @@ -161135,6 +161025,7 @@ /obj/item/ammo_magazine/rifle/ap, /obj/item/ammo_magazine/rifle/ap, /obj/item/ammo_magazine/rifle/ap, +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -161277,12 +161168,6 @@ dir = 4 }, /area/lv759/outdoors/colony_streets/north_east_street) -"xFd" = ( -/obj/structure/platform_decoration/hybrisa/rockdark{ - dir = 8 - }, -/turf/open/auto_turf/hybrisa_auto_turf/layer3, -/area/lv759/outdoors/caves/north_west_caves_outdoors) "xFf" = ( /obj/structure/platform_decoration{ dir = 8 @@ -161869,6 +161754,9 @@ dir = 8 }, /obj/structure/platform/hybrisa/metalplatform1, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, /turf/open/hybrisa/street/underground_unweedable, /area/lv759/outdoors/landing_zone_2) "xJA" = ( @@ -161965,9 +161853,6 @@ /turf/open/hybrisa/street/sidewalk/north, /area/lv759/outdoors/colony_streets/north_street) "xKq" = ( -/obj/structure/machinery/light/blue{ - dir = 4 - }, /obj/structure/barricade/handrail/hybrisa/road/plastic/red{ dir = 1 }, @@ -162675,7 +162560,9 @@ }, /area/lv759/indoors/spaceport/docking_bay_1) "xQK" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/effect/decal/warning_stripes{ icon_state = "E"; layer = 3.33 @@ -163379,11 +163266,6 @@ "xWl" = ( /obj/effect/decal/cleanable/blood, /obj/item/ammo_casing/bullet, -/obj/item/storage/backpack/marine/satchel/rto/small{ - pixel_x = 7; - pixel_y = 19; - layer = 4 - }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -163793,16 +163675,6 @@ }, /turf/open/auto_turf/hybrisa_auto_turf/layer1, /area/lv759/outdoors/colony_streets/north_street) -"xZC" = ( -/obj/structure/machinery/light/blue{ - dir = 4 - }, -/turf/open/hybrisa/street/cement3, -/area/lv759/outdoors/colony_streets/east_central_street) -"xZI" = ( -/obj/structure/prop/hybrisa/boulders/smallboulderdark/boulder_dark2, -/turf/open/auto_turf/hybrisa_auto_turf/layer3, -/area/lv759/outdoors/caves/north_west_caves_outdoors) "xZJ" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -164093,7 +163965,9 @@ /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/east_central_street) "ybI" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/sign/safety/storage{ pixel_x = 8; pixel_y = 32 @@ -164816,7 +164690,9 @@ }, /area/lv759/indoors/wy_research_complex/hallwaynorth) "yhh" = ( -/obj/item/device/flashlight/lamp/tripod/grey, +/obj/item/device/flashlight/lamp/tripod/grey{ + on = 0 + }, /obj/structure/platform/hybrisa/rockdark, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/indoors/caves/central_caves) @@ -167567,7 +167443,7 @@ fdX rnh qqk qqk -hZL +abC qqk abC qqk @@ -168340,7 +168216,7 @@ bRM wDw psu xYj -tZB +psu tlI tUm tUm @@ -168782,7 +168658,7 @@ gHE fnO fnO sqv -tIx +bsG tNW pGM bnA @@ -169538,7 +169414,7 @@ fnO fnO fnO fnO -tIx +bsG tNW kAx gHN @@ -171236,8 +171112,8 @@ rUl kws uSC ltg +hHZ phO -rcs phO phO uSC @@ -171284,7 +171160,7 @@ nXB kIa hlM kIa -uyI +kDT pzO rAo eGa @@ -171777,7 +171653,7 @@ fIf fIf fIf nXB -uyI +kDT quo kIa sqa @@ -171806,7 +171682,7 @@ fnO fnO fnO fnO -tIx +bsG tNW pGM iBo @@ -172500,9 +172376,9 @@ uSC uSC uSC nXc -jZx -fSt uSC +fSt +cMJ phO oYJ oYJ @@ -172562,7 +172438,7 @@ fnO fnO fnO fnO -tIx +bsG tNW kAx qKk @@ -173564,7 +173440,7 @@ bfo iZD hIB edb -cnS +kCR pAI lIb kCR @@ -173825,7 +173701,7 @@ kCR vBQ dXP haP -cLK +ozu hfL uKM aJK @@ -174769,7 +174645,7 @@ bta rQG rQG bta -rQG +bta rQG bta rQG @@ -175022,9 +174898,9 @@ rQG rQG rQG bta -rfa -mTU -mLG +rQG +bta +bta uYf bta qMy @@ -175273,12 +175149,12 @@ rQG rQG rQG rQG -wKf -nMm -plV +rQG +bta +rQG +unn +bta plV -qBv -xFd xVC pcp pYU @@ -175525,12 +175401,12 @@ rQG bta rQG bta -vkl +plV bta -ntJ unn -xZI -mNe +unn +unn +bta xVC nxj oaT @@ -175777,12 +175653,12 @@ plV rQG plV bta -lms -plV +bta +unn +unn unn unn unn -rVO xVC iQD nhq @@ -176029,7 +175905,7 @@ iOk usE usE gmA -fKI +iOk unn unn unn @@ -178266,7 +178142,7 @@ pFy gsg kIl kIl -kfK +gsg gsg gsg gsg @@ -180518,14 +180394,14 @@ evV wqI gGO diT -wYq +jhZ jhZ iBD qMJ ckk wJl jhZ -iZo +jhZ gQj knR gfT @@ -180781,7 +180657,7 @@ hNr tYR ouK wEz -juu +vmj fUi qGw qTR @@ -181033,7 +180909,7 @@ heA iXk kAp fTU -juu +vmj rnS vHv tLs @@ -181531,7 +181407,7 @@ efl jnD rHY gWQ -aTm +efl pJx hDD vkh @@ -181604,7 +181480,7 @@ unn unn iZr imJ -gAS +iZr iZr udz bfH @@ -183089,7 +182965,7 @@ iTs mLY lUy ctH -wUP +ctH tqx tqx hnm @@ -183155,7 +183031,7 @@ bfH bfH udz kqq -hKH +wIO cgq cgq hKH @@ -183341,7 +183217,7 @@ iTs rFB kAz cLv -rlD +oik tqx tqx xcZ @@ -186304,7 +186180,7 @@ qRo gvj gUk qRo -wTe +msQ aTO bwC fke @@ -186365,7 +186241,7 @@ bZr bZr ejB uZy -peN +sUH tqx tqx dds @@ -186394,7 +186270,7 @@ cDN jUz vox hcI -glK +pUT pMp qkv rHL @@ -186617,7 +186493,7 @@ bZr bZr rcP adl -hHb +bPN cZo tqx xcZ @@ -186885,7 +186761,7 @@ xsN xsN ozK dJG -jJc +xsN tdg vKJ foU @@ -187060,7 +186936,7 @@ qRo gUk gUk qRo -oyM +aTO aTO isV quf @@ -188822,7 +188698,7 @@ gWi gXX unn pQi -dyB +kPC rRi sMP hYC @@ -191596,7 +191472,7 @@ iOS pts iTL stq -ald +pPy bwC blP mPu @@ -191882,12 +191758,12 @@ vOf vOf vOf ooC -cFu +usJ ooC sGs sGs miD -iAv +pls ooC ooC ooC @@ -193108,7 +192984,7 @@ dLO wAo cLd hsB -ald +pPy bwC itp vCu @@ -194212,7 +194088,7 @@ pUT jNu hvE eIW -ipA +pUT egv unn unn @@ -195395,7 +195271,7 @@ stq ovC pPy wpm -wpm +tek rwo wpm ega @@ -195453,10 +195329,10 @@ ruZ ruZ ruZ oEE -bEE +lBD jUp tjN -bEE +lBD bEE iHZ gGV @@ -197509,7 +197385,7 @@ mpH tmI fHQ mpH -tih +pUT aqP wqm egv @@ -198419,7 +198295,7 @@ hsB pPy mvs wpm -wpm +qbK wGS iXR tek @@ -199864,7 +199740,7 @@ oHX mSv wRM qnY -pCl +hOW tsr wfM wfM @@ -202293,10 +202169,10 @@ noD irB pSQ ify -qAn +hLx sdf dXr -eba +dXr dXr ykN ram @@ -206527,7 +206403,7 @@ wWV cAC cAC voq -vBj +wWV cAC cAC voq @@ -206784,7 +206660,7 @@ bKD bKD gAU mmD -sle +ufC ufC mmD mmD @@ -209585,7 +209461,7 @@ cmX cmX cmX irB -jIo +cmX cmX rwl irB @@ -210037,14 +209913,14 @@ faX aLu wbj jEy -kkE +bKD dTa dTa dTa dTa dTa dTa -kkE +bKD fBL hdj rQm @@ -210302,7 +210178,7 @@ kTa gHZ kJV voq -giZ +vhY mOc vsd vsd @@ -210554,7 +210430,7 @@ qZC kzg mdQ voq -pfv +dqR mOc vsd vsd @@ -210830,7 +210706,7 @@ xUi uZY lFC mhj -dXr +voq dXr dXr rFE @@ -211082,7 +210958,7 @@ dhV aRU aFn rjI -vGC +mBl vGC vGC vGC @@ -211121,10 +210997,10 @@ uCO eBJ rPb lKd -joo +nnB eIN dxS -joo +nnB eZc sxw ceG @@ -211334,7 +211210,7 @@ tjp fJD lTv vkj -khW +vkj xCG xCG sbZ @@ -211586,7 +211462,7 @@ izJ buT wGm cRb -mKB +dfb cvB cvB cvB @@ -212090,7 +211966,7 @@ lzL esB cuZ kCI -fpp +cfj fpp fpp qrR @@ -212342,7 +212218,7 @@ lCj bRY kzx uFF -lvM +jll neN neN neN @@ -212394,7 +212270,7 @@ gEI qKb uBy eoc -wDp +xCG xjF vFd uTl @@ -212594,7 +212470,7 @@ wns nkr mBl mBl -hCY +oSG vGC vGC mfQ @@ -212846,7 +212722,7 @@ iCF tSC kTA kTA -xCG +kTA sbZ sbZ xCG @@ -212864,10 +212740,10 @@ nwe plY ugn dHt -wDp xCG xCG -wDp +xCG +xCG vCH fCf hTZ @@ -212878,10 +212754,10 @@ oQp nIy iHb fOc -wDp xCG xCG -wDp +xCG +xCG lGg vAo sOV @@ -213098,7 +212974,7 @@ uju voq bKD pNC -cmX +pNC cmX cmX cmX @@ -213326,7 +213202,7 @@ gLe nKu wWB idf -vhY +nBn mOc qjA keU @@ -213373,7 +213249,7 @@ tOf mev jRh ngN -rkD +hUJ vyE oON nJG @@ -213578,7 +213454,7 @@ lhK nKu exs mFR -bOT +pfv mOc tuk uqe @@ -213596,7 +213472,7 @@ uJd nDX oHh fYK -xZC +voq txA gBd xKq @@ -215555,7 +215431,7 @@ agu agu agu agu -tUb +wyI jEF bDW jEF @@ -215807,7 +215683,7 @@ qSq tBD cbr tgC -jHw +nqV qKB cwD okP @@ -216809,7 +216685,7 @@ slT syI lOI eHE -sME +lBU agu esp esp @@ -217388,7 +217264,7 @@ sjK sjK qYM vOe -wjS +eck nkd saV hzD @@ -217571,7 +217447,7 @@ akz pAx avE agu -wyI +djA quB fHw eaK