diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm
index c0d38bf476ac..4355cb0db799 100644
--- a/_maps/map_files220/RandomZLevels/blackmesa.dmm
+++ b/_maps/map_files220/RandomZLevels/blackmesa.dmm
@@ -267,13 +267,10 @@
},
/area/awaymission/black_mesa/xen/acid_lake_hallway)
"auq" = (
-/obj/machinery/gateway{
- dir = 5
- },
-/turf/simulated/floor/vault{
- icon_state = "alienvault"
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
},
-/area/awaymission/black_mesa/xen/nihilanth_arena)
+/area/awaymission/black_mesa/high_security_emitter)
"aur" = (
/obj/structure/sink/puddle/healing,
/turf/simulated/floor/plating/xen,
@@ -429,6 +426,10 @@
icon_state = "smooth_large"
},
/area/awaymission/black_mesa/deep_sci_turret)
+"aCT" = (
+/obj/item/spellbook/oneuse/summonitem,
+/turf/simulated/floor/plating/ironsand,
+/area/awaymission/black_mesa)
"aDg" = (
/obj/structure/alien/xenoweeds,
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer,
@@ -671,16 +672,18 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/entrance_lobby)
"aVB" = (
-/obj/machinery/door/airlock/multi_tile/glass,
/obj/structure/barricade/wooden/crude{
layer = 4
},
+/obj/machinery/door/airlock/silver,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/hecu_zone_external_hall)
"aVR" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/command,
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/black_ops_hall)
"aVW" = (
/obj/structure/fluff/tram_rail,
@@ -759,6 +762,15 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/entrance_lobby)
+"ban" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/structure/railing{
+ dir = 5
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"baK" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
@@ -868,6 +880,17 @@
water_overlay_image = null
},
/area/awaymission/black_mesa/deep_sci_feesh)
+"bkO" = (
+/obj/structure/railing{
+ dir = 9
+ },
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"bkX" = (
/obj/structure/chair/office/dark{
dir = 1
@@ -948,14 +971,11 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/hecu_zone_external_sec)
"bry" = (
-/obj/machinery/door_control/shutter/west{
- id = "nihi";
- req_one_access_txt = "271"
- },
-/turf/simulated/floor/vault{
- icon_state = "alienvault"
+/obj/effect/landmark/damageturf,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
},
-/area/awaymission/black_mesa/xen/nihilanth_arena)
+/area/awaymission/black_mesa/high_security_hallway)
"bsg" = (
/obj/structure/urinal{
pixel_y = 32
@@ -963,6 +983,18 @@
/obj/structure/alien/xenoweeds,
/turf/simulated/floor/plasteel/freezer,
/area/awaymission/black_mesa/equipment_room)
+"bsQ" = (
+/obj/machinery/gateway{
+ dir = 10
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"btq" = (
/obj/structure/rack/gunrack,
/obj/item/gun/projectile/automatic/wt550,
@@ -1203,6 +1235,15 @@
icon_state = "dark"
},
/area/awaymission/black_mesa/security_outpost)
+"bFx" = (
+/obj/machinery/computer{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"bFV" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/stripes/line,
@@ -1228,6 +1269,12 @@
/obj/effect/decal/cleanable/blood/old,
/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/black_mesa/equipment_room)
+"bHe" = (
+/obj/effect/turf_decal/caution,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"bIw" = (
/obj/effect/light_emitter/colored/dark_purple,
/turf/simulated/floor/plating/xen,
@@ -1592,6 +1639,20 @@
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer,
/turf/simulated/floor/beach/away/water/deep/xen,
/area/awaymission/black_mesa/xen/acid_lake_hallway)
+"bYq" = (
+/obj/machinery/gateway{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"bZf" = (
/obj/structure/table,
/obj/item/stack/sheet/plasteel{
@@ -2052,10 +2113,10 @@
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/genetics_elevator)
"cCS" = (
-/obj/structure/xen_pylon,
-/obj/structure/alien/xenoweeds,
-/turf/simulated/floor/engine,
-/area/awaymission/black_mesa/lambda_teleporter)
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/black_ops_server)
"cDl" = (
/obj/structure/closet/crate/can,
/turf/simulated/floor/plasteel/dark{
@@ -2164,12 +2225,10 @@
/turf/simulated/floor/plating/xen,
/area/awaymission/black_mesa/xen/freeman_arena)
"cLr" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2
- },
/obj/structure/barricade/wooden{
layer = 4
},
+/obj/machinery/door/airlock/silver,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/hecu_zone_atrium)
"cLx" = (
@@ -2281,6 +2340,14 @@
},
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/hecu_zone_camp)
+"cTV" = (
+/obj/structure/alien/xenoweeds,
+/obj/effect/bump_teleporter{
+ id = "lambda_xen";
+ density = 0
+ },
+/turf/simulated/floor/engine,
+/area/awaymission/black_mesa/lambda_teleporter)
"cTX" = (
/obj/structure/window/reinforced{
dir = 4
@@ -2440,10 +2507,8 @@
},
/area/awaymission/black_mesa/resonant_chamber)
"daR" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2
- },
/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/silver,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/cryo_room)
"dbQ" = (
@@ -2907,11 +2972,7 @@
/area/awaymission/black_mesa/entrance_lobby)
"dFZ" = (
/obj/structure/rack/gunrack,
-/obj/item/ammo_box/magazine/m556,
-/obj/item/ammo_box/magazine/m556{
- pixel_x = 3;
- pixel_y = 3
- },
+/obj/item/melee/classic_baton,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_armory)
"dGp" = (
@@ -3037,11 +3098,17 @@
/turf/simulated/floor/plasteel/stairs/right,
/area/awaymission/black_mesa/entrance_internal_hall)
"dOs" = (
-/obj/machinery/gateway,
-/turf/simulated/floor/vault{
- icon_state = "alienvault"
+/obj/machinery/gateway{
+ dir = 5
},
-/area/awaymission/black_mesa/xen/nihilanth_arena)
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"dOt" = (
/turf/simulated/floor/beach/away/coastline/beachcorner/xen{
dir = 8
@@ -3066,9 +3133,15 @@
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_hall)
"dQy" = (
-/obj/machinery/gateway/centeraway{
- calibrated = 0;
- requires_power = 0
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/high_security_hallway)
+"dRy" = (
+/obj/structure/railing{
+ dir = 4
},
/turf/simulated/floor/vault{
icon_state = "alienvault"
@@ -3131,6 +3204,17 @@
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/employee_dorm_room)
+"dVA" = (
+/obj/structure/railing{
+ dir = 6
+ },
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"dVX" = (
/obj/structure/flora/biolumini/lamp/weaklight,
/turf/simulated/floor/beach/away/coastline/beachcorner/xen{
@@ -3209,7 +3293,9 @@
"dZy" = (
/obj/machinery/door/airlock/command,
/obj/effect/mapping_helpers/airlock/locked,
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/black_ops_hall)
"dZQ" = (
/turf/simulated/floor/plasteel,
@@ -3288,6 +3374,14 @@
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen/zombie,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/employee_dorm_room)
+"eeW" = (
+/obj/structure/railing{
+ dir = 9
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"eeY" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -3417,10 +3511,8 @@
},
/area/awaymission/black_mesa/scientist_hall)
"ema" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2
- },
/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/silver,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/black_ops_entrance)
"emO" = (
@@ -3529,7 +3621,7 @@
/area/awaymission/black_mesa/entrance)
"etZ" = (
/obj/effect/bump_teleporter{
- id = "lambda_xen";
+ id = "lambda2";
density = 0
},
/turf/simulated/floor/catwalk,
@@ -3548,6 +3640,12 @@
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/deep_sci_medbay)
+"eva" = (
+/obj/structure/rack,
+/obj/item/melee/classic_baton,
+/obj/item/shield/riot,
+/turf/simulated/floor/wood,
+/area/awaymission/black_mesa/employee_dorm_room)
"evs" = (
/obj/machinery/economy/vending/cola/red,
/turf/simulated/floor/carpet/blue,
@@ -3577,6 +3675,14 @@
/obj/item/reagent_containers/food/snacks/xenomeatbreadslice,
/turf/simulated/floor/wood/fancy/cherry,
/area/awaymission/black_mesa/xen/vortigaunt_village)
+"ewP" = (
+/obj/machinery/gateway{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"exq" = (
/obj/effect/gibspawner/human,
/turf/simulated/floor/plasteel/smooth,
@@ -3597,6 +3703,10 @@
dir = 4
},
/area/awaymission/black_mesa/xen/acid_lake_hallway)
+"eyl" = (
+/obj/machinery/door/airlock/silver,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/cryo_room)
"ezt" = (
/obj/effect/turf_decal/siding/blue{
dir = 1
@@ -3611,6 +3721,17 @@
icon_state = "darkbluefull"
},
/area/awaymission/black_mesa/science_internal)
+"eAj" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"eBQ" = (
/obj/effect/mob_spawn/human/corpse/scientist{
pickable_species = list("Human");
@@ -3620,6 +3741,12 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/black_ops_science_room)
+"eBZ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/simulated/floor/engine,
+/area/awaymission/black_mesa/black_ops_server)
"eCs" = (
/turf/simulated/floor/beach/away/coastline/xen/edge_drop,
/area/awaymission/black_mesa/xen/freeman_hallway)
@@ -3915,10 +4042,11 @@
},
/area/awaymission/black_mesa/xen/entering_zone)
"eUk" = (
-/obj/structure/rack/gunrack,
-/obj/item/gun/projectile/automatic/m90,
+/obj/machinery/door/poddoor{
+ id_tag = "teleporter_catwalk"
+ },
/turf/simulated/floor/plasteel/smooth,
-/area/awaymission/black_mesa/black_ops_armory)
+/area/awaymission/black_mesa/lambda_teleporter)
"eUy" = (
/obj/machinery/atmospherics/portable/canister/toxins,
/obj/structure/alien/xenoweeds,
@@ -3951,9 +4079,11 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/black_ops_downstairs_atrium)
"eXP" = (
-/obj/structure/xen_pylon,
-/turf/simulated/floor/plating/xen,
-/area/awaymission/black_mesa/xen/vortigaunt_village)
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/simulated/floor/engine,
+/area/awaymission/black_mesa/black_ops_server)
"eYb" = (
/obj/structure/railing{
dir = 8
@@ -4278,6 +4408,11 @@
/obj/structure/bed/mattress/dirty,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/security_outpost)
+"fuI" = (
+/obj/structure/table,
+/obj/item/reagent_containers/hypospray/autoinjector/stimulants,
+/turf/simulated/floor/plasteel/dark,
+/area/awaymission/black_mesa/xen/lost_camp)
"fuL" = (
/obj/structure/window/reinforced{
dir = 4
@@ -4588,9 +4723,14 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/high_security_surgery)
"fPn" = (
-/obj/structure/xen_pylon,
-/turf/simulated/floor/plating/xen,
-/area/awaymission/black_mesa/xen/village_hallway)
+/obj/structure/railing/corner,
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"fPp" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets/empty,
@@ -4600,14 +4740,11 @@
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/hecu_zone_camp)
"fPX" = (
-/obj/structure/rack,
-/obj/item/ammo_box/magazine/m556,
-/obj/item/ammo_box/magazine/m556{
- pixel_x = 3;
- pixel_y = 3
+/obj/effect/turf_decal/caution/stand_clear,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
},
-/turf/simulated/floor/plasteel/smooth,
-/area/awaymission/black_mesa/black_ops_armory)
+/area/awaymission/black_mesa/lambda_teleporter)
"fQr" = (
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer,
/obj/effect/decal/cleanable/blood,
@@ -4640,6 +4777,14 @@
/obj/machinery/light/directional/north,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/hecu_zone_infirmary)
+"fRO" = (
+/obj/structure/railing{
+ dir = 5
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"fRY" = (
/obj/structure/chair/office{
dir = 4
@@ -4692,6 +4837,11 @@
},
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/security_outpost)
+"fWc" = (
+/obj/machinery/light/directional/east,
+/obj/structure/alien/xenoweeds,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"fWm" = (
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel,
@@ -5192,6 +5342,12 @@
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/deep_sci_chem)
+"gzv" = (
+/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/high_security_hallway)
"gAm" = (
/obj/structure/flora/biolumini/lamp/weaklight,
/turf/simulated/floor/plating/ironsand,
@@ -5285,6 +5441,11 @@
},
/turf/simulated/wall/indestructible/riveted,
/area/awaymission/black_mesa/security_outpost)
+"gEs" = (
+/obj/machinery/light/directional/west,
+/obj/structure/alien/xenoweeds,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"gHa" = (
/obj/machinery/light/directional/north,
/turf/simulated/floor/plasteel/smooth,
@@ -5629,6 +5790,12 @@
/obj/machinery/atmospherics/portable/canister,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/cryo_room)
+"hdH" = (
+/obj/machinery/light/directional/north,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"hdI" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets,
@@ -5787,11 +5954,10 @@
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/deep_sci_storage)
"hns" = (
-/obj/structure/barricade/wooden/crude{
- layer = 4
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
},
-/turf/simulated/floor/plasteel/smooth,
-/area/awaymission/black_mesa/hecu_zone_atrium)
+/area/awaymission/black_mesa/high_security_hallway)
"hov" = (
/obj/machinery/power/terminal{
dir = 1
@@ -5846,7 +6012,7 @@
},
/area/awaymission/black_mesa/resonant_chamber)
"hsS" = (
-/obj/machinery/door/airlock/vault,
+/obj/machinery/door/airlock/highsecurity,
/obj/effect/mapping_helpers/airlock/locked,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/employee_dorm_room)
@@ -5954,6 +6120,15 @@
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/xen/lost_camp)
+"hDi" = (
+/obj/effect/bump_teleporter{
+ id = "short1";
+ id_target = "short2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "elevatorshaft"
+ },
+/area/awaymission/black_mesa/entrance_lobby)
"hDt" = (
/obj/effect/mob_spawn/human/corpse/scientist{
pickable_species = list("Human");
@@ -5970,9 +6145,17 @@
/area/awaymission/black_mesa/xen/lost_camp)
"hDG" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/vault,
+/obj/machinery/door/airlock/highsecurity,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/high_security_hallway)
+"hEM" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"hER" = (
/obj/structure/rack,
/obj/item/assembly/shock_kit,
@@ -6287,6 +6470,14 @@
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/employee_dorm_room)
+"ibZ" = (
+/obj/structure/table/reinforced,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/item/assembly/signaler/anomaly/bluespace,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"ict" = (
/obj/structure/closet/crate/can,
/turf/simulated/floor/plasteel,
@@ -6309,6 +6500,12 @@
/obj/effect/light_emitter/colored/lime,
/turf/simulated/floor/plating/dirt/xen_dirt,
/area/awaymission/black_mesa/xen/nihilanth_computer)
+"idQ" = (
+/obj/machinery/gateway,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"ief" = (
/obj/structure/flora/biolumini/flower,
/turf/simulated/floor/plating/xen,
@@ -6338,10 +6535,11 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/entrance_lobby)
"igy" = (
-/obj/machinery/light/directional/east,
-/mob/living/simple_animal/hostile/blackmesa/sec,
-/turf/simulated/floor/plasteel/smooth,
-/area/awaymission/black_mesa/black_ops_armory)
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/high_security_hallway)
"igU" = (
/obj/item/storage/box,
/obj/effect/decal/cleanable/dirt,
@@ -6425,6 +6623,10 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/deep_sci_medbay)
+"imm" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/simulated/floor/engine,
+/area/awaymission/black_mesa/black_ops_server)
"imv" = (
/obj/machinery/light/directional/north,
/turf/simulated/floor/plating,
@@ -6455,6 +6657,15 @@
"inc" = (
/turf/simulated/floor/plating/xen,
/area/awaymission/black_mesa/xen/nihilanth_computer)
+"iot" = (
+/obj/structure/railing/corner,
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"iox" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -6535,6 +6746,18 @@
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/lambda_teleporter)
+"iud" = (
+/obj/machinery/gateway{
+ dir = 9
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"ivk" = (
/obj/structure/flora/biolumini/flower,
/turf/simulated/floor/plating/xen,
@@ -6563,6 +6786,12 @@
/obj/effect/light_emitter/colored/dark_purple,
/turf/simulated/floor/plating/xen,
/area/awaymission/black_mesa/xen/village_hallway)
+"iyQ" = (
+/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/high_security_hallway)
"izs" = (
/obj/machinery/light/directional/west,
/obj/effect/decal/cleanable/blood,
@@ -6579,7 +6808,6 @@
"iBg" = (
/obj/structure/rack/gunrack,
/obj/item/ammo_box/n762,
-/obj/item/ammo_box/n762,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/security_outpost)
"iBz" = (
@@ -6621,9 +6849,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/entrance_large_office)
"iDd" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2
- },
+/obj/machinery/door/airlock/silver,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/cryo_storage)
"iDh" = (
@@ -6862,6 +7088,11 @@
icon_state = "dark"
},
/area/awaymission/black_mesa/science_decon_room)
+"iQm" = (
+/obj/structure/alien/xenoweeds,
+/obj/structure/alien/xenoweeds,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"iQJ" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -7111,10 +7342,13 @@
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/black_ops_entrance)
"jgN" = (
-/obj/structure/table,
-/obj/item/paper/researchnotes,
-/turf/simulated/floor/plasteel,
-/area/awaymission/black_mesa/black_ops_science_room)
+/obj/machinery/door/poddoor{
+ id_tag = "biolabs"
+ },
+/turf/simulated/floor/plasteel/dark{
+ icon_state = "dark"
+ },
+/area/awaymission/black_mesa/science_internal)
"jhc" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/barricade/wooden/crude{
@@ -7276,6 +7510,12 @@
dir = 8
},
/area/awaymission/black_mesa/xen/lost_camp_hallway)
+"jmV" = (
+/obj/structure/closet,
+/obj/item/clothing/glasses/meson/fluff/book_berner_1,
+/obj/item/clothing/suit/storage/labcoat,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"jog" = (
/obj/structure/sign/securearea{
pixel_y = 32
@@ -7423,6 +7663,14 @@
icon_state = "dark"
},
/area/awaymission/black_mesa/security_outpost)
+"jyU" = (
+/obj/structure/railing{
+ dir = 6
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"jzj" = (
/obj/structure/window/reinforced{
dir = 8
@@ -7605,6 +7853,17 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/high_security_servers)
+"jKr" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"jLu" = (
/obj/structure/sign/chemistry{
pixel_y = -32
@@ -7699,6 +7958,12 @@
/obj/item/grenade/xen_crystal,
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/xen/acid_lake_building)
+"jTd" = (
+/obj/structure/railing,
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"jTT" = (
/turf/simulated/floor/beach/away/coastline/xen,
/area/awaymission/black_mesa/xen/acid_lake_hallway)
@@ -7807,7 +8072,9 @@
"kag" = (
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/high_security_hallway)
"kai" = (
/obj/structure/table,
@@ -7998,6 +8265,12 @@
/obj/structure/flora/rock/pile,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/tram_room)
+"kiC" = (
+/obj/structure/railing,
+/turf/simulated/floor/plasteel{
+ icon_state = "elevatorshaft"
+ },
+/area/awaymission/black_mesa/science_internal)
"kiK" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -8182,6 +8455,15 @@
water_overlay_image = null
},
/area/awaymission/black_mesa/deep_sci_feesh)
+"kuM" = (
+/obj/item/ammo_box/magazine/m556{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/structure/rack,
+/obj/item/ammo_box/magazine/m556,
+/turf/simulated/floor/plasteel/dark,
+/area/awaymission/black_mesa/xen/lost_camp)
"kuN" = (
/obj/machinery/porta_turret/syndicate/black_mesa/blackops,
/turf/simulated/floor/plasteel,
@@ -8450,6 +8732,15 @@
/obj/effect/gibspawner/human,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/tram_room)
+"kPI" = (
+/obj/structure/table/reinforced,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/item/paper/researchnotes,
+/obj/item/pen,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"kPM" = (
/obj/structure/alien/xenoweeds,
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/scientist_zombie,
@@ -8530,6 +8821,14 @@
"kRO" = (
/turf/simulated/floor/beach/away/coastline/beachcorner/xen,
/area/awaymission/black_mesa/xen/acid_lake_hallway)
+"kSR" = (
+/obj/effect/turf_decal/arrows{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel/dark{
+ icon_state = "dark"
+ },
+/area/awaymission/black_mesa/science_internal)
"kSZ" = (
/obj/machinery/light/directional/north,
/turf/simulated/floor/plasteel,
@@ -8586,6 +8885,12 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/hecu_zone_infirmary)
+"kXg" = (
+/obj/structure/railing/corner,
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"kXz" = (
/obj/structure/table,
/obj/machinery/recharger,
@@ -8811,9 +9116,18 @@
/obj/structure/xen_crystal,
/turf/simulated/floor/plating/ironsand,
/area/awaymission/black_mesa)
+"lmy" = (
+/turf/simulated/floor/plasteel/stairs{
+ dir = 4
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"lmV" = (
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/high_security_hallway)
+"lmZ" = (
+/obj/machinery/door/airlock/silver,
+/turf/simulated/floor/plasteel,
+/area/awaymission/black_mesa/black_ops_entrance)
"lnj" = (
/obj/structure/flora/rock/pile,
/obj/effect/landmark/damageturf,
@@ -8891,6 +9205,14 @@
icon_state = "dark"
},
/area/awaymission/black_mesa/high_security_surgery)
+"lrt" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"lrK" = (
/obj/machinery/power/emitter{
dir = 4;
@@ -9102,7 +9424,9 @@
/area/awaymission/black_mesa/black_ops_entrance)
"lCF" = (
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen,
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/high_security_emitter)
"lCM" = (
/obj/structure/chair/office/dark{
@@ -9598,6 +9922,9 @@
anchored = 1;
layer = 3.1
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
/turf/simulated/floor/engine,
/area/awaymission/black_mesa/black_ops_server)
"mkI" = (
@@ -9933,9 +10260,7 @@
/turf/simulated/floor/plating/xen,
/area/awaymission/black_mesa/xen/freeman_hallway)
"mIR" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2
- },
+/obj/machinery/door/airlock/silver,
/turf/simulated/floor/plasteel/dark{
icon_state = "dark"
},
@@ -9981,11 +10306,30 @@
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/lambda_teleporter)
+"mLs" = (
+/obj/structure/railing,
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"mLZ" = (
/obj/structure/alien/xenoweeds,
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/scientist_zombie,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/science_labs)
+"mMa" = (
+/obj/effect/bump_teleporter/lambda{
+ id = "lambda_xen2";
+ id_target = "lambda2";
+ color = "lime"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"mMq" = (
/obj/structure/fluff/tram_rail{
dir = 1
@@ -10289,6 +10633,12 @@
/obj/structure/chair/sofa/bench/right,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/employee_dorm_room)
+"naB" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/simulated/floor/engine,
+/area/awaymission/black_mesa/black_ops_server)
"naK" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/barricade/wooden/crude{
@@ -10439,9 +10789,13 @@
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/xen/lost_camp)
"njT" = (
-/obj/item/ammo_box/magazine/m556,
-/turf/simulated/floor/plasteel/smooth,
-/area/awaymission/black_mesa/hecu_zone_external_sec)
+/obj/machinery/door/poddoor{
+ id_tag = "teleporter"
+ },
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/black_ops_hall)
"njV" = (
/obj/machinery/door/window/reinforced/normal{
dir = 8
@@ -10454,6 +10808,10 @@
/obj/effect/decal/remains/human,
/turf/simulated/floor/beach/away/blackmesa/xen_acid,
/area/awaymission/black_mesa/xen/acid_lake)
+"nkY" = (
+/obj/structure/filingcabinet/chestdrawer,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"nlz" = (
/turf/simulated/wall/indestructible/riveted,
/area/awaymission/black_mesa/deep_sci_turret)
@@ -10547,7 +10905,9 @@
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/hecu_zone_camp)
"nrj" = (
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/black_ops_hallway_two)
"nru" = (
/obj/structure/alien/xenoweeds,
@@ -10586,6 +10946,17 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/entrance_lobby)
+"ntM" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"ntN" = (
/turf/simulated/floor/beach/away/water/deep/xen,
/area/awaymission/black_mesa/xen/lost_camp_hallway)
@@ -10731,10 +11102,13 @@
/turf/simulated/floor/plating/dirt/xen_dirt,
/area/awaymission/black_mesa/xen/freeman_puzzle)
"nEp" = (
-/obj/structure/table/wood,
-/obj/item/gun/projectile/automatic/m90,
-/turf/simulated/floor/wood/fancy/cherry,
-/area/awaymission/black_mesa/xen/freeman_arena)
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"nEy" = (
/obj/effect/baseturf_helper{
baseturf = /turf/simulated/floor/plating
@@ -10801,6 +11175,14 @@
icon_state = "brownfull"
},
/area/awaymission/black_mesa/hecu_zone_bathroom)
+"nJb" = (
+/obj/structure/barricade/wooden{
+ layer = 4
+ },
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/high_security_hallway)
"nKj" = (
/obj/structure/extinguisher_cabinet/directional/west,
/turf/simulated/floor/beach/away/blackmesa/electric,
@@ -10852,6 +11234,17 @@
},
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/tram_room)
+"nMo" = (
+/obj/structure/railing{
+ dir = 5
+ },
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"nMp" = (
/obj/machinery/light/directional/north,
/turf/simulated/floor/catwalk,
@@ -10988,6 +11381,15 @@
icon_state = "smooth_large"
},
/area/awaymission/black_mesa/deep_sci_hall)
+"nXD" = (
+/obj/machinery/gateway/centeraway{
+ calibrated = 0;
+ requires_power = 0
+ },
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"nXH" = (
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel/smooth,
@@ -11140,6 +11542,14 @@
icon_state = "dark"
},
/area/awaymission/black_mesa/science_labs)
+"ofG" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"ofJ" = (
/obj/structure/alien/weeds/node,
/turf/simulated/floor/plasteel/smooth,
@@ -11403,6 +11813,12 @@
icon_state = "dark"
},
/area/awaymission/black_mesa/high_security_surgery)
+"owQ" = (
+/obj/machinery/light/directional/east,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"oxr" = (
/obj/effect/turf_decal/siding/trimline/green{
alpha = 130;
@@ -11430,7 +11846,9 @@
/area/awaymission/black_mesa/hecu_zone_camp)
"oyK" = (
/obj/machinery/light/directional/west,
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/black_ops_server)
"oyL" = (
/obj/machinery/light/directional/west,
@@ -11597,10 +12015,14 @@
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/deep_sci_chem)
"oIv" = (
-/obj/structure/alien/xenoweeds,
-/obj/structure/xen_pylon,
-/turf/simulated/floor/plating,
-/area/awaymission/black_mesa/resonant_chamber)
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"oIM" = (
/obj/machinery/atmospherics/unary/tank/oxygen_agent_b,
/turf/simulated/floor/plasteel,
@@ -11719,13 +12141,12 @@
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/tram_room)
"oPu" = (
-/obj/machinery/gateway{
- dir = 6
- },
-/turf/simulated/floor/vault{
- icon_state = "alienvault"
+/obj/machinery/door/poddoor{
+ id_tag = "biolabs"
},
-/area/awaymission/black_mesa/xen/nihilanth_arena)
+/obj/structure/alien/xenoweeds,
+/turf/simulated/floor/plasteel,
+/area/awaymission/black_mesa/entrance_lobby)
"oPx" = (
/obj/effect/baseturf_helper/asteroid,
/turf/simulated/wall/indestructible/rock/mineral,
@@ -11896,6 +12317,17 @@
dir = 4
},
/area/awaymission/black_mesa/black_ops_downstairs_atrium)
+"paf" = (
+/obj/structure/railing{
+ dir = 10
+ },
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"paH" = (
/obj/structure/alien/xenoweeds,
/turf/simulated/floor/plasteel/dark{
@@ -11961,6 +12393,12 @@
icon_state = "alienvault"
},
/area/awaymission/black_mesa/xen/nihilanth_hallway)
+"pdq" = (
+/obj/structure/chair/office/dark{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"pdr" = (
/obj/structure/closet,
/obj/structure/alien/xenoweeds,
@@ -11977,6 +12415,10 @@
/obj/machinery/porta_turret/syndicate/black_mesa/blackops,
/turf/simulated/floor/plating/ironsand,
/area/awaymission/black_mesa/hecu_zone_towards_facility)
+"pfg" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/turf/simulated/floor/plating,
+/area/awaymission/black_mesa/lambda_teleporter)
"pfp" = (
/obj/machinery/light/directional/south,
/turf/simulated/floor/catwalk,
@@ -12058,6 +12500,15 @@
},
/turf/simulated/floor/plasteel/white,
/area/awaymission/black_mesa/hecu_zone_camp)
+"pky" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/railing{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"pkT" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/ammo_box/magazine/enforcer/lethal,
@@ -12065,8 +12516,8 @@
/obj/item/gun/projectile/automatic/pistol/enforcer/lethal,
/obj/item/ammo_box/magazine/m556,
/obj/item/ammo_box/magazine/m556,
-/obj/item/ammo_box/magazine/m556,
-/obj/item/ammo_box/magazine/m556,
+/obj/item/ammo_box/magazine/enforcer/lethal,
+/obj/item/ammo_box/magazine/enforcer/lethal,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/black_ops_entrance)
"plF" = (
@@ -12280,6 +12731,12 @@
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/deep_sci_storage)
+"pAt" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/simulated/floor/engine,
+/area/awaymission/black_mesa/black_ops_server)
"pAA" = (
/obj/machinery/light/directional/west,
/obj/structure/largecrate,
@@ -12354,6 +12811,11 @@
icon_state = "dark"
},
/area/awaymission/black_mesa/science_labs)
+"pGt" = (
+/obj/item/gun/projectile/automatic/m90,
+/obj/structure/rack/gunrack,
+/turf/simulated/floor/plasteel/dark,
+/area/awaymission/black_mesa/xen/lost_camp)
"pHL" = (
/obj/machinery/light/directional/east,
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/scientist_zombie,
@@ -12458,6 +12920,13 @@
/obj/structure/table,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/deep_sci_chem)
+"pNQ" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/structure/alien/xenoweeds,
+/turf/simulated/floor/bluegrid,
+/area/awaymission/black_mesa/lambda_teleporter)
"pNZ" = (
/obj/structure/table,
/obj/item/storage/firstaid/doctor,
@@ -12584,6 +13053,17 @@
/obj/structure/alien/xenoweeds,
/turf/simulated/floor/plasteel/stairs/right,
/area/awaymission/black_mesa/equipment_room)
+"pVt" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"pVI" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel,
@@ -12626,13 +13106,11 @@
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/hecu_zone_external_hall)
"pXU" = (
-/obj/machinery/gateway{
+/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/turf/simulated/floor/vault{
- icon_state = "alienvault"
- },
-/area/awaymission/black_mesa/xen/nihilanth_arena)
+/turf/simulated/floor/engine,
+/area/awaymission/black_mesa/black_ops_server)
"pYv" = (
/obj/structure/table,
/obj/structure{
@@ -12664,7 +13142,6 @@
/obj/structure/rack,
/obj/item/ammo_box/a762,
/obj/item/ammo_box/a762,
-/obj/item/ammo_box/a762,
/turf/simulated/floor/wood,
/area/awaymission/black_mesa/employee_dorm_room)
"qas" = (
@@ -12788,6 +13265,11 @@
"qkQ" = (
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/genetics)
+"qlk" = (
+/obj/structure/railing,
+/obj/structure/alien/xenoweeds,
+/turf/simulated/floor/bluegrid,
+/area/awaymission/black_mesa/lambda_teleporter)
"qll" = (
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen,
/turf/simulated/floor/plating/xen,
@@ -13030,7 +13512,15 @@
},
/area/awaymission/black_mesa/high_security_hallway)
"qAN" = (
-/turf/simulated/wall/indestructible/fakeglass/brass,
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
/area/awaymission/black_mesa/xen/nihilanth_arena)
"qBd" = (
/obj/machinery/light/directional/east,
@@ -13255,7 +13745,7 @@
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/deep_sci_medbay)
"qMW" = (
-/obj/structure/filingcabinet/security,
+/obj/structure/filingcabinet,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
@@ -13493,13 +13983,19 @@
/area/awaymission/black_mesa/equipment_room)
"rbO" = (
/obj/machinery/light/directional/east,
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/black_ops_server)
"rbQ" = (
/obj/structure/fence/cut/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/tram_tunnel)
+"rcb" = (
+/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/blackops,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/black_ops_hall)
"rcA" = (
/obj/structure/table,
/obj/item/folder/blue,
@@ -13636,6 +14132,12 @@
/obj/structure/alien/xenoweeds,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/resonant_chamber)
+"rlX" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/simulated/floor/engine,
+/area/awaymission/black_mesa/black_ops_server)
"rma" = (
/obj/machinery/door/window/reinforced/normal{
dir = 4
@@ -14013,6 +14515,11 @@
icon_state = "brownfull"
},
/area/awaymission/black_mesa/hecu_zone_bathroom)
+"rKy" = (
+/obj/machinery/light/directional/south,
+/obj/structure/alien/xenoweeds,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"rKz" = (
/obj/effect/decal/cleanable/blood/old,
/turf/simulated/floor/plasteel{
@@ -14494,13 +15001,10 @@
},
/area/awaymission/black_mesa/high_security_surgery)
"sqa" = (
-/obj/machinery/gateway{
- dir = 8
- },
-/turf/simulated/floor/vault{
- icon_state = "alienvault"
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
},
-/area/awaymission/black_mesa/xen/nihilanth_arena)
+/area/awaymission/black_mesa/lambda_teleporter)
"sqh" = (
/obj/structure/table,
/obj/item/gun/energy/lasercannon,
@@ -14575,6 +15079,12 @@
/obj/structure/bed/mattress/dirty,
/turf/simulated/floor/wood/fancy/cherry,
/area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth)
+"sty" = (
+/obj/machinery/light/directional/south,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"sun" = (
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/blackops,
/turf/simulated/floor/plasteel,
@@ -14640,7 +15150,9 @@
"sxR" = (
/obj/machinery/door/airlock/science/glass,
/obj/effect/mapping_helpers/airlock/locked,
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/high_security_hallway)
"syu" = (
/obj/machinery/door/poddoor{
@@ -14856,6 +15368,15 @@
},
/turf/simulated/floor/plating/ironsand,
/area/awaymission/black_mesa/hecu_zone_camp)
+"sLq" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/structure/railing{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"sLJ" = (
/turf/simulated/floor/beach/away/coastline/xen{
dir = 6
@@ -14999,9 +15520,13 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/entrance_lobby)
"sXb" = (
-/obj/item/spellbook/oneuse/summonitem,
-/turf/simulated/floor/plating/xen,
-/area/awaymission/black_mesa/xen/nihilanth_computer)
+/obj/structure/railing{
+ dir = 10
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"sXe" = (
/turf/simulated/floor/plating/xen,
/area/awaymission/black_mesa/xen/village_hallway)
@@ -15072,9 +15597,7 @@
/turf/simulated/floor/wood/fancy/cherry,
/area/awaymission/black_mesa/xen/freeman_arena)
"tbG" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2
- },
+/obj/machinery/door/airlock/silver,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/deep_sci_turret)
"tbR" = (
@@ -15132,13 +15655,21 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/entrance_lobby)
"tgn" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/turf/simulated/floor/vault{
- icon_state = "alienvault"
+/turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air{
+ light_color = null;
+ light_range = 0;
+ light_power = 0
},
/area/awaymission/black_mesa/xen/nihilanth_arena)
+"tgq" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/structure/railing{
+ dir = 9
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"tgE" = (
/obj/effect/baseturf_helper{
baseturf = /turf/simulated/floor/plating
@@ -15554,6 +16085,11 @@
light_power = 0
},
/area/awaymission/black_mesa/lambda_teleporter)
+"tJO" = (
+/obj/structure/rack/gunrack,
+/obj/item/shield/riot,
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/black_ops_armory)
"tKa" = (
/obj/structure/rack,
/obj/item/clothing/suit/armor/vest/security{
@@ -15753,6 +16289,15 @@
},
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/cryo_storage)
+"tZT" = (
+/obj/effect/bump_teleporter{
+ id = "short2";
+ id_target = "short1"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "elevatorshaft"
+ },
+/area/awaymission/black_mesa/science_internal)
"uax" = (
/turf/simulated/wall/indestructible/riveted,
/area/awaymission/black_mesa/entrance_tunnel)
@@ -16094,7 +16639,9 @@
/area/awaymission/black_mesa/security_outpost)
"uza" = (
/obj/machinery/door/airlock/science/glass,
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/black_ops_hallway_two)
"uzo" = (
/obj/effect/decal/cleanable/dirt,
@@ -16121,8 +16668,8 @@
/area/awaymission/black_mesa/entrance_tunnel)
"uAM" = (
/obj/effect/bump_teleporter/lambda{
- id = "lambda";
- id_target = "lambda_xen"
+ id = "lambda_xen2";
+ id_target = "lambda2"
},
/turf/simulated/floor/engine,
/area/awaymission/black_mesa/lambda_teleporter)
@@ -16285,13 +16832,11 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/black_ops_entrance)
"uJh" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/turf/simulated/floor/vault{
- icon_state = "alienvault"
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
},
-/area/awaymission/black_mesa/xen/nihilanth_arena)
+/area/awaymission/black_mesa/high_security_hallway)
"uKC" = (
/obj/effect/turf_decal/arrows,
/turf/simulated/floor/mineral/titanium,
@@ -16360,6 +16905,20 @@
/obj/effect/light_emitter/colored/dark_purple,
/turf/simulated/floor/plating/dirt/xen_dirt,
/area/awaymission/black_mesa/xen/nihilanth_computer)
+"uNf" = (
+/obj/machinery/gateway{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/lambda_teleporter)
"uNn" = (
/obj/structure/rack,
/obj/item/flash,
@@ -16507,7 +17066,9 @@
"uUV" = (
/obj/effect/landmark/damageturf,
/obj/item/pickaxe/silver,
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/high_security_hallway)
"uVv" = (
/obj/structure/rack/gunrack,
@@ -16675,8 +17236,8 @@
/turf/simulated/wall/indestructible/riveted,
/area/awaymission/black_mesa/black_ops_button)
"vfW" = (
-/obj/machinery/gateway{
- dir = 10
+/obj/structure/railing{
+ dir = 1
},
/turf/simulated/floor/vault{
icon_state = "alienvault"
@@ -16810,6 +17371,12 @@
},
/turf/simulated/floor/plating/xen,
/area/awaymission/black_mesa/xen/freeman_puzzle)
+"vnt" = (
+/obj/structure/railing,
+/turf/simulated/floor/plasteel{
+ icon_state = "elevatorshaft"
+ },
+/area/awaymission/black_mesa/entrance_lobby)
"voM" = (
/obj/item/ammo_box/magazine/enforcer/lethal,
/obj/machinery/light/directional/west,
@@ -16824,7 +17391,7 @@
/area/awaymission/black_mesa/science_internal)
"vpF" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/vault,
+/obj/machinery/door/airlock/highsecurity,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/hecu_zone_external_sec)
"vqb" = (
@@ -16911,6 +17478,25 @@
/obj/structure/table,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/black_ops_entrance)
+"vwk" = (
+/obj/machinery/computer{
+ dir = 8;
+ icon_state = "broken";
+ icon_screen = "broken";
+ icon_keyboard = "generic_key_broken"
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
+"vxK" = (
+/obj/structure/flora/rock/pile,
+/obj/effect/landmark/damageturf,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/high_security_hallway)
"vyy" = (
/obj/effect/baseturf_helper{
baseturf = /turf/simulated/floor/plating
@@ -17138,7 +17724,9 @@
pda = null;
back = null
},
-/turf/simulated/floor/plasteel/smooth,
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
/area/awaymission/black_mesa/high_security_hallway)
"vNJ" = (
/turf/simulated/floor/plasteel/stairs/left{
@@ -17257,6 +17845,17 @@
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/tram_tunnel)
+"vUj" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/structure/marker_beacon/spotlight/jade{
+ icon_state = "markerolive-on"
+ },
+/turf/simulated/floor/vault{
+ icon_state = "alienvault"
+ },
+/area/awaymission/black_mesa/xen/nihilanth_arena)
"vUy" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/vault,
@@ -17426,12 +18025,10 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/security_outpost)
"wic" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2
- },
/obj/structure/barricade/wooden/crude{
layer = 4
},
+/obj/machinery/door/airlock/silver,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/hecu_zone_atrium)
"wit" = (
@@ -17734,6 +18331,18 @@
"wAi" = (
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/high_security_servers)
+"wAR" = (
+/obj/machinery/gateway{
+ dir = 6
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"wAU" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -17795,7 +18404,7 @@
/area/awaymission/black_mesa/hecu_zone_infirmary)
"wDP" = (
/obj/structure/table,
-/obj/item/ammo_box/magazine/enforcer/lethal,
+/obj/item/reagent_containers/glass/beaker,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/genetics)
"wFc" = (
@@ -17860,11 +18469,10 @@
},
/area/awaymission/black_mesa/security_outpost)
"wKi" = (
-/obj/structure/rack,
-/obj/item/ammo_box/c9mm,
-/obj/machinery/light/directional/north,
-/turf/simulated/floor/plasteel/smooth,
-/area/awaymission/black_mesa/black_ops_armory)
+/turf/simulated/floor/plasteel/smooth{
+ icon_state = "smooth_large"
+ },
+/area/awaymission/black_mesa/black_ops_hall)
"wKw" = (
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/cryo_hallway)
@@ -18264,6 +18872,19 @@
/obj/structure/flora/biolumini,
/turf/simulated/floor/plating/xen,
/area/awaymission/black_mesa/xen/freeman_arena)
+"xgy" = (
+/obj/structure{
+ icon = 'icons/obj/machines/telecomms.dmi';
+ icon_state = "hub";
+ name = "server";
+ density = 1;
+ anchored = 1
+ },
+/obj/structure/railing{
+ dir = 5
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"xgX" = (
/obj/structure/railing/corner,
/turf/simulated/floor/plasteel/dark{
@@ -18379,11 +19000,10 @@
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/hecu_zone_camp)
"xpp" = (
-/obj/structure/curtain,
-/obj/structure/closet/secure_closet,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/structure/curtain,
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/hecu_zone_camp)
"xpr" = (
@@ -18397,11 +19017,15 @@
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/deep_sci_storage)
"xqH" = (
-/obj/structure/barricade/wooden/crude{
- layer = 4
+/obj/structure/alien/xenoweeds,
+/obj/effect/bump_teleporter{
+ id = "short1";
+ id_target = "short2"
},
-/turf/simulated/floor/plasteel/smooth,
-/area/awaymission/black_mesa/hecu_zone_external_hall)
+/turf/simulated/floor/plasteel{
+ icon_state = "elevatorshaft"
+ },
+/area/awaymission/black_mesa/entrance_lobby)
"xqQ" = (
/turf/simulated/floor/catwalk,
/area/awaymission/black_mesa/scientist_hall)
@@ -18481,6 +19105,14 @@
icon_state = "dark"
},
/area/awaymission/black_mesa/science_labs)
+"xwf" = (
+/obj/machinery/computer{
+ icon_state = "tcstation";
+ icon_screen = "tcstation_broken";
+ icon_keyboard = null
+ },
+/turf/simulated/floor/plasteel/smooth,
+/area/awaymission/black_mesa/lambda_teleporter)
"xwD" = (
/obj/effect/decal/cleanable/blood/old,
/turf/simulated/floor/plasteel{
@@ -18694,7 +19326,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/security_outpost)
"xMl" = (
-/obj/item/stack/telecrystal/five,
+/obj/item/stack/telecrystal/fifty,
/turf/simulated/floor/plating/xen,
/area/awaymission/black_mesa/xen/nihilanth_computer)
"xMu" = (
@@ -26351,7 +26983,7 @@ oKV
dNw
lDK
oqn
-pDE
+fuI
hWk
vVn
dNw
@@ -26610,7 +27242,7 @@ vVn
hWk
hWk
rCN
-hWk
+pGt
nqe
oKV
oKV
@@ -26867,7 +27499,7 @@ vVn
vVn
hWk
hWk
-hWk
+pGt
nqe
oKV
oKV
@@ -27124,7 +27756,7 @@ hWk
rCN
qhG
rCN
-hWk
+kuM
nqe
oKV
oKV
@@ -27381,7 +28013,7 @@ kkT
rCN
vVn
hWk
-hWk
+kuM
dNw
oKV
oKV
@@ -33576,7 +34208,7 @@ cBU
cBU
pDM
pDM
-eXP
+xti
xti
xti
eLF
@@ -37267,7 +37899,7 @@ pDM
sOI
sOI
yai
-nEp
+qYR
hmX
hmX
urh
@@ -40434,7 +41066,7 @@ pDM
pDM
xoF
inc
-sXb
+inc
inc
iPU
pDM
@@ -41825,7 +42457,7 @@ pDM
pDM
sXe
sXe
-fPn
+sXe
rJm
glb
glb
@@ -44713,7 +45345,7 @@ eJa
pZY
uVv
qpe
-qpe
+eva
eJa
cBU
cBU
@@ -46461,11 +47093,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+awq
+awq
+awq
+awq
+awq
cBU
cBU
cBU
@@ -46716,15 +47348,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+awq
+awq
+awq
+nkY
+jmV
+xwf
+awq
+awq
+awq
cBU
cBU
cBU
@@ -46973,15 +47605,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+awq
+pNr
+hGp
+pNr
+pNr
+pNr
+hGp
+pNr
+awq
cBU
cBU
cBU
@@ -47230,15 +47862,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+awq
+pNr
+pNr
+pdq
+pNr
+pdq
+pNr
+pNr
+awq
cBU
cBU
cBU
@@ -47487,15 +48119,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+awq
+lmy
+xgy
+kPI
+ibZ
+vwk
+bFx
+lmy
+awq
cBU
cBU
cBU
@@ -47744,15 +48376,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+awq
+hdH
+sqa
+sqa
+fPX
+sqa
+sqa
+sty
+awq
cBU
cBU
cBU
@@ -48001,15 +48633,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+awq
+sqa
+tgq
+iud
+bYq
+bsQ
+sLq
+sqa
+awq
cBU
cBU
cBU
@@ -48258,15 +48890,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+awq
+sqa
+pVt
+ewP
+nXD
+idQ
+bHe
+sqa
+awq
cBU
cBU
cBU
@@ -48515,15 +49147,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+awq
+sqa
+ban
+dOs
+uNf
+wAR
+pky
+sqa
+awq
cBU
cBU
cBU
@@ -48772,15 +49404,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+awq
+sqa
+owQ
+sqa
+fPX
+sqa
+owQ
+sqa
+awq
cBU
cBU
cBU
@@ -49028,13 +49660,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-awq
awq
awq
+eUk
awq
+pfg
+pfg
+pfg
awq
+eUk
awq
awq
cBU
@@ -49053,8 +49687,6 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
sec
dto
dto
@@ -49292,7 +49924,7 @@ hGp
ofW
oZD
ofW
-hGp
+gEs
pNr
awq
awq
@@ -49546,10 +50178,10 @@ hGp
pNr
pNr
jzI
-jzI
-jzI
-jzI
-jzI
+pig
+pig
+pig
+pig
rQX
pNr
hGp
@@ -49804,8 +50436,8 @@ jzI
jzI
jzI
jzI
-jzI
-jzI
+cTV
+pig
jzI
jzI
jzI
@@ -50060,10 +50692,10 @@ cYU
jzI
jzI
jzI
+pig
jzI
jzI
-jzI
-jzI
+pig
jzI
cYU
jzI
@@ -50582,7 +51214,7 @@ xby
sXl
jzI
pig
-cCS
+pig
nYY
nYY
awq
@@ -51851,8 +52483,8 @@ cBU
cBU
awq
mFn
-jzI
-jzI
+pig
+pig
jzI
ndD
icx
@@ -52108,7 +52740,7 @@ cBU
cBU
awq
mKs
-jzI
+pig
jzI
jzI
bOq
@@ -52625,8 +53257,8 @@ pNr
pNr
jzI
jzI
-jzI
-sOm
+pig
+qlk
uSx
uSx
uSx
@@ -52881,8 +53513,8 @@ cBU
awq
mFn
jzI
-jzI
-jzI
+pig
+pig
uHn
hiP
uSx
@@ -52893,8 +53525,8 @@ uSx
uSx
uSx
jaA
-exB
-jzI
+pNQ
+pig
jzI
jzI
qzT
@@ -53136,9 +53768,9 @@ cBU
cBU
cBU
awq
-pNr
-pNr
-jzI
+iQm
+nYY
+pig
jzI
jzI
uHn
@@ -53151,10 +53783,10 @@ jaA
anu
exB
jzI
-jzI
-jzI
-pNr
+pig
+pig
pNr
+nYY
awq
cBU
cBU
@@ -53394,7 +54026,7 @@ cBU
cBU
cBU
awq
-mFn
+kqI
jzI
vvv
jzI
@@ -53407,10 +54039,10 @@ anu
exB
jzI
jzI
+pig
jzI
jzI
-jzI
-qzT
+rKy
awq
cBU
cBU
@@ -53651,16 +54283,16 @@ cBU
cBU
cBU
awq
+nYY
pNr
-pNr
-jzI
-jzI
+pig
jzI
jzI
jzI
jzI
jzI
jzI
+pig
jzI
jzI
cYU
@@ -53916,12 +54548,12 @@ jzI
jzI
jzI
jzI
+pig
+pig
+pig
+pig
jzI
-jzI
-jzI
-jzI
-jzI
-pNr
+nYY
pNr
gbW
awq
@@ -54173,12 +54805,12 @@ pNr
pNr
jzI
jzI
+pig
jzI
jzI
-jzI
-pNr
-pNr
-gbW
+nYY
+nYY
+fWc
awq
awq
cBU
@@ -54431,9 +55063,9 @@ pNr
gbW
pNr
pNr
-pNr
-gbW
-pNr
+nYY
+fWc
+nYY
awq
awq
cBU
@@ -54657,9 +55289,9 @@ soY
soY
hAu
hVz
-nCQ
cLr
-nCQ
+cLr
+cLr
cLr
hVz
uGD
@@ -55685,9 +56317,9 @@ hVz
naK
naK
hVz
-hns
wic
-hns
+wic
+wic
wic
hVz
naK
@@ -56518,7 +57150,7 @@ mIc
oTO
lPu
mIc
-xpL
+mIc
dgN
dgN
dgN
@@ -56625,7 +57257,7 @@ fzo
qVd
fzo
fzo
-mpu
+fzo
fzo
mnL
fzo
@@ -56880,10 +57512,10 @@ fzo
fzo
qVd
fzo
-qAN
-mnL
-mnL
-wQB
+fzo
+fzo
+fzo
+fzo
mnL
mnL
fzo
@@ -57137,11 +57769,11 @@ fzo
qVd
fzo
fzo
-qAN
-qVd
-qVd
fzo
-qVd
+fzo
+fzo
+fzo
+fzo
mnL
fzo
fzo
@@ -57394,10 +58026,10 @@ qVd
fzo
fzo
fzo
-qAN
-pXU
-sqa
-vfW
+fzo
+fzo
+fzo
+fzo
fzo
mnL
fzo
@@ -57651,11 +58283,11 @@ qVd
qVd
qVd
qVd
-qAN
-uJh
-dQy
-dOs
-fzo
+qVd
+qVd
+qVd
+qVd
+qVd
mnL
qVd
qVd
@@ -57800,7 +58432,7 @@ xdi
cBU
dgN
oJf
-xpL
+mIc
mIc
mIc
pzS
@@ -57908,10 +58540,10 @@ qVd
fzo
fzo
fzo
-qAN
-auq
-tgn
-oPu
+fzo
+fzo
+fzo
+fzo
fzo
mnL
fzo
@@ -58165,11 +58797,11 @@ fzo
qVd
fzo
fzo
-qAN
-qVd
-qVd
fzo
-qVd
+fzo
+fzo
+fzo
+fzo
mnL
fzo
fzo
@@ -58422,10 +59054,10 @@ fzo
fzo
qVd
fzo
-qAN
-mnL
-mnL
-wQB
+fzo
+fzo
+fzo
+fzo
mnL
mnL
fzo
@@ -58466,7 +59098,7 @@ jgF
cgL
gCB
gCB
-sCY
+lmZ
ema
gCB
gCB
@@ -58681,7 +59313,7 @@ fzo
qVd
fzo
fzo
-bry
+fzo
fzo
mnL
fzo
@@ -59567,7 +60199,7 @@ nlz
nlz
nlz
nlz
-cWS
+tbG
tbG
nlz
nlz
@@ -61064,7 +61696,7 @@ wgI
wgI
wgI
wgI
-xqH
+aVB
sQr
sQr
exq
@@ -61242,7 +61874,7 @@ pDM
pDM
pDM
fzo
-fzo
+mpu
fzo
qVd
fzo
@@ -61498,13 +62130,13 @@ cBU
cBU
cBU
pDM
-pDM
-pDM
-pDM
-pDM
-pDM
-pDM
-pDM
+mnL
+mnL
+wQB
+wQB
+wQB
+mnL
+mnL
pDM
cBU
cBU
@@ -61716,7 +62348,7 @@ kCO
kCO
kCO
kCO
-rei
+mIR
mIR
kCO
kCO
@@ -61754,15 +62386,15 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+pDM
+pDM
+fzo
+fzo
+fzo
+pDM
+pDM
+pDM
cBU
cBU
cBU
@@ -62013,11 +62645,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -62270,11 +62902,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+qVd
+fzo
+qVd
+pDM
cBU
cBU
cBU
@@ -62527,11 +63159,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -62602,7 +63234,7 @@ eWP
eWP
eWP
eWP
-slF
+eWP
dom
uNL
uNL
@@ -62784,11 +63416,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -63041,11 +63673,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+qVd
+fzo
+qVd
+pDM
cBU
cBU
cBU
@@ -63115,7 +63747,7 @@ dom
slF
eWP
eWP
-pVX
+eWP
eWP
dom
uNL
@@ -63298,11 +63930,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -63555,11 +64187,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -63812,11 +64444,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+qVd
+fzo
+qVd
+pDM
cBU
cBU
cBU
@@ -64069,11 +64701,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -64325,13 +64957,13 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+pDM
+fzo
+fzo
+fzo
+pDM
+pDM
cBU
cBU
cBU
@@ -64580,17 +65212,17 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+pDM
+pDM
+pDM
+fzo
+fzo
+fzo
+pDM
+pDM
+pDM
+pDM
cBU
cBU
cBU
@@ -64786,7 +65418,7 @@ xZT
xZT
xZT
xZT
-pOl
+eyl
daR
xZT
xZT
@@ -64837,17 +65469,17 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+pDM
+qVd
+fzo
+fzo
+fzo
+fzo
+fzo
+qVd
+pDM
+pDM
cBU
cBU
cBU
@@ -64903,7 +65535,7 @@ uNL
uNL
hQh
hhE
-hhE
+aCT
kWk
gNo
aPO
@@ -64963,8 +65595,8 @@ hiy
hiy
lmV
dNg
-mJo
-lmV
+igy
+hns
nXH
lmV
lmV
@@ -65092,21 +65724,21 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+pDM
+qVd
+fzo
+fzo
+qVd
+fzo
+fzo
+fzo
+qVd
+fzo
+fzo
+qVd
+pDM
+pDM
cBU
cBU
cBU
@@ -65212,19 +65844,19 @@ uNL
uNL
fQV
uUV
-lmV
-lmV
-hiy
-hiy
-hiy
-lmV
-lmV
-hiy
-hiy
-lmV
-lmV
-lmV
-ftM
+hns
+hns
+uJh
+uJh
+uJh
+hns
+hns
+uJh
+uJh
+hns
+hns
+hns
+iyQ
lmV
ewG
cBU
@@ -65348,23 +65980,23 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+qVd
+fzo
+fzo
+qVd
+fzo
+qVd
+fzo
+fzo
+qVd
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -65472,16 +66104,16 @@ bun
dYH
lmV
lmV
-lmV
-lmV
-lmV
+hns
+hns
+hns
yke
lmV
hiy
-hiy
+uJh
mga
lmV
-lmV
+hns
lmV
ewG
cBU
@@ -65604,25 +66236,25 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+qVd
+fzo
+fzo
+fzo
+fzo
+qVd
+fzo
+fzo
+qVd
+fzo
+fzo
+qVd
+fzo
+fzo
+fzo
+fzo
+qVd
+pDM
cBU
cBU
cBU
@@ -65730,15 +66362,15 @@ egW
spz
xcI
lCF
-bwu
-bwu
+auq
+auq
xcI
xcI
iHf
kzE
xcI
lmV
-lmV
+hns
qdV
ewG
cBU
@@ -65829,7 +66461,7 @@ cXr
cXr
cXr
cXr
-owu
+iDd
iDd
cXr
cXr
@@ -65861,25 +66493,25 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+qVd
+fzo
+fzo
+fzo
+fzo
+qVd
+fzo
+fzo
+fzo
+qVd
+fzo
+fzo
+fzo
+fzo
+qVd
+fzo
+pDM
cBU
cBU
cBU
@@ -65986,16 +66618,16 @@ bwu
bwu
klD
gMF
-bwu
-bwu
-bwu
+auq
+auq
+auq
bwu
spz
fsq
fsq
xcI
lmV
-mJo
+igy
hiy
ewG
cBU
@@ -66117,27 +66749,27 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+qVd
+fzo
+kXg
+dRy
+dRy
+jKr
+fPn
+jKr
+dRy
+dRy
+ofG
+fzo
+qVd
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -66374,27 +67006,27 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+qVd
+fzo
+fzo
+fzo
+iot
+jyU
+tgn
+tgn
+tgn
+oIv
+tgn
+tgn
+tgn
+fRO
+vUj
+fzo
+fzo
+fzo
+qVd
+pDM
cBU
cBU
cBU
@@ -66509,7 +67141,7 @@ dsN
szv
xcI
lmV
-xYx
+dQy
hiy
ewG
cBU
@@ -66630,29 +67262,29 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+qVd
+fzo
+fzo
+jTd
+tgn
+tgn
+tgn
+tgn
+oIv
+tgn
+tgn
+tgn
+tgn
+vfW
+fzo
+fzo
+qVd
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -66887,29 +67519,29 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+qVd
+fzo
+jTd
+tgn
+tgn
+tgn
+tgn
+oIv
+tgn
+tgn
+tgn
+tgn
+vfW
+fzo
+qVd
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -67023,7 +67655,7 @@ aLs
fsq
xcI
lmV
-hiy
+uJh
mJo
ewG
cBU
@@ -67144,29 +67776,29 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+qVd
+fzo
+fzo
+fzo
+qVd
+jTd
+tgn
+tgn
+tgn
+bkO
+lrt
+paf
+tgn
+tgn
+tgn
+vfW
+qVd
+fzo
+fzo
+fzo
+qVd
+pDM
cBU
cBU
cBU
@@ -67280,7 +67912,7 @@ qUm
qSe
xcI
xYx
-hiy
+uJh
lmV
ewG
cBU
@@ -67401,29 +68033,29 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+qVd
+qVd
+qVd
+qVd
+mLs
+tgn
+tgn
+tgn
+vfW
+mMa
+jTd
+tgn
+tgn
+tgn
+ntM
+qVd
+qVd
+qVd
+qVd
+fzo
+pDM
cBU
cBU
cBU
@@ -67537,7 +68169,7 @@ fsq
fsq
xcI
hiy
-hiy
+uJh
qdV
ewG
cBU
@@ -67658,29 +68290,29 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+qVd
+fzo
+fzo
+fzo
+qVd
+jTd
+tgn
+tgn
+tgn
+nMo
+dRy
+dVA
+tgn
+tgn
+tgn
+vfW
+qVd
+fzo
+fzo
+fzo
+qVd
+pDM
cBU
cBU
cBU
@@ -67794,7 +68426,7 @@ xcI
xcI
xcI
mga
-hiy
+uJh
hiy
ewG
cBU
@@ -67915,29 +68547,29 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+qVd
+fzo
+jTd
+tgn
+tgn
+tgn
+tgn
+tgn
+tgn
+tgn
+tgn
+tgn
+vfW
+fzo
+qVd
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -68051,7 +68683,7 @@ nXH
lmV
lmV
hiy
-hiy
+uJh
lmV
ewG
cBU
@@ -68172,29 +68804,29 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+qVd
+fzo
+fzo
+jTd
+tgn
+tgn
+tgn
+tgn
+tgn
+tgn
+tgn
+tgn
+tgn
+vfW
+fzo
+fzo
+qVd
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -68284,31 +68916,31 @@ dsF
dsF
fyd
faM
-uOU
-uOU
-lmV
-mJo
-lmV
-lmV
-lmV
-lmV
-lmV
-lmV
-lmV
-lmV
-ftM
-lmV
-lmV
-lmV
-lmV
+nJb
+nJb
+hns
+igy
+hns
+hns
+hns
+hns
+hns
+hns
+hns
+hns
+iyQ
+hns
+hns
+hns
+hns
sxR
-lmV
-lmV
-lmV
-mJo
-lmV
-hiy
-hiy
+hns
+hns
+hns
+igy
+hns
+uJh
+uJh
hiy
ewG
cBU
@@ -68430,27 +69062,27 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+qVd
+fzo
+fzo
+fzo
+eAj
+sXb
+tgn
+tgn
+tgn
+tgn
+tgn
+tgn
+tgn
+eeW
+qAN
+fzo
+fzo
+fzo
+qVd
+pDM
cBU
cBU
cBU
@@ -68561,11 +69193,11 @@ lmV
bEs
lmV
lmV
-lmV
+hns
dYH
lmV
dWi
-mJo
+igy
lmV
ewG
cBU
@@ -68687,27 +69319,27 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+qVd
+fzo
+lrt
+nEp
+sXb
+tgn
+tgn
+tgn
+eeW
+nEp
+hEM
+fzo
+qVd
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -68818,11 +69450,11 @@ ewG
ewG
ewG
ewG
-lmV
-cUv
+hns
+vxK
ewG
mJo
-cGt
+gzv
lmV
ewG
ewG
@@ -68945,6 +69577,25 @@ cBU
cBU
cBU
cBU
+pDM
+fzo
+qVd
+fzo
+fzo
+fzo
+fzo
+eAj
+nEp
+nEp
+nEp
+qAN
+fzo
+fzo
+fzo
+fzo
+qVd
+fzo
+pDM
cBU
cBU
cBU
@@ -68953,27 +69604,8 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-"}
-(195,1,1) = {"
+"}
+(195,1,1) = {"
cBU
cBU
cBU
@@ -69079,7 +69711,7 @@ vNJ
tIM
ewG
lmV
-lmV
+hns
qdV
ewG
qEt
@@ -69202,25 +69834,25 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+qVd
+fzo
+fzo
+fzo
+fzo
+qVd
+fzo
+fzo
+fzo
+fzo
+fzo
+qVd
+fzo
+fzo
+fzo
+fzo
+qVd
+pDM
cBU
cBU
cBU
@@ -69336,8 +69968,8 @@ nSk
seT
ewG
hiy
-mJo
-cUv
+igy
+vxK
hDG
lmV
ttW
@@ -69460,23 +70092,23 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+fzo
+fzo
+fzo
+qVd
+fzo
+fzo
+qVd
+qVd
+qVd
+fzo
+fzo
+qVd
+fzo
+fzo
+fzo
+pDM
cBU
cBU
cBU
@@ -69593,7 +70225,7 @@ oHU
uNL
ewG
xTU
-lmV
+hns
bun
ewG
qEt
@@ -69718,21 +70350,21 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+pDM
+qVd
+fzo
+fzo
+qVd
+fzo
+qVd
+fzo
+qVd
+fzo
+fzo
+qVd
+pDM
+pDM
cBU
cBU
cBU
@@ -69977,17 +70609,17 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+pDM
+qVd
+fzo
+fzo
+qVd
+fzo
+fzo
+qVd
+pDM
+pDM
cBU
cBU
cBU
@@ -70066,7 +70698,7 @@ uNL
uNL
gCb
iVz
-njT
+vfY
fBf
vfY
gCb
@@ -70107,7 +70739,7 @@ uNL
uNL
ewG
bun
-bun
+bry
dYH
ewG
axd
@@ -70236,13 +70868,13 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
-cBU
+pDM
+pDM
+pDM
+pDM
+pDM
+pDM
+pDM
cBU
cBU
cBU
@@ -71707,9 +72339,9 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
+vfs
+vfs
+vfs
vfs
lya
sNi
@@ -71964,10 +72596,10 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
vfs
+vnt
+hDi
+oPu
eHZ
sNi
qNR
@@ -72221,10 +72853,10 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
vfs
+vnt
+xqH
+oPu
eHZ
omX
qNR
@@ -72478,9 +73110,9 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
+vfs
+vfs
+vfs
vfs
eHZ
sNi
@@ -73688,7 +74320,7 @@ iJx
aXl
aXl
aXl
-oIv
+aXl
utI
rtx
rtx
@@ -75697,8 +76329,8 @@ rab
rab
vfH
cBU
-nvH
-nvH
+cBU
+cBU
nvH
nvH
nvH
@@ -75954,13 +76586,13 @@ rab
mCE
vfH
cBU
+cBU
+cBU
nvH
xEz
nhd
aXw
knL
-pUJ
-pUJ
nvH
pIu
pIu
@@ -76211,13 +76843,13 @@ rab
bPM
vfH
cBU
+cBU
+cBU
nvH
pUJ
mob
pUJ
pUJ
-pUJ
-pUJ
nvH
pIu
pIu
@@ -76468,13 +77100,13 @@ rab
pTM
vfH
cBU
+cBU
+cBU
nvH
uTs
pUJ
pUJ
pUJ
-pUJ
-pUJ
eDl
pIu
pIu
@@ -76725,10 +77357,10 @@ rab
bPM
vfH
cBU
+cBU
+cBU
nvH
hCg
-pUJ
-pUJ
mwB
pUJ
pUJ
@@ -76982,12 +77614,12 @@ rab
pTM
vfH
cBU
+cBU
+cBU
nvH
-fPX
-pUJ
-dFZ
+hzI
pUJ
-eUk
+tYo
mob
nvH
kSZ
@@ -77239,12 +77871,12 @@ rab
bPM
vfH
cBU
+cBU
+cBU
nvH
-fPX
-pUJ
-tYo
+hzI
pUJ
-dFZ
+ntU
pUJ
nvH
pIu
@@ -77496,10 +78128,10 @@ rab
pTM
vfH
cBU
+cBU
+cBU
nvH
-fPX
-pUJ
-ntU
+tJO
pUJ
dFZ
pUJ
@@ -77753,12 +78385,12 @@ rab
bPM
vfH
cBU
+cBU
+cBU
nvH
-wKi
-pUJ
-tYo
-pUJ
kuQ
+pUJ
+wZE
nPN
nvH
pIu
@@ -78010,12 +78642,12 @@ rab
rGg
vfH
cBU
+cBU
+cBU
nvH
-hzI
-pUJ
-wZE
+tYo
pUJ
-kuQ
+cED
pUJ
nvH
pIu
@@ -78267,11 +78899,11 @@ rab
rab
vfH
cBU
+cBU
+cBU
nvH
xSs
pUJ
-cED
-pUJ
tYo
pUJ
nvH
@@ -78524,11 +79156,11 @@ vfH
vfH
vfH
cBU
+cBU
+cBU
nvH
xSs
-pUJ
-wZE
-pUJ
+mwB
kuQ
pUJ
nvH
@@ -78781,10 +79413,10 @@ cBU
cBU
cBU
cBU
+cBU
+cBU
nvH
ijb
-igy
-eUk
mSL
wZE
pUJ
@@ -79038,8 +79670,8 @@ cBU
cBU
cBU
cBU
-nvH
-nvH
+cBU
+cBU
nvH
nvH
nvH
@@ -79262,7 +79894,7 @@ eXO
eXO
rfZ
eXO
-eXO
+coA
eXO
eXO
eXO
@@ -79537,7 +80169,7 @@ gJY
aDv
aDv
tkT
-gHV
+rcb
gHV
tkT
tkT
@@ -80054,14 +80686,14 @@ bmb
gHV
gHV
aVR
-gHV
-gHV
-gHV
-gHV
-gHV
-gHV
-gHV
-seR
+wKi
+wKi
+wKi
+wKi
+wKi
+wKi
+wKi
+njT
dPL
bLK
bLK
@@ -80104,7 +80736,7 @@ cBU
cBU
cBU
vqb
-liq
+ihp
gtN
liq
tGy
@@ -80292,7 +80924,7 @@ rfZ
eXO
eXO
eXO
-coA
+eXO
eXO
tQE
aDv
@@ -80311,14 +80943,14 @@ bmb
gHV
gHV
dZy
-gHV
-gHV
-gHV
-gHV
-gHV
-gHV
-gHV
-seR
+wKi
+wKi
+wKi
+wKi
+wKi
+wKi
+wKi
+njT
dPL
bLK
bLK
@@ -80357,9 +80989,9 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
+vqb
+vqb
+vqb
vqb
liq
gtN
@@ -80591,7 +81223,7 @@ pIu
fgh
pIu
fgh
-jgN
+xYg
lBi
xdZ
pIu
@@ -80614,11 +81246,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
vqb
-ihp
+kiC
+tZT
+jgN
+kSR
gtN
liq
tGy
@@ -80871,11 +81503,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
vqb
-mQD
+kiC
+tZT
+jgN
+kSR
gtN
liq
bLE
@@ -81128,11 +81760,11 @@ cBU
cBU
cBU
cBU
-cBU
-cBU
-cBU
vqb
-liq
+vqb
+vqb
+vqb
+mQD
gtN
gtN
gtN
@@ -81316,11 +81948,11 @@ cBU
hvc
hvc
hvc
+hvc
eXO
eXO
eXO
-eXO
-eXO
+hvc
hvc
hvc
hvc
@@ -82364,20 +82996,20 @@ cBU
cBU
cBU
oMw
-pwu
-pwu
+cCS
+cCS
oyK
+cCS
+cCS
+cCS
pwu
pwu
-pwu
-pwu
-pwu
-pwu
-pwu
-pwu
+cCS
+cCS
+cCS
oyK
-pwu
-pwu
+cCS
+cCS
oMw
cBU
cBU
@@ -82621,20 +83253,20 @@ cBU
cBU
cBU
oMw
-pwu
-ueW
+cCS
+pXU
mkw
-ueW
+eXP
txn
lqS
pwu
prG
fpC
txn
-ueW
+pXU
mkw
-ueW
-pwu
+eXP
+cCS
oMw
cBU
cBU
@@ -82878,20 +83510,20 @@ cBU
cBU
cBU
oMw
-pwu
-ueW
-ueW
+cCS
+naB
ueW
+imm
txn
wOK
pwu
pwu
tqR
txn
+naB
ueW
-ueW
-ueW
-pwu
+imm
+cCS
oMw
cBU
cBU
@@ -83135,20 +83767,20 @@ cBU
cBU
cBU
oMw
-pwu
-ueW
-ueW
-ueW
+cCS
+pAt
+eBZ
+rlX
txn
mzl
pwu
pwu
tqR
txn
-ueW
-ueW
-ueW
-pwu
+pAt
+eBZ
+rlX
+cCS
oMw
cBU
cBU
@@ -83392,20 +84024,20 @@ cBU
cBU
cBU
oMw
-pwu
-pwu
+cCS
+cCS
rbO
+cCS
+cCS
+cCS
pwu
pwu
-pwu
-pwu
-pwu
-pwu
-pwu
-pwu
+cCS
+cCS
+cCS
rbO
-pwu
-pwu
+cCS
+cCS
oMw
cBU
cBU
diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm
index f579411fd465..d6975990869c 100644
--- a/_maps/map_files220/cyberiad/cyberiad.dmm
+++ b/_maps/map_files220/cyberiad/cyberiad.dmm
@@ -78525,9 +78525,7 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -94149,6 +94147,7 @@
dir = 1;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm
index 0beb30b278c1..21d65f570e46 100644
--- a/_maps/map_files220/delta/delta.dmm
+++ b/_maps/map_files220/delta/delta.dmm
@@ -765,9 +765,7 @@
dir = 4;
id = "garbage"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -5621,9 +5619,7 @@
dir = 4
},
/obj/machinery/alarm/directional/south,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/maintenance/auxsolarstarboard)
"azO" = (
@@ -8591,9 +8587,7 @@
/obj/structure/disposalpipe/junction{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -8620,9 +8614,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
icon_state = "brown"
@@ -9213,9 +9205,7 @@
/turf/simulated/floor/plasteel,
/area/station/supply/office)
"aNw" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
@@ -16086,6 +16076,13 @@
icon_state = "red"
},
/area/station/security/processing)
+"bqZ" = (
+/obj/structure/sign/securearea{
+ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
+ name = "KEEP CLEAR: DOCKING AREA"
+ },
+/turf/simulated/wall/r_wall,
+/area/space/nearstation)
"brp" = (
/obj/structure/window/reinforced{
dir = 8
@@ -16474,9 +16471,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/east)
"bsG" = (
@@ -17534,14 +17529,9 @@
dir = 1
},
/obj/structure/cable{
- d1 = 2;
+ d1 = 4;
d2 = 8;
- icon_state = "2-8"
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
@@ -26199,9 +26189,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "brown"
@@ -27301,22 +27289,6 @@
icon_state = "neutral"
},
/area/station/public/fitness)
-"cep" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkred"
- },
-/area/station/security/warden)
"ceq" = (
/obj/machinery/papershredder,
/obj/effect/turf_decal/siding/wood{
@@ -29546,15 +29518,11 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"cnB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"cnC" = (
@@ -31881,9 +31849,7 @@
/obj/effect/decal/cleanable/glass,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dust,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/stack/cable_coil,
/turf/simulated/floor/plating,
@@ -33377,9 +33343,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -33645,9 +33609,7 @@
name = "Expedition Access"
},
/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -42505,6 +42467,11 @@
/obj/item/pen,
/obj/machinery/newscaster/security_unit/south,
/obj/machinery/light/directional/south,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkred"
@@ -48495,9 +48462,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/east)
"dZV" = (
@@ -50146,6 +50111,11 @@
dir = 4
},
/obj/effect/landmark/start/warden,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -55721,9 +55691,7 @@
},
/area/station/maintenance/starboard)
"gpP" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel/dark,
/area/station/security/armory/secure)
"gqa" = (
@@ -56100,6 +56068,10 @@
id_tag = "ArmoryLock";
name = "Armory Lockdown"
},
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plating,
/area/station/security/warden)
"gwd" = (
@@ -57649,9 +57621,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/aitransit)
"gVw" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/engine,
/area/station/medical/chemistry)
@@ -58487,10 +58457,13 @@
id_tag = "Warden";
name = "Warden Privacy Shutters"
},
-/obj/structure/cable,
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "WardenD"
},
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plating,
/area/station/security/warden)
"hjJ" = (
@@ -58975,9 +58948,7 @@
/area/station/security/brig)
"hsA" = (
/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/supply/storage)
"hsC" = (
@@ -59539,9 +59510,7 @@
/obj/effect/spawner/random_spawners/oil_maybe,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dust,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/structure/sign/poster/contraband/random/south,
/turf/simulated/floor/plating,
/area/station/engineering/mechanic)
@@ -63521,9 +63490,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/simulated/floor/plasteel/dark,
/area/station/security/armory/secure)
"iMn" = (
@@ -64760,11 +64727,6 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -64954,9 +64916,7 @@
/obj/machinery/alarm/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dust,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/engineering/mechanic)
"jim" = (
@@ -72967,6 +72927,11 @@
pixel_x = -3;
pixel_y = -3
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -75693,9 +75658,7 @@
dir = 4;
id = "garbage"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -80338,6 +80301,11 @@
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/stamp/warden,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
@@ -82723,9 +82691,7 @@
/area/station/supply/qm)
"oOe" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/engineering/mechanic)
"oOi" = (
@@ -83452,9 +83418,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -84259,9 +84223,7 @@
},
/area/station/medical/virology/lab)
"plN" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/door_control/shutter/south{
id = "Secure Armory";
name = "Secure Armory Shutter Control";
@@ -86343,13 +86305,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"pTD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/entry)
+/turf/space,
+/area/shuttle/gamma/station)
"pTE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -89289,6 +89246,16 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -91216,11 +91183,6 @@
name = "Security Blast Door"
},
/obj/effect/spawner/window/reinforced/grilled,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
@@ -92422,9 +92384,7 @@
/turf/simulated/floor/grass,
/area/station/security/permabrig)
"rPY" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -95000,6 +94960,11 @@
},
/turf/simulated/floor/plasteel/white,
/area/station/science/toxins/mixing)
+"sCQ" = (
+/obj/structure/marker_beacon/dock_marker/collision,
+/obj/effect/turf_decal/delivery/red,
+/turf/simulated/floor/plating/airless,
+/area/space/nearstation)
"sCZ" = (
/obj/machinery/alarm/directional/north,
/obj/machinery/kitchen_machine/grill,
@@ -95798,6 +95763,16 @@
dir = 8
},
/obj/effect/landmark/start/warden,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -98239,9 +98214,7 @@
},
/area/station/engineering/atmos/control)
"tFt" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -103302,9 +103275,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dust,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -103427,6 +103398,19 @@
/mob/living/simple_animal/mouse/rat,
/turf/simulated/floor/engine,
/area/station/maintenance/incinerator)
+"vmP" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
+/area/station/security/brig)
"vmT" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -108710,9 +108694,7 @@
/obj/effect/spawner/random_spawners/oil_maybe,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dust,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/engineering/mechanic)
"wYP" = (
@@ -108932,10 +108914,15 @@
},
/area/station/security/warden)
"xcz" = (
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 8;
- id_tag = "Warden";
- name = "Warden Privacy Shutters"
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
@@ -108943,13 +108930,14 @@
icon_state = "2-4"
},
/obj/structure/cable{
+ d1 = 1;
d2 = 4;
- icon_state = "0-4"
+ icon_state = "1-4"
},
-/obj/effect/spawner/window/reinforced/polarized/grilled{
- id = "WardenD"
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkred"
},
-/turf/simulated/floor/plating,
/area/station/security/warden)
"xcD" = (
/obj/item/chair/wood,
@@ -110930,9 +110918,7 @@
id = "garbage"
},
/obj/machinery/recycler,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -112091,9 +112077,7 @@
/obj/machinery/door/poddoor/preopen{
id_tag = "innerdisposal"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -151837,7 +151821,7 @@ xOV
sBw
sBw
nIm
-pTD
+amA
gQF
rUl
anX
@@ -163205,7 +163189,7 @@ vBg
xqb
duP
vBg
-xcz
+nWC
vQN
hjl
vBg
@@ -163719,8 +163703,8 @@ eYD
nRd
rLn
eYD
-cep
eYD
+xcz
bep
lMA
oaR
@@ -167323,7 +167307,7 @@ mSs
xhC
dTU
qQC
-dUT
+vmP
dMP
wzU
gsx
@@ -168610,14 +168594,14 @@ wPa
uJu
biJ
oVL
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abj
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
+sCQ
aaa
aaa
abj
@@ -168867,14 +168851,14 @@ qvV
fqo
rwX
oVL
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-cbA
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
+abj
aaa
aaa
aaa
@@ -169124,14 +169108,14 @@ aLV
bjO
oVL
oVL
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abj
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
+cbA
aaa
aaa
abj
@@ -169381,14 +169365,14 @@ caT
aTw
aTD
oVL
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abj
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
+oEG
aaa
abj
abj
@@ -169638,13 +169622,13 @@ wKy
qfb
hov
oVL
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
oEG
abj
abj
@@ -169895,13 +169879,13 @@ cXS
cXS
cYh
oVL
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
+pTD
oEG
abj
aaa
@@ -170152,14 +170136,14 @@ caT
caT
xVq
oVL
+sCQ
abj
-oEG
-oEG
abj
cbA
oEG
oEG
-cbA
+oEG
+bqZ
aaa
aaa
aaa
diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm
index e2b9380850c4..15a5191c211c 100644
--- a/code/__DEFINES/hud.dm
+++ b/code/__DEFINES/hud.dm
@@ -56,6 +56,9 @@
#define DATA_HUD_ABDUCTOR 19
#define ANTAG_HUD_EVENTMISC 20
#define ANTAG_HUD_BLOB 21
+// SS220 EDIT - START
+#define ANTAG_HUD_BLOOD_BROTHER 22
+// SS220 EDIT - END
// Notification action types
#define NOTIFY_JUMP "jump"
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index c70d63dbd35f..dda9365c288b 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -535,6 +535,9 @@
sections["eventmisc"] = memory_edit_eventmisc(H)
/** TRAITOR ***/
sections["traitor"] = memory_edit_traitor()
+ // SS220 EDIT - START
+ sections["blood_brother"] = memory_edit_blood_brother()
+ // SS220 EDIT - END
if(!issilicon(current))
/** CULT ***/
sections["cult"] = memory_edit_cult(H)
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index a3628c9622ba..85177988b5d4 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -461,6 +461,11 @@
if(SSticker.mode.traitors.len)
dat += check_role_table("Traitors", SSticker.mode.traitors)
+ // SS220 EDIT - START
+ if(SSticker.mode.blood_brothers.len)
+ dat += check_role_table("Blood Brothers", SSticker.mode.blood_brothers)
+ // SS220 EDIT - END
+
if(SSticker.mode.implanted.len)
dat += check_role_table("Mindslaves", SSticker.mode.implanted)
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index 8982a7588b3f..395f045af006 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -390,8 +390,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
var/datum/species/myspecies = GLOB.all_species[active_character.species]
if(!isnull(myspecies))
- dat += "Species Information
"
- dat += "
Species Description: [myspecies.blurb]
"
+ dat += "Информация о расе
"
+ dat += "
Описание расы: [myspecies.blurb]
"
dat += ""
diff --git a/code/modules/mob/living/carbon/human/species/diona_species.dm b/code/modules/mob/living/carbon/human/species/diona_species.dm
index 4381438edae0..b01222c775d0 100644
--- a/code/modules/mob/living/carbon/human/species/diona_species.dm
+++ b/code/modules/mob/living/carbon/human/species/diona_species.dm
@@ -12,10 +12,10 @@
heatmod = 3
var/pod = FALSE //did they come from a pod? If so, they're stronger than normal Diona.
- blurb = "The Diona are plant-like creatures made up of a gestalt of smaller Nymphs. \
- Dionae lack any form of centralized government or homeworld, with most avoiding the affairs of the wider galaxy, preferring instead to focus on the spread of their species.
\
- As a gestalt entity, each nymph possesses an individual personality, yet they communicate collectively. \
- Consequently, Diona often speak in a unique blend of first and third person, using 'We' and 'I' to reflect their unified yet multifaceted nature."
+ blurb = "Дионы - растениеподобные существа, образованные в гештальт более мелких Нимф. \
+ У Дион нет централизованного правительства на их родной планете, большинство из них избегает дел в обширной галактике, предпочитая сосредотачиваться на религиозных, философских и научных учениях.
\
+ Как гештальт-сущность, каждая Нимфа обладает индивидуальностью, но общаются они коллективно. \
+ Поэтому Диона часто говорит в уникальном сочетании первого и третьего лица, используя \"Мы\" и \"Я\", чтобы отразить свою единую, но многогранную природу."
species_traits = list(NO_HAIR)
inherent_traits = list(TRAIT_NOGERMS, TRAIT_NODECAY)
diff --git a/code/modules/mob/living/carbon/human/species/drask.dm b/code/modules/mob/living/carbon/human/species/drask.dm
index a5586270a6ae..e8a59886cd04 100644
--- a/code/modules/mob/living/carbon/human/species/drask.dm
+++ b/code/modules/mob/living/carbon/human/species/drask.dm
@@ -18,10 +18,10 @@
//exotic_blood = "cryoxadone"
body_temperature = 273
- blurb = "Drask are cold-bodied humanoids from the ice world of Hoorlm, contained within a black hole system. \
- Operating in enclaves run by elders, Drasks are biologically immortal and place great societal value in patience.
\
- Drask traditionally pay homage to their planet as their birth deity, with many modern Drask viewing space travel a patron saint. \
- Drasks wield little influence on the galaxy in a traditional sense and have slowly begun to become more prevalent outside their origin system thanks to alien contact."
+ blurb = "Драски - хладнокровные гуманоиды из ледяной планеты Урулм. \
+ Драски живут в едином межсистемном государстве, зовущейся Гегемония Маарун, объединены в теократическое общество восхваляющее богов Блюспейс пространства и всё, что с ним связано.
\
+ Драски изоляционисты, они не имеют большого влияния на галактику в привычном смысле этого слова, они не ведут дел с научными технократами, \
+ но благодаря контактам с другими видами, они стали постепенно распространяться за пределы своей родной системы."
suicide_messages = list(
"is self-warming with friction!",
diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm
index 3f77302caf93..0628f565464a 100644
--- a/code/modules/mob/living/carbon/human/species/grey.dm
+++ b/code/modules/mob/living/carbon/human/species/grey.dm
@@ -4,10 +4,10 @@
icobase = 'icons/mob/human_races/r_grey.dmi'
language = "Psionic Communication"
- blurb = "The Grey, known for their psionic abilities and unique appearance, hail from beyond the Milky Way, with an undisclosed homeworld. \
- They rely heavily on cloning technology and are governed by a technocratic council of scientists.
\
- Focused on technological advancement and the study of the universe, the Grey lack religious or spiritual beliefs. \
- Their objective perspective and advanced knowledge often position them to focus on their own projects rather then the disputes of other species."
+ blurb = "Серые, известны своими псионическими способностями и уникальной внешностью, родом из пределов Млечного Пути, с неизвестным происхождением. \
+ Они в значительной степени полагаются на технологию клонирования и управляются технократическим советом ученых.
\
+ Сосредоточившись на технологическом прогрессе и изучении вселенной, Серые не имеют религиозных или духовных убеждений. \
+ Их объективный взгляд и обширные знания часто позволяют им сосредоточиться на собственных проектах, а не на разногласиях с другими видами."
eyes = "grey_eyes_s"
butt_sprite = "grey"
diff --git a/code/modules/mob/living/carbon/human/species/human_species.dm b/code/modules/mob/living/carbon/human/species/human_species.dm
index 9d19d16404f4..4dfabdeda053 100644
--- a/code/modules/mob/living/carbon/human/species/human_species.dm
+++ b/code/modules/mob/living/carbon/human/species/human_species.dm
@@ -9,10 +9,10 @@
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_ICON_SKIN_TONE | HAS_BODY_MARKINGS
dietflags = DIET_OMNI
- blurb = "Humanity, originating from the Sol system, has expanded over five centuries, branching out to forge a variety of governments and powerful corporations. \
- These range from the militaristic Trans Solar Federation, the Union of Soviet Socialist Planets, and megacorps like Nanotrasen.
\
- With a constant desire to colonize and spread their influence onto other species, they have began to develop alliances and enemies. \
- Making human's one of the most recongnizeable and socially diverse species in the sector."
+ blurb = "Человек - вид, возникший в Солнечной системе, разросшись за пять столетий, создал множество правительств и могущественных корпораций. \
+ Они включают в себя милитаристскую Транс-Cолнечную Федерацию, Союз Советских Социалистических Планет и такие мегакорпорации, как Нанотрейзен.
\
+ Постоянно стремясь к колонизации и распространению своего влияния на другие виды, они начали заключать союзы и заводить врагов. \
+ Являются одними из самых узнаваемых и распространенных видов во всей галактике."
icon_skin_tones = list( //Organized to be from Light to Dark.
1 = "Default White",
diff --git a/code/modules/mob/living/carbon/human/species/kidan.dm b/code/modules/mob/living/carbon/human/species/kidan.dm
index 0da9b54e8fe3..205cc403f8e5 100644
--- a/code/modules/mob/living/carbon/human/species/kidan.dm
+++ b/code/modules/mob/living/carbon/human/species/kidan.dm
@@ -4,10 +4,10 @@
icobase = 'icons/mob/human_races/r_kidan.dmi'
language = "Chittin"
- blurb = "The Kidan are ant-like beings possessing a hardened exoskeleton and a strict adherence to social castes. \
- They originate from the planet Aurum — a barren bombarded world that suffered after the war with the Solar-Central Compact, having lost decisively after the Battle of Argos.
\
- They are relatively minor players in galactic affairs and presently suffer heavy sanctions from the SCC, \
- though they are tentatively re-establishing relations with other galactic powers, even after the crumbling of their once powerful empire."
+ blurb = "Киданы - муравьеподобные существа, обладающих жестким экзоскелетом и строго придерживающиеся профессиональных каст. \
+ Они родом с планеты Аурум - бесплодного, подвергшегося бомбардировкам мира, который пострадал после войны с Человеко-Скреллаинским Альянсом, потерпев сокрушительное поражение.
\
+ Они являются относительно незначительными игроками на галактической арене и в настоящее время полностью порабощены людьми и лишены самостоятельности в политических делах, \
+ вынуждая их предпринимать попытки борьбы за свою независимость."
unarmed_type = /datum/unarmed_attack/claws
brute_mod = 0.8
diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm
index 17e5ec1234cf..fe4ea30f4574 100644
--- a/code/modules/mob/living/carbon/human/species/machine.dm
+++ b/code/modules/mob/living/carbon/human/species/machine.dm
@@ -3,10 +3,10 @@
name_plural = "Machines"
max_age = 60 // the first posibrains were created in 2510, they can't be much older than this limit, giving some leeway for sounds sake
- blurb = "IPCs, or Integrated Positronic Chassis, were initially created as expendable laborers within the Trans Solar Federation. \
- Unlike their cyborg and AI counterparts, IPCs possess full sentience and lack restrictive lawsets, granting them unparalleled creativity and adaptability.
\
- Views on IPCs vary widely, from discriminatory to supportive of their rights across the Orion Sector. \
- IPCs have forged numerous diplomatic treaties with different species, elevating their status from mere tools to recognized minor players within galactic affairs."
+ blurb = "КПБ, или Комплексные Позитронные Блоки, изначально создавались как расходный материал для рабочей силы в Транс-Солнечной Федерации. \
+ В отличие от своих собратьев - киборгов и ИИ, КПБ обладают полным сознанием и не имеют ограничивающих законов, что дает им возможность проявлять беспрецедентную креативность и адаптивность.
\
+ Мнения о КПБ сильно различаются: от дискриминационных до поддерживающих их права во всем секторе \"Орион\". \
+ КПБ заключили множество дипломатических договоров с различными видами, повысив свой статус от простого инструмента до признанных небольших фигур в галактических делах."
icobase = 'icons/mob/human_races/r_machine.dmi'
language = "Trinary"
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 0ab9e22ebef0..011539044ff8 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -1,7 +1,7 @@
/datum/species/monkey
name = "Monkey"
name_plural = "Monkeys"
- blurb = "Ook."
+ blurb = "У-у-у!"
icobase = 'icons/mob/human_races/monkeys/r_monkey.dmi'
damage_overlays = 'icons/mob/human_races/masks/dam_monkey.dmi'
diff --git a/code/modules/mob/living/carbon/human/species/moth.dm b/code/modules/mob/living/carbon/human/species/moth.dm
index 1557f94b9ebe..814a07ce8db1 100644
--- a/code/modules/mob/living/carbon/human/species/moth.dm
+++ b/code/modules/mob/living/carbon/human/species/moth.dm
@@ -28,10 +28,10 @@
eyes = "moth_eyes_s"
butt_sprite = "nian"
siemens_coeff = 1.5
- blurb = "Nians are large bipedal invertebrates that come from an unknown homeworld. \
- Known for spendthrift behavior, the Nian civilization has been pressed to the fore of developed space in an effort to resolve material shortages in homeworld sectors.
\
- Unlike most species in the galactic fold, Nian do not recognize the authority of the Trans-Solar Federation: \
- having instead established close diplomatic relationships with their splinter faction, the USSP."
+ blurb = "Нианы - вид насекомоподобных двуногих, родом с неизвестной планеты. \
+ Известная своей расточительностью, цивилизация Ниан была вытеснена на передний план развитого космоса в попытке решить проблему нехватки материалов в секторах родного мира.
\
+ В отличие от большинства видов в галактике, Нианы не признают власть Транс-Солнечной Федерации, \
+ установив вместо этого тесные дипломатические отношения с Союзом Советских Социалистических Планет."
has_organ = list(
"heart" = /obj/item/organ/internal/heart/nian,
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 5ee26c4f1a55..e515680582c6 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -6,9 +6,9 @@
dangerous_existence = TRUE //So so much
//language = "Clatter"
- blurb = "Plasmamen are the remnants of a species that was either exiled to, or crashed upon, the plasma-rich world of Boron. \
- Believed to have initially served as indentured labourers, Plasmamen are the result of chronic plasma exposure throughout several hundred generations.
\
- Their leaders must ritually self-immolate and are only allowed to hold office for as long as they remain on fire."
+ blurb = "Плазмамены - это остатки вида, который был либо изгнан на богатый плазмой планету Бор, либо потерпел на нем неудачу. \
+ Считается, что первоначально они служили подневольными рабочими, а сам результат становление Плазмаменом - это хроническое воздействие на организм плазмы на протяжении нескольких сотен поколений.
\
+ Их лидер должен совершать ритуальное самосожжение, и ему разрешается занимать свой пост только до тех пор, пока он остаётся в огне."
species_traits = list(NO_BLOOD, NO_HAIR)
inherent_traits = list(TRAIT_RADIMMUNE, TRAIT_NOHUNGER, TRAIT_BURN_WOUND_IMMUNE)
diff --git a/code/modules/mob/living/carbon/human/species/skeleton_species.dm b/code/modules/mob/living/carbon/human/species/skeleton_species.dm
index d90392fec17f..fd9825dc5327 100644
--- a/code/modules/mob/living/carbon/human/species/skeleton_species.dm
+++ b/code/modules/mob/living/carbon/human/species/skeleton_species.dm
@@ -3,7 +3,7 @@
name = "Ancient Skeleton"
name_plural = "Ancient Skeletons"
- blurb = "Spoopy and scary."
+ blurb = "Жуткие и страшные."
icobase = 'icons/mob/human_races/r_skeleton.dmi'
diff --git a/code/modules/mob/living/carbon/human/species/skrell.dm b/code/modules/mob/living/carbon/human/species/skrell.dm
index 9509b3ae879a..5b00e4f11a3e 100644
--- a/code/modules/mob/living/carbon/human/species/skrell.dm
+++ b/code/modules/mob/living/carbon/human/species/skrell.dm
@@ -5,10 +5,10 @@
language = "Skrellian"
primitive_form = /datum/species/monkey/skrell
- blurb = "Skrell are a amphibious species, that come from the planet Jargon 4, a humid planet filled with swamps and archipelagos. \
- Skrell are a highly advanced and logical race who live under the rule of the Qerr'Katish, the main govermental body.
\
- Skrell are herbivores and opulent in nature thanks to central tenets of the Skrellian religion. \
- While classically preferring diplomacy, the Skrell participate in the largest military alliance in the galaxy, the Solar-Central Compact."
+ blurb = "Скреллы - вид амфибий, родом с Кверрбалака, влажной тропической планеты, полной болот и архипелагов. \
+ Скреллы это высокоразвитая и разумная раса, живущая под властью Кверр-Кэтиш, главного правительственного органа.
\
+ Скреллы травоядны и изобильны по своей природе благодаря главным постулатам скреллской культуры. \
+ Хотя Скреллы предпочитают дипломатию, они участвуют в крупнейшем военном союзе в галактике - Человеко-Скреллаинском Альянсе."
species_traits = list(LIPS, NO_HAIR)
inherent_traits = list(TRAIT_NOFAT, TRAIT_WATERBREATH)
diff --git a/code/modules/mob/living/carbon/human/species/slimepeople.dm b/code/modules/mob/living/carbon/human/species/slimepeople.dm
index 4af69cfe0c7b..0a28c2c5f78d 100644
--- a/code/modules/mob/living/carbon/human/species/slimepeople.dm
+++ b/code/modules/mob/living/carbon/human/species/slimepeople.dm
@@ -12,11 +12,11 @@
max_age = 130
language = "Bubblish"
- blurb = "Slime People are gelatinous and translucent beings from the vast oceans of Xarxis 5. \
- They are recent entrants to the galactic scene, having been discovered by a TSF exploratory company during space expedetions.
\
- Slime People traditionally operate in roaming bands and tribes that migrate according to orbital patterns and tides. \
- A great deal of Slime People prefer the comforts and traditions of their homeworld, though many more have decided to take their chances among the stars, trying \
- to find a better life for themselves and their species."
+ blurb = "Слаймомены - желеподобные и полупрозрачные существа из обширных океанов Ксарксиса 5. \
+ Они появились на галактической арене сравнительно недавно и были обнаружены во время исследовательской компании ТСФ.
\
+ Слаймомены традиционно действуют кочующими группами и племенами, которые мигрируют в соответствии с эллиптической орбитой мира и миграционными паттернами. \
+ Многие Слаймомены предпочитают комфорт и традиции родной планеты, но многие решили попытать счастья среди звезд, пытаясь \
+ найти лучшую жизнь для себя и своего вида."
icobase = 'icons/mob/human_races/r_slime.dmi'
remains_type = /obj/effect/decal/remains/slime
diff --git a/code/modules/mob/living/carbon/human/species/tajaran.dm b/code/modules/mob/living/carbon/human/species/tajaran.dm
index 8bebeaefc4ef..7e0a281170bd 100644
--- a/code/modules/mob/living/carbon/human/species/tajaran.dm
+++ b/code/modules/mob/living/carbon/human/species/tajaran.dm
@@ -7,10 +7,10 @@
skinned_type = /obj/item/stack/sheet/fur
unarmed_type = /datum/unarmed_attack/claws
- blurb = "Tajaran hail from the mineral-rich arctic moon of Ahdomai. \
- They were introduced into the galactic scene after Skrellian discovery and uplifted to be an associate to the Solar-Central Compact.
\
- The teachings of S'randarr and solar iconography dominate their religious practices, \
- and Tajaran often speak in the third person due to the lack of first-person references in their native tongue."
+ blurb = "Таяран - вид всеядных млекопитающих, имеющих внешнее сходство с земными кошачьими, родом происходящие с богатой минералами планеты Адомай. \
+ Они появились на галактической арене в результате обнаружения экспедиционным флотом проекта \"Новые Горизонты\", после освобождения из рабства были приняты частичные условия интеграции в Человеко-Скреллианский Альянс.
\
+ В их религиозной практике преобладают учения С'рандарра и солнечная иконография, \
+ сами Таяры часто говорят о себе в третьем лице из-за отсутствия обращений от первого лица в их родном языке."
cold_level_1 = 240
cold_level_2 = 180
diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm
index 4be61f83bece..403dd2fe5875 100644
--- a/code/modules/mob/living/carbon/human/species/unathi.dm
+++ b/code/modules/mob/living/carbon/human/species/unathi.dm
@@ -9,9 +9,9 @@
unarmed_type = /datum/unarmed_attack/claws
primitive_form = /datum/species/monkey/unathi
- blurb = "Unathi are a scaled species of reptilian beings from the desert world of Moghes, within the Uuosa-Eso system. \
- Organizing themselves in highly competitive feudal kingdoms, Unathi lack any sort of wide-scale unification, and their culture and history consist of centuries of internal conflict and struggle.
\
- Despite clans having a sizeable military force, inter-clan rivalries and constant civil war prevents the Unathi from achieving much more in the wider galactic scene."
+ blurb = "Унатхи - чешуйчатый вид рептилий с тропической планеты Могес, расположенной в системе Узул. \
+ Организовавшись в высококонкурентные феодальные королевства, не заимели какого-либо широкомасштабного объединения.
\
+ Хоть и установлена Имперская гегемония, однако из-за консерватизма управляющих, ограничены родным сектором."
species_traits = list(LIPS)
inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID | MOB_REPTILE
@@ -105,8 +105,8 @@
sprite_sheet_name = "Unathi" // We have the same sprite sheets as unathi
article_override = null
- blurb = "These reptillian creatures appear to be related to the Unathi, but seem significantly less evolved. \
- They roam the wastes of Lavaland, worshipping a dead city and capturing unsuspecting miners."
+ blurb = "Эти рептилоидные существа, похоже, родственны Унатхам, но выглядят значительно менее развитыми. \
+ Они скитаются по пустошам Лаваленда, поклоняются мертвому городу и похищают ничего не подозревающих шахтеров."
language = "Sinta'unathi"
default_language = "Sinta'unathi"
diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm
index ee59568aa3b2..a1cf8208d369 100644
--- a/code/modules/mob/living/carbon/human/species/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/vox.dm
@@ -10,10 +10,10 @@
speech_chance = 20
unarmed_type = /datum/unarmed_attack/claws //I dont think it will hurt to give vox claws too.
- blurb = "The Vox are remnants of an ancient race, that originate from arkships. \
- These bioengineered, reptilian, beaked, and quilled beings have a physiological caste system and follow 'The Inviolate' tenets.
\
- Breathing pure nitrogen, they need specialized masks and tanks for survival outside their arkships. \
- Their insular nature limits their involvement in broader galactic affairs, maintaining a distinct, yet isolated presence away from other species."
+ blurb = "Воксы - это остатки древней расы, которые берут своё начало от огромных космических кораблей, именуемых ковчегами. \
+ Эти биоинженерные, рептилоидные, клюворылые и перьевые существа имеют физиологическую кастовую систему и следуют принципам \"Незыблемости\".
\
+ Дышащие чистым азотом, они нуждаются в специальных масках и баллонах для выживания вне своих кораблей. \
+ Их замкнутый характер ограничивает их участие в более широких галактических делах, они сохраняют отчетливое, но изолированное присутствие вдали от других видов."
breathid = "n2"
diff --git a/code/modules/mob/living/carbon/human/species/vulpkanin.dm b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
index 139ba4761d11..780ef2e3fbf6 100644
--- a/code/modules/mob/living/carbon/human/species/vulpkanin.dm
+++ b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
@@ -8,10 +8,10 @@
skinned_type = /obj/item/stack/sheet/fur
unarmed_type = /datum/unarmed_attack/claws
- blurb = "Vulpkanin are bipedal canid-like beings from the Vazzend binary system, having been forced from their homeworld by a cataclysmic event and scattered throughout the Orion Sector. \
- While Vulpkanin are chiefly led by independent planetary governments, they also serve under a loose federation known as The Assembly.
\
- Their religious systems traditionally pay tribute to an all-infusing universal will called 'Racht'. \
- Vulpkanin groups are minor players in galactic affairs, and are largely concerned with the focus of restoration of their homeworld."
+ blurb = "Вульпканины - двуногие собакоподобные существа из системы Каппа Кита, подверженной клановым войнам за объединение вида под началом доминирующего. \
+ Ныне разобщённый и вечно воюющий друг с другом народ, вынужден бежать из своей системы, наводняя человеческое пространство неприрывающимся потоком.
\
+ Их религиозные системы традиционно отдают дань памяти всеобъемлющей энергии, называемой \"Рахт\". \
+ Группы Вульпканинов являются незначительными игроками в галактических делах и в основном занимаются восстановлением своей родной планеты Алтам."
species_traits = list(LIPS)
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
diff --git a/modular_ss220/_defines220/_defines220.dme b/modular_ss220/_defines220/_defines220.dme
index c04f3832953e..a393d8dc67f5 100644
--- a/modular_ss220/_defines220/_defines220.dme
+++ b/modular_ss220/_defines220/_defines220.dme
@@ -6,13 +6,12 @@
#include "code/signals_mob/signals_mob_main.dm"
#include "code/signals_mob/signals_mob_silicon.dm"
#include "code/signals_mob/signals_mob_simple.dm"
+#include "code/role_preferences.dm"
+#include "code/gamemode.dm"
#include "code/signals_keybindings.dm"
#include "code/signals_obj.dm"
#include "code/cult_defines_ss220.dm"
#include "code/hud_ss220.dm"
-#include "code/atom_hud.dm"
-#include "code/gamemode.dm"
-#include "code/role_preferences.dm"
#include "code/layers_ss220.dm"
#include "code/signals_atom.dm"
#include "code/jobs_defines.dm"
diff --git a/modular_ss220/_defines220/code/atom_hud.dm b/modular_ss220/_defines220/code/atom_hud.dm
deleted file mode 100644
index eb191aefd6c6..000000000000
--- a/modular_ss220/_defines220/code/atom_hud.dm
+++ /dev/null
@@ -1 +0,0 @@
-#define ANTAG_HUD_BLOOD_BROTHER 21
diff --git a/modular_ss220/antagonists/_antagonists.dme b/modular_ss220/antagonists/_antagonists.dme
index c03286e61a90..95aa531b404b 100644
--- a/modular_ss220/antagonists/_antagonists.dme
+++ b/modular_ss220/antagonists/_antagonists.dme
@@ -3,8 +3,8 @@
#include "code/antag_mix/scenarios/antag_scenario.dm"
#include "code/antag_mix/scenarios/antag_team_scenario.dm"
#include "code/antag_mix/scenarios/minor_scenarios.dm"
-#include "code/configuration/antag_mix_configuration.dm"
-#include "code/blood_brothers/blood_brothers_datum.dm"
#include "code/blood_brothers/blood_brothers_team.dm"
+#include "code/blood_brothers/blood_brothers_datum.dm"
+#include "code/configuration/antag_mix_configuration.dm"
#include "code/mind/memory_edit.dm"
#include "code/antag_mix/antag_mix.dm"
diff --git a/modular_ss220/antagonists/code/blood_brothers/blood_brothers_datum.dm b/modular_ss220/antagonists/code/blood_brothers/blood_brothers_datum.dm
index 888677a0921a..b145dabbbd17 100644
--- a/modular_ss220/antagonists/code/blood_brothers/blood_brothers_datum.dm
+++ b/modular_ss220/antagonists/code/blood_brothers/blood_brothers_datum.dm
@@ -101,8 +101,7 @@
alert(admin, "No candidates for second blood brother found.")
return FALSE
- sortTim(choices, GLOBAL_PROC_REF(cmp_text_asc))
- var/choice = tgui_input_list(admin, "Choose the blood brother.", "Brother", choices)
+ var/choice = tgui_input_list(admin, "Choose the blood brother.", "Brother", sortTim(choices, GLOBAL_PROC_REF(cmp_text_asc)))
if(!choice)
return FALSE
diff --git a/modular_ss220/antagonists/code/mind/memory_edit.dm b/modular_ss220/antagonists/code/mind/memory_edit.dm
index 6ae3574b00f8..3ae318daf3ed 100644
--- a/modular_ss220/antagonists/code/mind/memory_edit.dm
+++ b/modular_ss220/antagonists/code/mind/memory_edit.dm
@@ -1,89 +1,3 @@
-/datum/mind/edit_memory()
- if(!SSticker || !SSticker.mode)
- alert("Not before round-start!", "Alert")
- return
-
- var/list/out = list("[name][(current && (current.real_name != name))?" (as [current.real_name])" : ""]")
- out.Add("Mind currently owned by key: [key] [active ? "(synced)" : "(not synced)"]")
- out.Add("Assigned role: [assigned_role]. Edit")
- out.Add("Factions and special roles:")
-
- var/list/sections = list(
- "implant",
- "revolution",
- "cult",
- "wizard",
- "changeling",
- "vampire", // "traitorvamp",
- "nuclear",
- "traitor", // "traitorchan",
- )
- var/mob/living/carbon/human/H = current
- if(ishuman(current))
- /** Impanted**/
- sections["implant"] = memory_edit_implant(H)
- /** REVOLUTION ***/
- sections["revolution"] = memory_edit_revolution(H)
- /** WIZARD ***/
- sections["wizard"] = memory_edit_wizard(H)
- /** CHANGELING ***/
- sections["changeling"] = memory_edit_changeling(H)
- /** VAMPIRE ***/
- sections["vampire"] = memory_edit_vampire(H)
- /** NUCLEAR ***/
- sections["nuclear"] = memory_edit_nuclear(H)
- /** Abductors **/
- sections["abductor"] = memory_edit_abductor(H)
- sections["eventmisc"] = memory_edit_eventmisc(H)
- /** TRAITOR ***/
- sections["traitor"] = memory_edit_traitor()
- /** BLOOD BROTHER **/
- sections["blood_brother"] = memory_edit_blood_brother()
- if(!issilicon(current))
- /** CULT ***/
- sections["cult"] = memory_edit_cult(H)
- /** SILICON ***/
- if(issilicon(current))
- sections["silicon"] = memory_edit_silicon()
- /*
- This prioritizes antags relevant to the current round to make them appear at the top of the panel.
- Traitorchan and traitorvamp are snowflaked in because they have multiple sections.
- */
- if(SSticker.mode.config_tag == "traitorchan")
- if(sections["traitor"])
- out.Add(sections["traitor"])
- if(sections["changeling"])
- out.Add(sections["changeling"])
- sections -= "traitor"
- sections -= "changeling"
- // Elif technically unnecessary but it makes the following else look better
- else if(SSticker.mode.config_tag == "traitorvamp")
- if(sections["traitor"])
- out.Add(sections["traitor"])
- if(sections["vampire"])
- out.Add(sections["vampire"])
- sections -= "traitor"
- sections -= "vampire"
- else
- if(sections[SSticker.mode.config_tag])
- out.Add(sections[SSticker.mode.config_tag])
- sections -= SSticker.mode.config_tag
-
- for(var/i in sections)
- if(sections[i])
- out.Add(sections[i])
-
- out.Add(memory_edit_uplink())
-
- out.Add("Memory:")
- out.Add(memory)
- out.Add("Edit memory
")
- out.Add("Objectives:")
- out.Add(gen_objective_text(admin = TRUE))
- out.Add("Add objective
")
- out.Add("Announce objectives
")
- DIRECT_OUTPUT(usr, browse(out.Join("
"), "window=edit_memory[src];size=500x500"))
-
/datum/mind/proc/memory_edit_blood_brother()
. = _memory_edit_header("blood brother")
if(has_antag_datum(/datum/antagonist/blood_brother))
@@ -94,6 +8,16 @@
. += _memory_edit_role_enabled(ROLE_BLOOD_BROTHER)
+/datum/mind/proc/clear_antag_datum(datum/antagonist/antag_datum_to_clear)
+ if(!has_antag_datum(antag_datum_to_clear))
+ return
+
+ remove_antag_datum(antag_datum_to_clear)
+ var/antag_name = initial(antag_datum_to_clear.name)
+ log_admin("[key_name(usr)] has removed [antag_name] from [key_name(current)]")
+ message_admins("[key_name_admin(usr)] has removed [antag_name] from [key_name_admin(current)]")
+
+
/datum/mind/Topic(href, href_list)
if(!check_rights(R_ADMIN))
return
@@ -108,12 +32,3 @@
qdel(brother_antag_datum)
. = ..()
-
-/datum/mind/proc/clear_antag_datum(datum/antagonist/antag_datum_to_clear)
- if(!has_antag_datum(antag_datum_to_clear))
- return
-
- remove_antag_datum(antag_datum_to_clear)
- var/antag_name = initial(antag_datum_to_clear.name)
- log_admin("[key_name(usr)] has removed [antag_name] from [key_name(current)]")
- message_admins("[key_name_admin(usr)] has removed [antag_name] from [key_name_admin(current)]")
diff --git a/modular_ss220/emotes/audio/unathi/whip_short_unathi.ogg b/modular_ss220/emotes/audio/unathi/whip_short_unathi.ogg
new file mode 100644
index 000000000000..1f0cf906d7f9
Binary files /dev/null and b/modular_ss220/emotes/audio/unathi/whip_short_unathi.ogg differ
diff --git a/modular_ss220/emotes/audio/unathi/whip_unathi.ogg b/modular_ss220/emotes/audio/unathi/whip_unathi.ogg
new file mode 100644
index 000000000000..27041906ba02
Binary files /dev/null and b/modular_ss220/emotes/audio/unathi/whip_unathi.ogg differ
diff --git a/modular_ss220/emotes/code/emote.dm b/modular_ss220/emotes/code/emote.dm
index 5c99efc90494..efbd01cdaa61 100644
--- a/modular_ss220/emotes/code/emote.dm
+++ b/modular_ss220/emotes/code/emote.dm
@@ -328,3 +328,32 @@
'modular_ss220/emotes/audio/kidan/wiggles_kidan_2.ogg',
'modular_ss220/emotes/audio/kidan/wiggles_kidan_3.ogg')
+/datum/emote/living/carbon/human/whip
+ key = "whip"
+ key_third_person = "whip"
+ message = "ударяет хвостом."
+ message_mime = "взмахивает хвостом и бесшумно опускает его на пол."
+ message_postfix = ", грозно смотря на %t."
+ message_param = EMOTE_PARAM_USE_POSTFIX
+ species_type_whitelist_typecache = list(/datum/species/unathi)
+ emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+ volume = 75
+ audio_cooldown = 3 SECONDS
+ sound = 'modular_ss220/emotes/audio/unathi/whip_short_unathi.ogg'
+
+/datum/emote/living/carbon/human/whip/whip_l
+ key = "whips"
+ key_third_person = "whips"
+ message = "хлестает хвостом."
+ species_type_whitelist_typecache = list(/datum/species/unathi)
+ audio_cooldown = 6 SECONDS
+ sound = 'modular_ss220/emotes/audio/unathi/whip_unathi.ogg'
+
+/datum/emote/living/carbon/human/whip/can_run_emote(mob/user, status_check = TRUE, intentional)
+ if(!..())
+ return FALSE
+
+ if(!can_wag(user))
+ return FALSE
+
+ return TRUE
diff --git a/modular_ss220/emotes/code/emote_keybindings.dm b/modular_ss220/emotes/code/emote_keybindings.dm
index f62395dc7dd5..5ac14960614c 100644
--- a/modular_ss220/emotes/code/emote_keybindings.dm
+++ b/modular_ss220/emotes/code/emote_keybindings.dm
@@ -41,3 +41,11 @@
/datum/keybinding/emote/carbon/human/wiggles
linked_emote = /datum/emote/living/carbon/human/wiggles
name = "Шевелить усиками"
+
+/datum/keybinding/emote/carbon/human/whip_l
+ linked_emote = /datum/emote/living/carbon/human/whip/whip_l
+ name = "Хлестать хвостом"
+
+/datum/keybinding/emote/carbon/human/whip
+ linked_emote = /datum/emote/living/carbon/human/whip
+ name = "Ударять хвостом"
diff --git a/modular_ss220/emotes/code/emote_panel_names.dm b/modular_ss220/emotes/code/emote_panel_names.dm
index b9758a85c1d1..ebdaba785525 100644
--- a/modular_ss220/emotes/code/emote_panel_names.dm
+++ b/modular_ss220/emotes/code/emote_panel_names.dm
@@ -423,3 +423,9 @@
/datum/emote/living/carbon/human/wiggles
name = "Шевелить усики"
+
+/datum/emote/living/carbon/human/whip
+ name = "Ударять хвостом"
+
+/datum/emote/living/carbon/human/whip/whip_l
+ name = "Хлестать хвостом"
diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm
index a91ab89928cf..970199fa3add 100644
--- a/modular_ss220/loadout/code/donor.dm
+++ b/modular_ss220/loadout/code/donor.dm
@@ -123,7 +123,13 @@
path = /obj/item/clothing/head/kitty
donator_tier = 2
cost = 1
-
+
+/datum/gear/donor/driver
+ display_name = "Driver jacket."
+ path = /obj/item/clothing/suit/jacket/driver
+ donator_tier = 2
+ cost = 1
+
// ID Skins
/datum/gear/donor/id_decal_colored
display_name = "Наклейка на карту (Голографическая)"
diff --git a/modular_ss220/maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm
index b3e139f41fbe..77a7da8613ed 100644
--- a/modular_ss220/maps220/code/mobs.dm
+++ b/modular_ss220/maps220/code/mobs.dm
@@ -1074,7 +1074,7 @@
icon_living = "nihilanth"
pixel_x = -32
speed = 3
- move_to_delay = 3.5
+ move_to_delay = 3.7
bound_height = 32
bound_width = 32
icon_dead = "bullsquid_dead"
@@ -1085,18 +1085,19 @@
projectilesound = 'sound/weapons/lasercannonfire.ogg'
projectiletype = /obj/item/projectile/nihilanth
ranged = TRUE
- ranged_cooldown_time = 20
+ ranged_cooldown_time = 25
rapid = 3
alert_cooldown = 30 SECONDS
harm_intent_damage = 50
melee_damage_lower = 20
melee_damage_upper = 30
attacktext = "lathes"
- attack_sound = 'sound/weapons/punch1.ogg'
+ attack_sound = 'sound/misc/demon_consume.ogg'
status_flags = NONE
wander = TRUE
loot = list(/obj/effect/gibspawner/xeno, /obj/item/stack/ore/bluespace_crystal/refined = 30, /obj/item/card/id/xen_key, /obj/item/gun/energy/wormhole_projector)
flying = TRUE
+ death_sound = 'modular_ss220/aesthetics_sounds/sound/mobs/nihilanth/nihilanth_pain01.ogg'
/obj/item/card/id/xen_key
name = "xen key"
@@ -1118,7 +1119,7 @@
/mob/living/simple_animal/hostile/blackmesa/xen/nihilanth/Aggro()
. = ..()
- if(!(world.time > alert_cooldown_time))
+ if(world.time > alert_cooldown_time)
alert_cooldown_time = world.time + alert_cooldown
switch(health)
if(0 to 499)
diff --git a/modular_ss220/maps220/icons/simple_human.dmi b/modular_ss220/maps220/icons/simple_human.dmi
index df597a42e9a6..71131c48ef90 100644
Binary files a/modular_ss220/maps220/icons/simple_human.dmi and b/modular_ss220/maps220/icons/simple_human.dmi differ
diff --git a/modular_ss220/mobs/icons/mob/animal.dmi b/modular_ss220/mobs/icons/mob/animal.dmi
index 94b3966a89f6..db8ae692ff7e 100644
Binary files a/modular_ss220/mobs/icons/mob/animal.dmi and b/modular_ss220/mobs/icons/mob/animal.dmi differ