diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm index 68573f25697..82a4865500f 100644 --- a/_maps/RandomZLevels/blackmesa.dmm +++ b/_maps/RandomZLevels/blackmesa.dmm @@ -49,6 +49,10 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"ap" = ( +/obj/item/clothing/gloves/color/latex/nitrile, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "aq" = ( /obj/item/chair/stool/bamboo{ dir = 4 @@ -79,6 +83,10 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"av" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall, +/area/awaymission/black_mesa) "aw" = ( /obj/effect/gibspawner/human, /obj/structure/railing{ @@ -121,12 +129,9 @@ pixel_x = 4; pixel_y = 2 }, -/obj/item/food/muffin/berry{ - pixel_x = -4; - pixel_y = 9 - }, /obj/item/knife/plastic, /obj/structure/alien/weeds/xen, +/obj/effect/spawner/random/food_or_drink/three_course_meal, /turf/open/floor/iron/green, /area/awaymission/black_mesa) "aF" = ( @@ -140,6 +145,10 @@ /obj/effect/mob_spawn/corpse/human/scientist, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"aH" = ( +/obj/machinery/door/airlock/science, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "aI" = ( /obj/machinery/computer, /obj/structure/alien/weeds/xen, @@ -188,6 +197,13 @@ dir = 8 }, /area/awaymission/black_mesa) +"aT" = ( +/obj/machinery/door/window/brigdoor/security/cell{ + dir = 4; + id = "Mesa 4" + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "aU" = ( /obj/structure/railing{ dir = 5 @@ -198,6 +214,13 @@ /obj/structure/light_prism, /turf/open/water/overlay/hotspring/indestructible, /area/awaymission/black_mesa) +"aW" = ( +/obj/machinery/door/window/right/directional/south{ + dir = 8; + name = "Jim Norton's Quebecois Coffee" + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "aX" = ( /obj/effect/turf_decal/stripes, /obj/structure/table, @@ -233,6 +256,10 @@ /obj/machinery/chem_heater, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"bf" = ( +/obj/item/ammo_casing/spent, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "bg" = ( /obj/structure/bed/roller, /obj/structure/curtain, @@ -243,6 +270,12 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"bi" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "bj" = ( /obj/structure/fluff/bus/dense{ icon_state = "reartire" @@ -282,6 +315,18 @@ /obj/effect/random_mob_placer/xen/zombie, /turf/open/floor/mineral/titanium/white, /area/awaymission/black_mesa) +"bt" = ( +/obj/structure/rack/shelf, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357/match, +/obj/item/ammo_box/a357/match, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/awaymission/black_mesa) "bu" = ( /turf/open/misc/beach/coastline_b/xen{ dir = 5 @@ -294,23 +339,10 @@ /turf/open/floor/mineral/titanium/white, /area/awaymission/black_mesa) "bw" = ( -/obj/structure/table/glass, -/obj/item/clothing/glasses/science{ - pixel_x = 3; - pixel_y = 3 +/obj/structure/sign/poster/official/science{ + pixel_y = 64 }, -/obj/item/clothing/glasses/science, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stack/cable_coil, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/item/screwdriver, -/turf/open/floor/iron/textured_large, +/turf/open/floor/iron/dark, /area/awaymission/black_mesa) "bx" = ( /obj/structure/filingcabinet/security, @@ -324,6 +356,7 @@ dir = 8 }, /obj/structure/alien/weeds/xen, +/obj/item/ammo_box/magazine/multi_sprite/g17, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "bB" = ( @@ -337,6 +370,13 @@ /area/awaymission/black_mesa/xen) "bD" = ( /obj/structure/rack, +/obj/item/stack/sheet/iron/ten{ + amount = 30; + pixel_x = 3 + }, +/obj/item/stack/sheet/glass{ + amount = 30 + }, /obj/item/stack/sheet/iron/ten{ amount = 30; pixel_x = 3 @@ -392,10 +432,10 @@ /turf/open/floor/iron/dark/yellow, /area/awaymission/black_mesa) "bR" = ( -/obj/item/stack/sheet/mineral/sandbags{ - amount = 50 +/obj/structure/deployable_barricade/metal{ + dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "bT" = ( /obj/effect/random_mob_placer/xen, @@ -464,6 +504,10 @@ }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"ck" = ( +/obj/machinery/vending/snack/orange, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "cl" = ( /obj/structure/stone_tile/slab/cracked, /turf/open/misc/xen, @@ -481,6 +525,10 @@ }, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"cq" = ( +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "cs" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/iron/textured_large, @@ -493,7 +541,9 @@ /obj/machinery/light/cold{ dir = 8 }, -/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu, +/obj/machinery/stasis{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "cw" = ( @@ -542,6 +592,11 @@ }, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"cF" = ( +/obj/effect/random_mob_placer/xen, +/obj/effect/decal/cleanable/blood/footprints, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "cG" = ( /obj/structure/rack/shelf, /obj/item/assembly/shock_kit, @@ -570,6 +625,11 @@ /area/awaymission/black_mesa/xen) "cO" = ( /obj/structure/closet/secure_closet/security, +/obj/item/clothing/mask/gas/syndicate/ds, +/obj/item/storage/medkit/emergency, +/obj/item/storage/backpack/satchel/sec/peacekeeper, +/obj/item/storage/backpack/security/peacekeeper, +/obj/item/keycard/stockroom, /turf/open/floor/iron/dark/blue, /area/awaymission/black_mesa) "cQ" = ( @@ -602,12 +662,9 @@ /area/awaymission/black_mesa/xen) "da" = ( /obj/structure/rack/shelf, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357/match, -/obj/item/ammo_box/a357/match, +/obj/item/ammo_box/magazine/cm762, +/obj/item/ammo_box/magazine/cm762, +/obj/item/ammo_box/magazine/cm762, /turf/open/floor/wood/parquet, /area/awaymission/black_mesa) "db" = ( @@ -657,6 +714,12 @@ /obj/effect/mob_spawn/corpse/human/scientist, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"dp" = ( +/obj/machinery/door/airlock/security, +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/footprints, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "dr" = ( /obj/machinery/power/emitter/energycannon{ dir = 1 @@ -673,6 +736,7 @@ "dt" = ( /obj/structure/closet/crate/bin, /obj/machinery/light/cold, +/obj/item/ammo_box/magazine/multi_sprite/g17, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "dw" = ( @@ -681,17 +745,36 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"dy" = ( +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "dz" = ( /obj/structure/alien/weeds/xen, /turf/open/floor/iron/dark/corner, /area/awaymission/black_mesa) "dC" = ( -/obj/structure/inflatable/door{ - color = "#556B2F"; - opacity = 1 +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 9; + pixel_y = 9 }, -/obj/structure/cable, -/turf/open/floor/iron/dark, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = -9; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 9 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = -9 + }, +/turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "dD" = ( /obj/structure/closet/wardrobe, @@ -743,6 +826,12 @@ }, /turf/open/floor/plating/elevatorshaft, /area/awaymission/black_mesa) +"dQ" = ( +/obj/item/ammo_box/a357, +/turf/open/floor/plating{ + icon_state = "titanium_dam1" + }, +/area/awaymission/black_mesa) "dR" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -859,6 +948,15 @@ /obj/structure/flora/biolumi/lamp/weaklight, /turf/open/floor/plating/cobblestone, /area/awaymission/black_mesa) +"eu" = ( +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "ev" = ( /obj/structure/lattice/catwalk, /obj/structure/table, @@ -931,7 +1029,7 @@ /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "eN" = ( -/obj/item/mjollnir, +/obj/item/crowbar/freeman, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) "eO" = ( @@ -953,7 +1051,7 @@ /area/awaymission/black_mesa/xen) "eS" = ( /obj/structure/rack/shelf, -/obj/item/gun/ballistic/revolver/mateba, +/obj/item/gun/ballistic/automatic/cfa_rifle, /turf/open/floor/wood/parquet, /area/awaymission/black_mesa) "eT" = ( @@ -992,6 +1090,25 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"fb" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/black_mesa) +"fc" = ( +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = -9; + pixel_y = -1 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 9; + pixel_y = 9 + }, +/turf/open/floor/iron/textured_large, +/area/awaymission/black_mesa) "fd" = ( /obj/structure/rack/shelf, /obj/item/gun/ballistic/automatic/m16, @@ -1023,6 +1140,14 @@ /obj/machinery/light/cold, /turf/open/misc/ice, /area/awaymission/black_mesa) +"fp" = ( +/obj/machinery/door_timer{ + id = "Mesa 5"; + name = "Cell 5"; + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "fq" = ( /obj/structure/spacevine/xen/thick, /turf/open/misc/beach/coastline_t/xen{ @@ -1199,6 +1324,11 @@ /obj/structure/cable, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) +"gm" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/footprints, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "gn" = ( /obj/structure/table, /obj/item/grenade/gluon, @@ -1207,6 +1337,10 @@ /obj/item/grenade/gluon, /turf/open/misc/asteroid/snow/standard_air, /area/awaymission/black_mesa) +"go" = ( +/obj/structure/closet/secure_closet/security, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "gp" = ( /turf/open/floor/wood/parquet, /area/awaymission/black_mesa) @@ -1242,6 +1376,11 @@ /obj/structure/xen_crystal, /turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) +"gx" = ( +/obj/structure/table, +/obj/machinery/recharger, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa/xen) "gy" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 1 @@ -1250,6 +1389,19 @@ /obj/item/ammo_box/magazine/multi_sprite/ladon, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"gA" = ( +/obj/machinery/light/directional/east{ + dir = 1 + }, +/obj/item/ammo_casing/spent, +/turf/open/floor/iron, +/area/awaymission/black_mesa) +"gB" = ( +/obj/item/ammo_box/magazine/multi_sprite/g17, +/turf/open/floor/plating{ + icon_state = "titanium_dam1" + }, +/area/awaymission/black_mesa) "gC" = ( /obj/structure/table, /obj/item/paper, @@ -1327,6 +1479,12 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/engine, /area/awaymission/black_mesa/xen) +"gU" = ( +/obj/structure/lattice/catwalk, +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/bottle/beer/light, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa/xen) "gV" = ( /obj/machinery/light/warm{ dir = 8 @@ -1371,6 +1529,15 @@ /obj/machinery/door/airlock/science/glass, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"hh" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/item/storage/fancy/cigarettes/cigpack_uplift, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "hi" = ( /obj/machinery/power/emitter/energycannon{ dir = 1 @@ -1431,8 +1598,14 @@ /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "hv" = ( -/obj/effect/random_mob_placer/xen/zombie, -/turf/open/misc/ironsand/black_mesa, +/obj/structure/sign/poster/contraband/pwr_game{ + pixel_y = 31 + }, +/turf/open/floor/iron/textured_large, +/area/awaymission/black_mesa) +"hw" = ( +/obj/item/clothing/accessory/armband/engine, +/turf/open/floor/iron/dark, /area/awaymission/black_mesa) "hx" = ( /obj/structure/lattice/catwalk, @@ -1509,17 +1682,16 @@ }, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) -"hT" = ( -/obj/machinery/door/airlock/multi_tile/metal, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/iron/textured, -/area/awaymission/black_mesa) "hU" = ( /obj/machinery/light/cold{ dir = 8 }, /turf/open/indestructible/permalube, /area/awaymission/black_mesa) +"hV" = ( +/obj/effect/mob_spawn/corpse/human/skeleton, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "hX" = ( /turf/open/misc/beach/coastline_b/xen, /area/awaymission/black_mesa/xen) @@ -1534,12 +1706,28 @@ /obj/effect/mob_spawn/ghost_role/human/black_mesa/guard, /turf/open/floor/iron/dark/blue, /area/awaymission/black_mesa) +"ia" = ( +/obj/structure/deployable_barricade/metal{ + dir = 4 + }, +/obj/structure/marker_beacon/burgundy, +/obj/structure/cable, +/turf/open/misc/ironsand/black_mesa, +/area/awaymission/black_mesa) "ib" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/structure/flora/biolumi/flower/weaklight, /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"id" = ( +/obj/machinery/power/rtg/abductor, +/obj/structure/cable, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plating, +/area/awaymission/black_mesa) "if" = ( /obj/machinery/computer{ dir = 1 @@ -1565,14 +1753,12 @@ /area/awaymission/black_mesa) "il" = ( /obj/structure/rack/shelf, -/obj/item/gun/ballistic/automatic/c20r/unrestricted/cmg1{ - name = "\improper CMG-1" - }, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, +/obj/item/gun/ballistic/automatic/mp5, +/obj/item/ammo_box/magazine/mp5, +/obj/item/ammo_box/magazine/mp5, +/obj/item/ammo_box/magazine/mp5, +/obj/item/ammo_box/magazine/mp5, +/obj/item/ammo_box/magazine/mp5, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "im" = ( @@ -1595,6 +1781,11 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"iq" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "is" = ( /obj/structure/railing{ dir = 8 @@ -1619,14 +1810,15 @@ /turf/open/floor/engine, /area/awaymission/black_mesa) "iy" = ( -/obj/structure/table, -/obj/item/ammo_box/magazine/smgm9mm/ap, -/obj/item/ammo_box/magazine/smgm9mm/ap, -/obj/item/ammo_box/magazine/smgm9mm/ap, -/obj/item/ammo_box/magazine/smgm9mm/ap, -/obj/item/ammo_box/magazine/smgm9mm/ap, -/turf/open/misc/xen, -/area/awaymission/black_mesa/xen) +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_y = 17 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/open/floor/iron/textured_large, +/area/awaymission/black_mesa) "iz" = ( /obj/structure/alien/weeds/xen, /obj/structure/cable, @@ -1653,6 +1845,12 @@ /obj/structure/blob/normal, /turf/open/floor/engine, /area/awaymission/black_mesa) +"iF" = ( +/obj/machinery/light/directional/east{ + dir = 2 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "iG" = ( /obj/machinery/door/airlock/science/glass, /obj/effect/mapping_helpers/airlock/locked, @@ -1684,7 +1882,6 @@ /area/awaymission/black_mesa) "iM" = ( /obj/structure/bed/maint, -/obj/item/armament_points_card/assaultops, /turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "iN" = ( @@ -1699,6 +1896,21 @@ /obj/structure/closet/crate/large, /turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) +"iP" = ( +/obj/machinery/vending/cigarette/syndicate, +/turf/open/floor/iron, +/area/awaymission/black_mesa) +"iQ" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/bottle/beer/light{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/lighter{ + pixel_x = 6 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "iR" = ( /obj/machinery/light/cold/directional/north, /turf/open/floor/circuit, @@ -1772,11 +1984,18 @@ /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "je" = ( -/obj/machinery/door/airlock/science/glass, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/alien/weeds/xen, +/obj/machinery/door/airlock/science{ + id_tag = "chemiguess" + }, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"jf" = ( +/obj/structure/cable, +/obj/effect/random_mob_placer/xen/zombie, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "jg" = ( /obj/effect/turf_decal/stripes, /obj/machinery/light/cold{ @@ -1805,6 +2024,11 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"jn" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/obj/structure/cable, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "jo" = ( /obj/machinery/light/small/red/directional/north, /turf/open/floor/plating, @@ -1854,10 +2078,16 @@ /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "jy" = ( -/obj/structure/table, -/obj/item/ammo_box/magazine/m16, -/turf/open/floor/iron/dark, -/area/awaymission/black_mesa/xen) +/obj/effect/random_mob_placer/xen/zombie, +/turf/open/misc/ironsand/black_mesa, +/area/awaymission/black_mesa) +"jA" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "jB" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, @@ -1925,16 +2155,16 @@ /obj/machinery/portable_atmospherics/canister/hydrogen, /turf/open/misc/ice, /area/awaymission/black_mesa) +"jQ" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/security, +/obj/effect/decal/cleanable/blood/footprints, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "jR" = ( /obj/machinery/door/airlock/multi_tile/glass, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) -"jS" = ( -/obj/item/ammo_box/magazine/multi_sprite/ladon, -/turf/open/floor/plating{ - icon_state = "titanium_dam1" - }, -/area/awaymission/black_mesa) "jU" = ( /obj/structure/lattice/catwalk, /turf/open/misc/xen, @@ -1959,6 +2189,16 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"kb" = ( +/obj/structure/table/reinforced{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/item/stack/spacecash/c1{ + pixel_y = 5 + }, +/obj/item/reagent_containers/glass/rag, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "kc" = ( /obj/effect/spawner/structure/window/plasma, /turf/open/floor/circuit/red, @@ -2057,11 +2297,11 @@ /area/awaymission/black_mesa/xen) "kw" = ( /obj/structure/table, -/obj/item/paper, /obj/structure/sign/warning/nosmoking/circle{ pixel_y = 32 }, /obj/structure/alien/weeds/xen, +/obj/effect/spawner/random/exotic/technology, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "kx" = ( @@ -2071,6 +2311,12 @@ /obj/machinery/chem_mass_spec, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"ky" = ( +/obj/effect/decal/cleanable/blood/footprints{ + dir = 8 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "kz" = ( /obj/structure/stone_tile/surrounding/burnt, /turf/open/misc/xen, @@ -2124,6 +2370,13 @@ /obj/structure/water_source/puddle/healing, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) +"kL" = ( +/obj/effect/bump_teleporter{ + id = "amsdown"; + id_target = "amsup" + }, +/turf/open/floor/mineral/titanium, +/area/awaymission/black_mesa) "kN" = ( /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) @@ -2133,11 +2386,25 @@ }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) +"kQ" = ( +/obj/machinery/light/cold{ + dir = 8 + }, +/obj/structure/sign/departments/science/alt{ + pixel_x = -31 + }, +/turf/open/floor/iron/textured, +/area/awaymission/black_mesa) "kR" = ( /obj/machinery/door/puzzle/keycard/xen/freeman_boss_exit, /obj/effect/freeman_blocker, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) +"kS" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/black_mesa) "kT" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -2145,6 +2412,23 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"kV" = ( +/obj/structure/window/reinforced/unanchored{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/light/directional/east{ + dir = 8 + }, +/obj/item/radio/off{ + pixel_x = -11; + pixel_y = -3 + }, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "kY" = ( /obj/machinery/portable_atmospherics/canister/nob, /obj/structure/sign/warning/chemdiamond{ @@ -2173,6 +2457,37 @@ /obj/structure/stone_tile/slab/burnt, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) +"lh" = ( +/obj/item/seeds/coffee{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/seeds/coffee/robusta{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/seeds/coffee{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/storage/pill_bottle/happinesspsych{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/seeds/coffee{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/machinery/light/directional/north, +/obj/structure/table{ + name = "Jim Norton's Quebecois Coffee table" + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "lj" = ( /obj/structure/railing{ dir = 4 @@ -2181,6 +2496,7 @@ /area/awaymission/black_mesa) "lk" = ( /obj/structure/table, +/obj/item/gun/ballistic/automatic/pistol/g17/mesa, /turf/open/floor/plating, /area/awaymission/black_mesa) "ll" = ( @@ -2242,6 +2558,17 @@ /obj/machinery/light/small/red/directional/west, /turf/open/floor/plating, /area/awaymission/black_mesa) +"ly" = ( +/obj/structure/deployable_barricade/metal{ + dir = 8 + }, +/mob/living/simple_animal/hostile/blackmesa/blackops/ranged{ + desc = "GOD, I LOVE PWR GAME."; + ghost_controllable = 1; + name = "high on pwr operative" + }, +/turf/open/floor/iron/smooth, +/area/awaymission/black_mesa) "lz" = ( /obj/machinery/light/cold{ dir = 4 @@ -2279,6 +2606,10 @@ /obj/machinery/porta_turret/black_mesa/heavy, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"lI" = ( +/obj/item/ammo_box/magazine/mp5, +/turf/open/misc/xen, +/area/awaymission/black_mesa/xen) "lJ" = ( /obj/structure/server{ anchored = 1 @@ -2296,13 +2627,17 @@ /area/awaymission/black_mesa) "lL" = ( /obj/structure/rack/shelf, +/obj/item/gun/ballistic/automatic/pistol/g17/mesa, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, /turf/open/floor/wood/parquet, /area/awaymission/black_mesa) "lM" = ( /obj/effect/turf_decal/stripes{ dir = 6 }, -/obj/machinery/stasis, +/obj/structure/table, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "lN" = ( @@ -2311,6 +2646,14 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/plating, /area/awaymission/black_mesa) +"lP" = ( +/obj/structure/cable, +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/effect/random_mob_placer/xen, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "lQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/barricade/wooden, @@ -2333,11 +2676,24 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"lU" = ( +/obj/structure/table, +/obj/machinery/light/cold, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "lV" = ( /turf/open/floor/iron/smooth_large{ icon_state = "damaged2" }, /area/awaymission/black_mesa) +"lW" = ( +/obj/effect/bump_teleporter{ + id = "amsup"; + id_target = "amsdown" + }, +/turf/open/floor/mineral/titanium, +/area/awaymission/black_mesa) "lX" = ( /obj/structure/closet/crate/large, /obj/machinery/light/small/red/directional/east, @@ -2368,7 +2724,7 @@ "mc" = ( /obj/structure/table, /obj/machinery/recharger, -/obj/item/ammo_box/magazine/multi_sprite/ladon, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "md" = ( @@ -2379,8 +2735,11 @@ /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "mf" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/open/floor/iron/textured, /area/awaymission/black_mesa) "mi" = ( /turf/open/misc/beach/coastline_t/sandwater_inner/xen, @@ -2399,6 +2758,10 @@ /obj/item/storage/box/donkpockets/donkpocketpizza, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"ml" = ( +/obj/structure/bed/dogbed/mcgriff, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "mm" = ( /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/textured, @@ -2453,8 +2816,12 @@ /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) "mx" = ( -/obj/item/mounted_machine_gun_folded, -/turf/open/floor/iron/dark, +/obj/structure/cable, +/obj/machinery/power/rtg/abductor, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plating, /area/awaymission/black_mesa) "my" = ( /obj/structure/chair/sofa/bench/right{ @@ -2462,13 +2829,9 @@ }, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) -"mz" = ( -/obj/structure/fluff/bus/passable/seat, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mob_spawn/corpse/human/scientist, -/turf/open/floor/iron/dark/textured_large{ - icon_state = "bus" - }, +"mA" = ( +/obj/structure/cable, +/turf/closed/wall, /area/awaymission/black_mesa) "mB" = ( /obj/structure/chair/sofa/bench{ @@ -2479,19 +2842,23 @@ /area/awaymission/black_mesa) "mC" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/ammo_box/magazine/m16, -/obj/item/ammo_box/magazine/m16, /obj/item/ammo_box/magazine/multi_sprite/g17, /obj/item/ammo_box/magazine/multi_sprite/g17, /obj/item/ammo_box/magazine/multi_sprite/g17, -/obj/item/gun/ballistic/automatic/pistol/g17/mesa, /obj/item/gun_maintenance_supplies, /obj/item/gun_maintenance_supplies, /obj/item/gun_maintenance_supplies, /obj/item/ammo_box/magazine/mp5, /obj/item/ammo_box/magazine/mp5, -/obj/item/ammo_box/magazine/m16/extended, -/obj/item/ammo_box/magazine/m16/extended, +/obj/item/ammo_box/magazine/m16, +/obj/item/ammo_box/magazine/m16, +/obj/item/gun/ballistic/automatic/pistol/g17/mesa{ + burst_size = 3; + desc = "A weapon from bygone times, and this is the exact 21st century version. In fact, even more reliable, but it also can run full automatic fire mode. Chambered in 9mm."; + fire_select_modes = list(1,2,3); + firing_burst = 1; + name = "\improper Glock-18" + }, /turf/open/floor/iron/dark/textured_large, /area/awaymission/black_mesa) "mD" = ( @@ -2523,13 +2890,9 @@ /turf/open/floor/iron/freezer, /area/awaymission/black_mesa) "mK" = ( -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 1 - }, -/obj/structure/flora/biolumi/flower/weaklight, -/obj/structure/alien/weeds/xen, +/obj/item/storage/box/plastic/medicells, /turf/open/floor/iron/smooth_large, -/area/awaymission/black_mesa) +/area/awaymission/black_mesa/xen) "mM" = ( /obj/structure/chair/stool/bamboo{ dir = 1 @@ -2552,8 +2915,8 @@ /turf/open/floor/iron/dark/yellow, /area/awaymission/black_mesa) "mR" = ( -/obj/effect/mob_spawn/corpse/human/assistant/beesease_infection, /obj/structure/closet/body_bag/stasis, +/obj/effect/mob_spawn/corpse/human/assistant/spanishflu_infection, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "mT" = ( @@ -2599,8 +2962,7 @@ /obj/machinery/light/cold{ dir = 1 }, -/obj/structure/table, -/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/structure/table/optable, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "ng" = ( @@ -2616,8 +2978,11 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "ni" = ( -/obj/structure/fence/door, -/turf/open/floor/plating, +/obj/structure/deployable_barricade/metal{ + dir = 8 + }, +/obj/structure/deployable_barricade/metal, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "nj" = ( /obj/structure/chair/sofa/bench/left{ @@ -2627,12 +2992,12 @@ /area/awaymission/black_mesa) "nk" = ( /obj/structure/table, -/obj/item/ammo_box/magazine/smgm9mm/ap, -/obj/item/ammo_box/magazine/smgm9mm/ap, -/obj/item/ammo_box/magazine/smgm9mm/ap, -/obj/item/ammo_box/magazine/smgm9mm/ap, -/obj/item/ammo_box/magazine/smgm9mm/ap, -/obj/item/ammo_box/magazine/smgm9mm/ap, +/obj/item/ammo_box/magazine/mp5, +/obj/item/ammo_box/magazine/mp5, +/obj/item/ammo_box/magazine/mp5, +/obj/item/ammo_box/magazine/mp5, +/obj/item/ammo_box/magazine/mp5, +/obj/item/ammo_box/magazine/mp5, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) "nl" = ( @@ -2682,13 +3047,6 @@ }, /turf/open/floor/plating/cobblestone, /area/awaymission/black_mesa) -"nA" = ( -/obj/structure/fluff/bus/passable/seat, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured_large{ - icon_state = "bus" - }, -/area/awaymission/black_mesa) "nC" = ( /obj/machinery/autolathe/hacked, /obj/structure/alien/weeds/xen, @@ -2706,6 +3064,13 @@ "nF" = ( /turf/closed/wall/mineral/titanium, /area/awaymission/black_mesa) +"nH" = ( +/obj/structure/closet/crate/large, +/obj/item/minespawner/explosive, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/turf/open/floor/iron/smooth_large, +/area/awaymission/black_mesa) "nI" = ( /obj/structure/sign/warning/xeno_mining{ pixel_x = -32 @@ -2725,6 +3090,13 @@ /obj/structure/mineral_door/xen, /turf/open/misc/dirt/planet/xen, /area/awaymission/black_mesa/xen) +"nO" = ( +/obj/machinery/door/window/brigdoor/security/cell{ + dir = 8; + id = "Mesa 1" + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "nP" = ( /obj/effect/turf_decal/trimline/green/filled/corner, /obj/structure/alien/weeds/xen, @@ -2768,6 +3140,28 @@ /obj/machinery/porta_turret/black_mesa, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"nZ" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + dir = 1; + icon_state = "right"; + name = "Outer Window" + }, +/obj/machinery/door/window/brigdoor{ + name = "Brig Control Desk"; + req_access_txt = "3" + }, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/poster/random_official, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "oa" = ( /obj/structure/railing{ dir = 8 @@ -2797,6 +3191,21 @@ /obj/item/storage/box/hecu_rations, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) +"oe" = ( +/obj/machinery/door/window/brigdoor/security/cell{ + dir = 8; + id = "Mesa 3" + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) +"of" = ( +/obj/structure/window/reinforced/unanchored{ + dir = 1 + }, +/obj/structure/table, +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "og" = ( /mob/living/simple_animal/hostile/blackmesa/xen/nihilanth, /obj/structure/marker_beacon/green, @@ -2840,10 +3249,8 @@ /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "op" = ( -/obj/machinery/computer/operating{ - dir = 4 - }, -/turf/open/floor/iron/smooth_large, +/obj/machinery/smartfridge/chemistry/preloaded, +/turf/closed/wall, /area/awaymission/black_mesa) "oq" = ( /obj/effect/decal/cleanable/blood/tracks, @@ -2853,6 +3260,11 @@ /obj/structure/mineral_door/paperframe, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) +"os" = ( +/obj/effect/spawner/random/bioluminescent_plant/weak, +/obj/structure/marker_beacon/burgundy, +/turf/open/misc/xen, +/area/awaymission/black_mesa/xen) "ot" = ( /obj/structure/chair{ dir = 1 @@ -2860,9 +3272,19 @@ /obj/machinery/light/cold, /turf/open/floor/carpet/blue, /area/awaymission/black_mesa) +"ou" = ( +/obj/item/book/granter/traitsr/ventcrawl_book, +/obj/effect/spawner/random/bioluminescent_plant, +/turf/open/misc/xen, +/area/awaymission/black_mesa/xen) +"ov" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/spawner/random/contraband, +/obj/effect/spawner/random/contraband, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "ow" = ( /obj/structure/fluff/bus/passable, -/obj/effect/decal/cleanable/dirt, /obj/item/food/meatball, /turf/open/floor/iron/dark/textured_large{ icon_state = "bus" @@ -2877,12 +3299,12 @@ /area/awaymission/black_mesa) "oz" = ( /obj/structure/rack/shelf, -/obj/item/ammo_box/magazine/m16/extended, -/obj/item/ammo_box/magazine/m16/extended, -/obj/item/ammo_box/magazine/m16/extended, -/obj/item/ammo_box/magazine/m16/extended, -/obj/item/ammo_box/magazine/m16/extended, -/obj/item/ammo_box/magazine/m16/extended, +/obj/item/ammo_box/magazine/m16, +/obj/item/ammo_box/magazine/m16, +/obj/item/ammo_box/magazine/m16, +/obj/item/ammo_box/magazine/m16, +/obj/item/ammo_box/magazine/m16, +/obj/item/ammo_box/magazine/m16, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "oA" = ( @@ -2913,6 +3335,12 @@ "oE" = ( /turf/closed/indestructible/rock/xen, /area/awaymission/black_mesa/xen) +"oF" = ( +/obj/structure/rack/gunrack, +/obj/item/gun/ballistic/automatic/pistol/g17/mesa, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "oH" = ( /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark/blue, @@ -2936,9 +3364,6 @@ /area/awaymission/black_mesa) "oN" = ( /obj/structure/table, -/obj/item/paper/crumpled{ - text = "hey uh... pal, i left some mags in the crates, so... yeah." - }, /obj/item/ammo_box/magazine/mp5, /turf/open/floor/iron/dark/blue, /area/awaymission/black_mesa) @@ -2991,12 +3416,6 @@ /obj/structure/lattice/catwalk, /turf/open/floor/engine, /area/awaymission/black_mesa) -"oZ" = ( -/obj/item/ammo_box/advanced/b10mm, -/turf/open/floor/plating{ - icon_state = "titanium_dam1" - }, -/area/awaymission/black_mesa) "pa" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, @@ -3068,6 +3487,13 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"pr" = ( +/obj/machinery/door/airlock/science{ + id_tag = "chemiguess" + }, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "pv" = ( /obj/machinery/chem_mass_spec, /obj/structure/alien/weeds/xen, @@ -3096,7 +3522,6 @@ /area/awaymission/black_mesa) "pB" = ( /obj/structure/fluff/bus/passable/seat/driver, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_large{ icon_state = "bus" }, @@ -3156,6 +3581,10 @@ /obj/machinery/iv_drip, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/xen) +"pS" = ( +/obj/machinery/autolathe/hacked, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "pU" = ( /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/smooth, @@ -3197,6 +3626,12 @@ /obj/structure/chair/sofa/bench, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"qh" = ( +/obj/structure/rack/gunrack, +/obj/item/storage/box/ammo_box/shotgun_12g, +/obj/item/storage/box/ammo_box/shotgun_12g, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "qi" = ( /obj/effect/turf_decal/stripes, /obj/structure/table, @@ -3252,6 +3687,25 @@ }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"qu" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 8 + }, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, +/turf/open/floor/mineral/titanium/white, +/area/awaymission/black_mesa) +"qv" = ( +/obj/structure/closet/secure_closet/brig, +/obj/item/poster/random_contraband, +/obj/effect/spawner/random/exotic/antag_gear_weak, +/turf/open/floor/iron, +/area/awaymission/black_mesa) +"qx" = ( +/obj/machinery/light/directional/east{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "qz" = ( /obj/effect/bump_teleporter/lambda{ id = "lambda_teleporter"; @@ -3275,8 +3729,32 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"qE" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -11; + pixel_y = 7 + }, +/obj/machinery/recharger{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/pen{ + pixel_x = -11; + pixel_y = 7 + }, +/obj/item/hand_labeler{ + pixel_x = -10; + pixel_y = -6 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "qF" = ( /obj/structure/railing, +/obj/structure/deployable_barricade/metal{ + dir = 4 + }, +/obj/structure/deployable_barricade/metal, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "qI" = ( @@ -3364,6 +3842,13 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"qZ" = ( +/obj/structure/cable, +/obj/machinery/light/directional/east{ + dir = 2 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "ra" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -3510,6 +3995,7 @@ "rI" = ( /obj/structure/closet/secure_closet/security, /obj/item/ammo_box/magazine/multi_sprite/g17, +/obj/item/gun/ballistic/automatic/pistol/g17/mesa, /turf/open/floor/iron, /area/awaymission/black_mesa) "rJ" = ( @@ -3520,6 +4006,11 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"rK" = ( +/obj/structure/table, +/obj/item/clothing/mask/balaclava, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "rL" = ( /obj/structure/chair{ dir = 1 @@ -3533,6 +4024,12 @@ icon_state = "floorscorched2" }, /area/awaymission/black_mesa) +"rU" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "rV" = ( /obj/structure/lattice/catwalk, /turf/open/water/jungle, @@ -3572,6 +4069,10 @@ "sb" = ( /obj/structure/rack/shelf, /obj/machinery/light/warm, +/obj/item/gun/ballistic/automatic/pistol/g17/mesa, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, /turf/open/floor/wood/parquet, /area/awaymission/black_mesa) "sc" = ( @@ -3612,6 +4113,15 @@ dir = 1 }, /area/awaymission/black_mesa/xen) +"sj" = ( +/obj/machinery/door_timer{ + id = "Mesa 6"; + name = "Cell 6"; + pixel_x = 32 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "sk" = ( /obj/structure/headpike/bamboo, /turf/open/misc/xen, @@ -3635,9 +4145,7 @@ /area/awaymission/black_mesa) "sr" = ( /obj/structure/table, -/obj/item/gun/ballistic/automatic/proto/unrestricted{ - name = "\improper Saber SMG" - }, +/obj/item/gun/ballistic/automatic/mp5, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) "ss" = ( @@ -3870,6 +4378,15 @@ dir = 6 }, /area/awaymission/black_mesa/xen) +"tu" = ( +/obj/structure/rack, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "tv" = ( /obj/structure/deployable_barricade/metal{ dir = 4 @@ -3935,6 +4452,13 @@ /obj/effect/random_mob_placer/security_guard, /turf/open/floor/wood/parquet, /area/awaymission/black_mesa) +"tL" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/science{ + id_tag = "chemiguess" + }, +/turf/open/floor/iron/textured, +/area/awaymission/black_mesa) "tN" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/coffee, @@ -4036,6 +4560,17 @@ /obj/effect/random_mob_placer/xen, /turf/open/floor/engine, /area/awaymission/black_mesa) +"um" = ( +/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note{ + info = "Right, I'm a commie? So what? I'm proud of it.." + }, +/obj/item/reagent_containers/food/drinks/bottle/vodka{ + pixel_x = 11 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/awaymission/black_mesa) "un" = ( /obj/structure/alien/weeds/xen, /obj/effect/random_mob_placer/xen/zombie, @@ -4051,6 +4586,15 @@ }, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"uq" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/item/radio/intercom/directional/west{ + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "ur" = ( /obj/machinery/light/broken{ dir = 1 @@ -4218,12 +4762,25 @@ }, /turf/open/floor/plating/elevatorshaft, /area/awaymission/black_mesa) +"uW" = ( +/obj/structure/sign/departments/chemistry{ + pixel_x = -31 + }, +/turf/open/floor/iron/textured, +/area/awaymission/black_mesa) "uY" = ( /obj/structure/closet/crate, /obj/structure/alien/weeds/xen, /obj/item/ammo_box/magazine/multi_sprite/ladon, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"uZ" = ( +/obj/structure/cable, +/obj/machinery/light/directional/east{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "vb" = ( /obj/effect/bump_teleporter{ id = "lambdaup"; @@ -4273,17 +4830,6 @@ /obj/structure/urinal/directional/south, /turf/open/floor/iron/freezer, /area/awaymission/black_mesa) -"vl" = ( -/obj/effect/bump_teleporter{ - id = "amsup"; - id_target = "amsdown" - }, -/obj/structure/railing{ - dir = 10 - }, -/obj/structure/alien/weeds/xen, -/turf/open/floor/mineral/titanium, -/area/awaymission/black_mesa) "vm" = ( /obj/structure/deployable_barricade/metal{ dir = 4 @@ -4310,10 +4856,23 @@ /obj/structure/curtain/cloth, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"vr" = ( +/obj/item/ammo_box/magazine/mmg_box, +/turf/open/floor/plating/cobblestone, +/area/awaymission/black_mesa) "vs" = ( /obj/machinery/porta_turret/black_mesa/heavy, /turf/open/floor/circuit, /area/awaymission/black_mesa) +"vt" = ( +/obj/structure/chair/stool{ + name = "Jim Norton's Quebecois Coffee stool" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/black_mesa) "vu" = ( /obj/effect/random_mob_placer/xen, /obj/structure/alien/weeds/xen, @@ -4352,6 +4911,24 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/plating, /area/awaymission/black_mesa) +"vE" = ( +/obj/machinery/door/window/brigdoor/security/cell{ + dir = 8; + id = "Mesa 2" + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) +"vF" = ( +/obj/item/clothing/suit/apron/chef{ + name = "Jim Norton's Quebecois Coffee apron" + }, +/obj/structure/sink{ + dir = 8; + pixel_x = 12 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "vG" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/chair/sofa/bench{ @@ -4452,6 +5029,21 @@ /obj/item/flashlight/lamp, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"wd" = ( +/obj/structure/table, +/obj/item/wirecutters, +/obj/item/screwdriver{ + pixel_x = -2; + pixel_y = 10 + }, +/obj/machinery/syndicatebomb/training, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) +"we" = ( +/obj/effect/random_mob_placer/xen/zombie, +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "wf" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -4518,6 +5110,22 @@ }, /turf/open/floor/plating, /area/awaymission/black_mesa) +"ww" = ( +/obj/structure/rack/shelf, +/obj/item/clothing/suit/armor/vest/blueshirt/skyrat/guard{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/suit/armor/vest/blueshirt/skyrat{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/suit/armor/vest/blueshirt{ + pixel_x = -5; + pixel_y = -6 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "wx" = ( /obj/effect/mob_spawn/corpse/human/scientist, /obj/structure/chair/office{ @@ -4550,6 +5158,10 @@ }, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"wD" = ( +/obj/item/gun_maintenance_supplies, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "wE" = ( /obj/structure/chair/stool/bamboo{ dir = 1 @@ -4568,6 +5180,10 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"wJ" = ( +/obj/machinery/hypnochair, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "wK" = ( /turf/open/misc/beach/coastline_t/xen{ dir = 9 @@ -4598,8 +5214,9 @@ dir = 4 }, /obj/structure/table, -/obj/item/raw_anomaly_core/random, /obj/structure/alien/weeds/xen, +/obj/effect/spawner/random/exotic/technology, +/obj/effect/spawner/random/exotic/technology, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "wT" = ( @@ -4647,6 +5264,12 @@ }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"xd" = ( +/obj/effect/decal/cleanable/blood/footprints{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "xe" = ( /obj/effect/random_mob_placer/xen/zombie, /turf/open/floor/iron/smooth, @@ -4674,7 +5297,6 @@ /obj/item/clothing/accessory/armband/science{ name = "pink armband" }, -/obj/item/radio/headset/headset_faction, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "xp" = ( @@ -4684,6 +5306,26 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"xq" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -11; + pixel_y = 7 + }, +/obj/machinery/recharger{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/pen{ + pixel_x = -11; + pixel_y = 7 + }, +/obj/item/hand_labeler{ + pixel_x = -10; + pixel_y = -6 + }, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "xr" = ( /obj/structure/cable, /obj/machinery/light/dim/directional/west, @@ -4714,6 +5356,12 @@ /obj/item/assembly/shock_kit, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"xw" = ( +/obj/structure/table, +/obj/item/storage/fancy/cigarettes/cigpack_robust, +/obj/item/lighter/greyscale, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "xx" = ( /obj/structure/closet/crate/wooden, /turf/open/floor/iron/smooth, @@ -4779,6 +5427,13 @@ }, /turf/open/floor/engine, /area/awaymission/black_mesa/xen) +"xI" = ( +/obj/machinery/chem_master, +/obj/machinery/light/cold{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "xJ" = ( /obj/structure/sign/warning/gasmask{ pixel_x = 32 @@ -4813,6 +5468,21 @@ }, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"xQ" = ( +/obj/machinery/door_timer{ + id = "Mesa 1"; + name = "Cell 1"; + pixel_x = -32 + }, +/obj/item/ammo_casing/spent, +/turf/open/floor/iron, +/area/awaymission/black_mesa) +"xR" = ( +/obj/machinery/computer/operating{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/awaymission/black_mesa) "xS" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 8 @@ -4911,6 +5581,10 @@ }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) +"yi" = ( +/obj/machinery/autolathe/hacked, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "yj" = ( /obj/effect/random_mob_placer/hev_zombie, /turf/open/misc/xen, @@ -4927,7 +5601,6 @@ /obj/structure/rack/shelf, /obj/item/gun/ballistic/automatic/laser/marksman, /obj/item/ammo_box/magazine/recharge/marksman, -/obj/item/ammo_box/magazine/recharge/marksman, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "yn" = ( @@ -4946,6 +5619,15 @@ /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"yq" = ( +/obj/machinery/door_timer{ + id = "Mesa 3"; + name = "Cell 3"; + pixel_x = -32 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "yr" = ( /obj/structure/alien/weeds/xen, /obj/effect/spawner/random/bioluminescent_plant/weak, @@ -4986,8 +5668,9 @@ /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "yz" = ( -/obj/structure/closet/crate/secure/weapon, -/obj/structure/cable, +/obj/item/stack/sheet/mineral/sandbags{ + amount = 50 + }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "yD" = ( @@ -5188,7 +5871,7 @@ }, /area/awaymission/black_mesa/xen) "zE" = ( -/obj/item/ammo_box/magazine/m16/extended, +/obj/item/ammo_box/magazine/m16, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "zF" = ( @@ -5265,13 +5948,18 @@ /obj/effect/random_mob_placer/vortigaunt_hostile, /turf/open/floor/plating, /area/awaymission/black_mesa) +"zU" = ( +/obj/effect/random_mob_placer/security_guard, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "zW" = ( /obj/item/radio/intercom/directional/west, -/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu, +/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/leader, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "zX" = ( -/obj/structure/tank_holder/anesthetic, +/obj/structure/table, +/obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "zZ" = ( @@ -5305,6 +5993,12 @@ }, /turf/open/floor/iron, /area/awaymission/black_mesa) +"Ah" = ( +/obj/structure/closet/firecloset/wall{ + pixel_x = 30 + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "Ai" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -5341,6 +6035,10 @@ dir = 6 }, /area/awaymission/black_mesa/xen) +"Av" = ( +/obj/structure/tank_holder/anesthetic, +/turf/open/floor/iron/smooth_large, +/area/awaymission/black_mesa) "Aw" = ( /obj/effect/turf_decal/stripes{ dir = 6 @@ -5357,6 +6055,7 @@ }, /obj/structure/closet/crate/bin, /obj/structure/alien/weeds/xen, +/obj/item/ammo_box/magazine/multi_sprite/g17, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "AB" = ( @@ -5383,13 +6082,33 @@ /obj/structure/alien/weeds/node, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"AH" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/obj/machinery/light/directional/east{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "AJ" = ( /obj/structure/closet/crate/bin, /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "AK" = ( -/obj/structure/closet/crate/secure/weapon, +/obj/structure/rack, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/gun_maintenance_supplies, +/obj/item/gun_maintenance_supplies, +/obj/item/gun_maintenance_supplies, +/obj/item/gun_maintenance_supplies, +/obj/item/gun_maintenance_supplies, +/obj/item/stack/sheet/cloth/ten, +/obj/item/stack/sheet/cloth/ten, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "AL" = ( @@ -5397,9 +6116,11 @@ /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "AN" = ( -/obj/item/ammo_box/magazine/m16, -/turf/open/misc/xen, -/area/awaymission/black_mesa/xen) +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 20 + }, +/turf/open/floor/iron/smooth, +/area/awaymission/black_mesa) "AO" = ( /obj/structure/bookcase/random/adult, /turf/open/floor/bamboo, @@ -5409,6 +6130,12 @@ /obj/machinery/light/broken, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"AQ" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "AS" = ( /obj/structure/table, /obj/machinery/light/cold, @@ -5439,6 +6166,10 @@ /obj/item/bedsheet/patriot, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"AY" = ( +/obj/structure/table, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "AZ" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -5490,6 +6221,12 @@ /obj/effect/gibspawner/human, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"Bt" = ( +/obj/structure/table, +/obj/item/grenade/antigravity, +/obj/item/grenade/antigravity, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "Bv" = ( /obj/item/food/urinalcake, /turf/open/floor/iron/smooth_large, @@ -5501,6 +6238,11 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/dark/blue, /area/awaymission/black_mesa) +"Bx" = ( +/obj/structure/closet/crate/bin, +/obj/item/ammo_box/magazine/multi_sprite/g17, +/turf/open/floor/iron/smooth_large, +/area/awaymission/black_mesa) "By" = ( /obj/structure/closet/crate/freezer/blood, /turf/open/floor/iron/smooth_large, @@ -5526,6 +6268,10 @@ }, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"BE" = ( +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, +/turf/open/floor/iron/smooth_large, +/area/awaymission/black_mesa) "BF" = ( /obj/structure/flora/biolumi/lamp/weaklight, /obj/structure/alien/weeds/xen, @@ -5536,6 +6282,11 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"BI" = ( +/obj/structure/table, +/obj/item/ammo_box/magazine/multi_sprite/ladon, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "BJ" = ( /obj/structure/closet/crate/bin, /obj/item/knife/combat/marksman, @@ -5597,17 +6348,19 @@ }, /turf/open/floor/plating, /area/awaymission/black_mesa) +"BY" = ( +/obj/machinery/power/rtg/abductor, +/obj/structure/cable, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/floor/plating, +/area/awaymission/black_mesa) "BZ" = ( /obj/structure/table, /obj/item/storage/medkit/advanced, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) -"Cb" = ( -/obj/item/storage/box/lethalshot, -/turf/open/floor/plating{ - icon_state = "titanium_dam1" - }, -/area/awaymission/black_mesa) "Cd" = ( /obj/machinery/door/airlock/multi_tile/metal{ dir = 4 @@ -5629,6 +6382,15 @@ /obj/structure/table/wood, /turf/open/floor/bamboo, /area/awaymission/black_mesa/xen) +"Ck" = ( +/obj/structure/window/reinforced/unanchored{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/light/directional/east, +/obj/item/storage/fancy/cigarettes/cigpack_robust, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Cl" = ( /obj/structure/railing, /turf/open/floor/iron/smooth_large, @@ -5762,6 +6524,10 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"CR" = ( +/obj/machinery/door/keycard/stockroom, +/turf/open/floor/plating, +/area/awaymission/black_mesa) "CS" = ( /obj/structure/table, /obj/structure/alien/weeds/xen, @@ -5782,10 +6548,17 @@ "CW" = ( /obj/structure/table, /obj/item/clothing/accessory/armband/deputy, -/obj/item/radio/headset/headset_faction/bowman/captain, -/obj/item/clothing/head/beret/sec, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"CX" = ( +/obj/item/radio/intercom/directional/west{ + pixel_y = 5 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "CY" = ( /turf/open/floor/vault/alien, /area/awaymission/black_mesa/xen) @@ -5802,6 +6575,11 @@ }, /turf/open/floor/circuit/red, /area/awaymission/black_mesa) +"Dc" = ( +/obj/structure/cable, +/obj/item/wrench, +/turf/open/misc/ironsand/black_mesa, +/area/awaymission/black_mesa) "Dd" = ( /obj/machinery/light/cold{ dir = 8 @@ -5916,6 +6694,15 @@ /obj/structure/spacevine/xen/thick, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) +"Dy" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/light/directional/east{ + dir = 8 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "DA" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 5 @@ -5924,7 +6711,7 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "DB" = ( -/obj/item/ammo_box/magazine/m16/extended, +/obj/item/ammo_box/magazine/m16, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "DD" = ( @@ -6006,7 +6793,6 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/effect/random_mob_placer/security_guard, /turf/open/floor/iron/dark/blue, /area/awaymission/black_mesa) "DW" = ( @@ -6033,6 +6819,17 @@ /obj/structure/lattice/catwalk, /turf/open/water/xen_acid, /area/awaymission/black_mesa/xen) +"Ec" = ( +/obj/structure/deployable_barricade/metal{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/misc/ironsand/black_mesa, +/area/awaymission/black_mesa) +"Ed" = ( +/obj/effect/random_mob_placer/xen/zombie, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Ef" = ( /obj/structure/chair/office, /turf/open/floor/iron/textured, @@ -6044,10 +6841,27 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"Ej" = ( +/obj/structure/noticeboard{ + pixel_y = 29 + }, +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/bottle/beer/light{ + pixel_x = -6; + pixel_y = -6 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Ek" = ( /obj/machinery/light/cold, /turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) +"El" = ( +/obj/structure/window/reinforced/unanchored{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Em" = ( /obj/structure/sink{ dir = 4; @@ -6119,6 +6933,12 @@ /obj/effect/mob_spawn/corpse/human/scientist, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"Ez" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/black_mesa) "EA" = ( /obj/structure/closet/crate/large, /turf/open/floor/plating/cobblestone, @@ -6179,6 +6999,31 @@ /obj/structure/table, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"EO" = ( +/obj/structure/table/reinforced{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/food/poppypretzel{ + pixel_x = -8; + pixel_y = -3 + }, +/obj/item/food/muffin/berry{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/item/food/hotcrossbun{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/food/cakeslice/pound_cake_slice{ + pixel_x = 8; + pixel_y = -2 + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "EP" = ( /obj/structure/rack/shelf, /obj/item/ammo_box/magazine/recharge/marksman, @@ -6208,6 +7053,20 @@ }, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"EX" = ( +/obj/structure/cable, +/obj/machinery/power/rtg/abductor, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/plating, +/area/awaymission/black_mesa) +"EY" = ( +/obj/structure/noticeboard{ + pixel_y = 29 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "EZ" = ( /obj/effect/turf_decal/stripes, /obj/structure/table, @@ -6224,7 +7083,22 @@ /turf/open/floor/plating, /area/awaymission/black_mesa) "Ff" = ( -/obj/effect/mob_spawn/ghost_role/human/black_mesa, +/obj/structure/table/glass, +/obj/item/clothing/glasses/science{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/glasses/science, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/cable_coil, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/screwdriver, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "Fg" = ( @@ -6246,9 +7120,6 @@ /area/awaymission/black_mesa) "Fk" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/ammo_box/magazine/m16, -/obj/item/ammo_box/magazine/m16, -/obj/item/ammo_box/magazine/m16, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Fl" = ( @@ -6258,6 +7129,15 @@ }, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"Fm" = ( +/obj/structure/rack/gunrack, +/obj/item/gun/ballistic/revolver/mateba{ + fire_select_modes = list(1,2) + }, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/awaymission/black_mesa) "Fn" = ( /obj/machinery/modular_computer/console/preset/civilian{ dir = 8 @@ -6277,10 +7157,10 @@ }, /area/awaymission/black_mesa) "Fr" = ( -/obj/structure/table, -/obj/machinery/light/cold, -/obj/item/storage/toolbox/mechanical, -/turf/open/floor/iron/dark, +/obj/structure/deployable_barricade/metal{ + dir = 4 + }, +/turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "Fs" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line, @@ -6296,13 +7176,25 @@ /obj/structure/railing, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"Fy" = ( +/obj/structure/closet/secure_closet/chemical{ + req_access = null + }, +/obj/item/storage/bag/chemistry, +/obj/item/storage/backpack/satchel/leather, +/obj/item/storage/backpack/satchel/leather, +/obj/item/storage/backpack/satchel/leather, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "FA" = ( /obj/structure/closet/crate/large, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "FB" = ( -/obj/item/radio/headset/headset_faction, -/turf/open/floor/iron/dark, +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "floor3" + }, +/turf/open/floor/iron, /area/awaymission/black_mesa) "FC" = ( /turf/open/misc/beach/coastline_b/xen{ @@ -6320,6 +7212,11 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"FG" = ( +/obj/structure/falsewall/reinforced, +/obj/structure/sign/poster/contraband/communist_state, +/turf/open/floor/plating, +/area/awaymission/black_mesa) "FH" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/machinery/door/poddoor{ @@ -6348,14 +7245,13 @@ /turf/open/floor/plating/cobblestone, /area/awaymission/black_mesa) "FM" = ( -/obj/structure/railing{ - dir = 6 +/obj/structure/deployable_barricade/metal{ + dir = 4 }, -/obj/effect/bump_teleporter{ - id = "amsdown"; - id_target = "amsup" +/obj/item/food/snowcones/pwrgame{ + pixel_y = -15 }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "FN" = ( /obj/structure/closet/crate/bin, @@ -6372,7 +7268,9 @@ /area/awaymission/black_mesa) "FO" = ( /obj/structure/rack/gunrack, -/obj/item/gun/blastcannon, +/obj/item/ammo_box/advanced/smartgun, +/obj/item/ammo_box/advanced/smartgun, +/obj/item/ammo_box/advanced/smartgun, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) "FQ" = ( @@ -6399,11 +7297,10 @@ /turf/open/floor/iron/dark/blue, /area/awaymission/black_mesa) "FV" = ( -/obj/item/paper/crumpled{ - pixel_y = -36; - text = "Subject N17 - awaits for the medivac. For fucks sake, do NOT open it." - }, -/turf/open/floor/iron/smooth_large, +/obj/structure/table, +/obj/item/gun/energy/laser/thermal/inferno, +/obj/item/gun/energy/laser/thermal/cryo, +/turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "FW" = ( /obj/machinery/door/airlock/science/glass, @@ -6449,10 +7346,19 @@ }, /turf/open/floor/mineral/titanium, /area/awaymission/black_mesa) +"Gg" = ( +/obj/effect/decal/cleanable/blood/footprints, +/obj/item/ammo_casing/shotgun/buckshot, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Gh" = ( /obj/effect/random_mob_placer/vortigaunt, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) +"Gl" = ( +/obj/item/storage/barricade, +/turf/open/floor/iron/smooth_large, +/area/awaymission/black_mesa) "Gm" = ( /obj/effect/bump_teleporter{ id = "teleporterup"; @@ -6460,6 +7366,16 @@ }, /turf/open/floor/mineral/titanium, /area/awaymission/black_mesa) +"Gn" = ( +/obj/effect/decal/cleanable/blood/footprints{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/footprints{ + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Go" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/chair/sofa/bench/right{ @@ -6501,6 +7417,12 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"Gw" = ( +/obj/structure/rack/gunrack, +/obj/item/gun/ballistic/automatic/mp5, +/obj/item/ammo_box/magazine/mp5, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Gx" = ( /obj/machinery/light/cold{ dir = 4 @@ -6508,12 +7430,25 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"Gz" = ( +/obj/machinery/power/rtg/advanced, +/obj/structure/cable, +/turf/open/misc/ironsand/black_mesa, +/area/awaymission/black_mesa) "GA" = ( /obj/machinery/chem_mass_spec, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "GB" = ( -/mob/living/simple_animal/hostile/blackmesa/blackops/ranged, +/mob/living/simple_animal/hostile/blackmesa/blackops/ranged{ + desc = "GOD, I LOVE PWR GAME."; + ghost_controllable = 1; + name = "high on pwr operative" + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = -1; + pixel_y = -16 + }, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "GC" = ( @@ -6538,6 +7473,10 @@ /obj/effect/spawner/liquids_spawner, /turf/open/floor/iron/pool, /area/awaymission/black_mesa) +"GH" = ( +/obj/item/storage/box/ammo_box/shotgun_12g, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "GI" = ( /obj/effect/spawner/random/bioluminescent_plant/weak, /turf/open/misc/xen, @@ -6585,11 +7524,24 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"GS" = ( +/obj/structure/rack/shelf, +/obj/item/clothing/suit/armor/riot, +/obj/item/clothing/head/helmet/riot, +/obj/item/shield/riot, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "GT" = ( /obj/structure/closet/crate/large, /obj/item/storage/medkit/regular, /turf/open/floor/plating, /area/awaymission/black_mesa) +"GU" = ( +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "GV" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line, /obj/structure/alien/weeds/xen, @@ -6636,21 +7588,10 @@ }, /area/awaymission/black_mesa) "Hh" = ( -/obj/structure/rack, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/iron/fifty, /obj/machinery/light/cold{ dir = 8 }, -/obj/item/gun_maintenance_supplies, -/obj/item/gun_maintenance_supplies, -/obj/item/gun_maintenance_supplies, -/obj/item/gun_maintenance_supplies, -/obj/item/gun_maintenance_supplies, -/obj/item/stack/sheet/cloth/ten, -/obj/item/stack/sheet/cloth/ten, +/obj/machinery/autolathe/hacked, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Hi" = ( @@ -6674,7 +7615,6 @@ /obj/structure/table, /obj/item/clothing/accessory/medal/silver/valor, /obj/item/clothing/accessory/medal/bronze_heart, -/obj/item/clothing/gloves/tackler/combat/insulated, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Hr" = ( @@ -6689,10 +7629,23 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"Ht" = ( +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = -9; + pixel_y = 13 + }, +/turf/open/floor/iron/textured_large, +/area/awaymission/black_mesa) "Hu" = ( /obj/structure/flora/tree/dead, /turf/open/misc/dirt/planet/xen, /area/awaymission/black_mesa/xen) +"Hw" = ( +/obj/machinery/computer/crew{ + dir = 8 + }, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "Hx" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/extinguisher_cabinet/directional/south, @@ -6745,6 +7698,14 @@ }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"HI" = ( +/obj/structure/cable, +/turf/closed/indestructible/rock, +/area/awaymission/black_mesa) +"HJ" = ( +/obj/effect/decal/cleanable/blood/footprints, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "HL" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -6891,6 +7852,11 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"Iq" = ( +/obj/structure/closet/crate/large, +/obj/item/minespawner/explosive, +/turf/open/floor/iron/smooth_large, +/area/awaymission/black_mesa) "Ir" = ( /obj/effect/decal/cleanable/blood/tracks, /obj/structure/deployable_barricade/metal/plasteel{ @@ -6967,6 +7933,12 @@ /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"IJ" = ( +/obj/machinery/computer/prisoner/management{ + dir = 8 + }, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "IK" = ( /obj/machinery/medical_kiosk, /turf/open/floor/iron/smooth_large, @@ -7039,6 +8011,23 @@ /obj/structure/billboard/donk_n_go, /turf/closed/wall/r_wall, /area/awaymission/black_mesa) +"Jc" = ( +/obj/structure/rack/shelf, +/obj/machinery/light/small/red/directional/north{ + dir = 8 + }, +/obj/item/armament_points_card/assaultops, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/awaymission/black_mesa) +"Je" = ( +/obj/structure/closet/secure_closet/brig, +/obj/item/poster/random_contraband, +/obj/effect/spawner/random/contraband/permabrig_gear, +/obj/effect/spawner/random/exotic/antag_gear_weak, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Jf" = ( /obj/machinery/computer{ dir = 4 @@ -7072,6 +8061,12 @@ /obj/structure/mineral_door/paperframe, /turf/open/misc/dirt/planet/xen, /area/awaymission/black_mesa/xen) +"Jk" = ( +/obj/item/clothing/mask/gas/hecu1, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/awaymission/black_mesa) "Jm" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/alien/weeds/xen, @@ -7097,14 +8092,18 @@ /obj/item/ammo_box/magazine/mp5, /turf/open/floor/plating, /area/awaymission/black_mesa) -"Jq" = ( -/obj/structure/table, -/obj/item/raw_anomaly_core/random, -/obj/structure/alien/weeds/xen, -/turf/open/floor/iron/textured, -/area/awaymission/black_mesa) "Jr" = ( -/obj/machinery/autolathe/hacked, +/obj/structure/closet/secure_closet/medical1{ + req_access = null + }, +/obj/item/defibrillator/compact/loaded, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/fire, +/obj/item/storage/medkit/o2, +/obj/item/storage/medkit/toxin, +/obj/item/storage/medkit/surgery, +/obj/item/bodybag, +/obj/item/storage/bag/medpens, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Js" = ( @@ -7174,6 +8173,11 @@ "JH" = ( /turf/open/misc/ice, /area/awaymission/black_mesa) +"JI" = ( +/obj/structure/cable, +/obj/structure/table, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "JJ" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line, /turf/open/floor/iron/smooth_large, @@ -7182,10 +8186,34 @@ /obj/structure/alien/weeds/xen, /turf/open/water/jungle, /area/awaymission/black_mesa) +"JM" = ( +/obj/structure/table/reinforced{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/item/paper{ + info = "Jim Norton's Quebecois Coffee. You see, in 2265 the Quebecois had finally had enough of Canada's shit, and went to the one place that wasn't corrupted by Canuckistan.Je vais au seul endroit qui n'a pas ??? corrompu par les Canadiens ... ESPACE."; + name = "Coffee Shop"; + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/reagent_containers/food/drinks/mug/coco{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/reagent_containers/food/drinks/mug/tea{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = -3 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "JN" = ( -/obj/structure/rack/shelf, -/obj/item/clothing/head/bio_hood/scientist, -/obj/item/clothing/suit/bio_suit/scientist, +/obj/machinery/suit_storage_unit/open, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) "JO" = ( @@ -7222,6 +8250,16 @@ }, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) +"JV" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) +"JX" = ( +/obj/item/ammo_casing/spent, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "JY" = ( /obj/structure/railing{ dir = 4 @@ -7234,7 +8272,9 @@ /area/awaymission/black_mesa) "JZ" = ( /obj/structure/stone_tile/slab, -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/gordon_freeman, +/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/gordon_freeman{ + ghost_controllable = 1 + }, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) "Kc" = ( @@ -7297,6 +8337,10 @@ /obj/effect/random_mob_placer/xen, /turf/open/misc/dirt/planet/xen, /area/awaymission/black_mesa/xen) +"Kp" = ( +/obj/machinery/medical_kiosk, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "Kq" = ( /obj/machinery/door/poddoor{ id = "sectorcmain" @@ -7348,12 +8392,19 @@ /area/awaymission/black_mesa) "KE" = ( /obj/structure/table, -/obj/item/gun/energy/cell_loaded/medigun/cmo, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/xen) "KG" = ( -/obj/item/clothing/accessory/armband/engine, -/turf/open/floor/iron/dark, +/obj/structure/sign/poster/contraband/pwr_game{ + pixel_x = -32 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, +/mob/living/simple_animal/hostile/blackmesa/blackops/ranged{ + desc = "COME AND GET ME, ASSHOLES."; + ghost_controllable = 1; + name = "high on pwr operative" + }, +/turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "KH" = ( /obj/structure/chair/office, @@ -7388,6 +8439,10 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"KQ" = ( +/obj/item/ammo_box/magazine/mp5, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "KT" = ( /obj/structure/showcase/machinery/tv, /turf/open/floor/wood/parquet, @@ -7418,6 +8473,11 @@ /obj/item/stack/sheet/cloth/ten, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"KZ" = ( +/obj/structure/table, +/obj/item/stack/ore/bluespace_crystal, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "Lc" = ( /obj/structure/chair/office{ dir = 1 @@ -7483,15 +8543,8 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "Ln" = ( -/obj/structure/table/glass, -/obj/item/stack/sheet/mineral/plasma{ - name = "solid thing" - }, -/obj/item/stack/sheet/mineral/plasma{ - name = "solid thing" - }, -/obj/item/storage/box/beakers/variety, -/turf/open/floor/iron/dark, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, +/turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "Lo" = ( /obj/machinery/door/airlock/wood/glass, @@ -7519,9 +8572,8 @@ /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "Lv" = ( -/obj/item/storage/box/ammo_box, -/obj/structure/cable, -/turf/open/floor/iron/dark, +/obj/item/ammo_box/magazine/multi_sprite/g17, +/turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "Lw" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ @@ -7556,7 +8608,7 @@ /turf/open/floor/iron/pool, /area/awaymission/black_mesa) "LC" = ( -/obj/item/gun/ballistic/automatic/pistol/luger, +/obj/item/gun/ballistic/automatic/pistol/g17/mesa, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) "LD" = ( @@ -7644,6 +8696,7 @@ /obj/item/storage/toolbox/emergency/turret/mesa, /obj/item/storage/toolbox/emergency/turret/mesa, /obj/item/storage/toolbox/emergency/turret/mesa, +/obj/item/storage/toolbox/emergency/turret/mesa, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "LW" = ( @@ -7658,17 +8711,21 @@ "LZ" = ( /obj/structure/railing, /obj/machinery/light/cold/directional/west, +/obj/structure/deployable_barricade/metal, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "Mc" = ( -/obj/structure/chair/office{ - dir = 1 +/obj/structure/deployable_barricade/metal{ + dir = 4 }, -/obj/structure/chair/office{ - dir = 1 +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_y = 17 }, -/obj/effect/mob_spawn/ghost_role/human/black_mesa, -/turf/open/floor/iron/textured_large, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = -1; + pixel_y = -16 + }, +/turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "Md" = ( /obj/structure/alien/weeds/xen, @@ -7692,14 +8749,9 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "Mi" = ( -/obj/effect/bump_teleporter{ - id = "amsdown"; - id_target = "amsup" - }, -/obj/structure/railing{ - dir = 10 - }, -/turf/open/floor/mineral/titanium, +/obj/structure/alien/weeds/xen, +/obj/item/ammo_box/a762, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "Mj" = ( /obj/structure/shockplant, @@ -7720,9 +8772,6 @@ /obj/item/grenade/c4, /obj/item/grenade/c4, /obj/item/grenade/c4, -/obj/item/assembly/signaler, -/obj/item/assembly/signaler, -/obj/item/assembly/signaler, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "Mp" = ( @@ -7798,8 +8847,8 @@ /turf/open/floor/circuit, /area/awaymission/black_mesa) "MF" = ( -/obj/effect/mob_spawn/ghost_role/human/black_mesa, -/turf/open/floor/iron/dark, +/obj/item/book/granter/crafting_recipe/trash_cannon, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "MG" = ( /obj/structure/mineral_door/xen, @@ -7819,10 +8868,8 @@ /turf/open/floor/wood/parquet, /area/awaymission/black_mesa) "ML" = ( -/obj/structure/closet/firecloset/wall{ - pixel_x = 30 - }, -/turf/open/floor/iron/dark, +/obj/item/food/deadmouse, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "MM" = ( /obj/structure/inflatable, @@ -7882,6 +8929,36 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/engine, /area/awaymission/black_mesa/xen) +"MY" = ( +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/condiment/sugar{ + pixel_y = 4 + }, +/obj/item/reagent_containers/food/condiment/soymilk{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/drinks/ice{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/reagent_containers/food/drinks/bottle/cream{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/structure/table{ + name = "Jim Norton's Quebecois Coffee table" + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) +"MZ" = ( +/obj/structure/closet/crate/bin, +/obj/item/ammo_box/a357, +/turf/open/floor/iron/smooth_large, +/area/awaymission/black_mesa) "Nb" = ( /obj/effect/decal/cleanable/blood/tracks, /obj/structure/inflatable/door{ @@ -7916,6 +8993,10 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"Nj" = ( +/obj/structure/fence/door, +/turf/open/floor/plating, +/area/awaymission/black_mesa) "Nk" = ( /turf/open/misc/beach/coastline_t/xen{ dir = 4 @@ -7972,7 +9053,10 @@ /area/awaymission/black_mesa/xen) "Nv" = ( /obj/machinery/light/cold/directional/west, -/obj/effect/random_mob_placer/blackops, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 4; + pixel_y = -2 + }, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "Ny" = ( @@ -7995,6 +9079,14 @@ /obj/effect/random_mob_placer/vortigaunt_hostile, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"ND" = ( +/obj/structure/window/reinforced/unanchored{ + dir = 1 + }, +/obj/structure/table, +/obj/item/reagent_containers/spray/pepper, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "NE" = ( /obj/structure/window/spawner/north, /obj/structure/window/spawner/west, @@ -8015,9 +9107,14 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "NJ" = ( -/obj/structure/table, -/obj/item/grenade/antigravity, -/obj/item/grenade/antigravity, +/obj/structure/table/glass, +/obj/item/stack/sheet/mineral/plasma{ + name = "solid thing" + }, +/obj/item/stack/sheet/mineral/plasma{ + name = "solid thing" + }, +/obj/item/storage/box/beakers/variety, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "NK" = ( @@ -8025,6 +9122,11 @@ /obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/wood/parquet, /area/awaymission/black_mesa) +"NL" = ( +/obj/structure/closet/crate/large, +/obj/item/ammo_box/magazine/multi_sprite/g17, +/turf/open/floor/plating, +/area/awaymission/black_mesa) "NM" = ( /obj/effect/turf_decal/stripes{ dir = 10 @@ -8063,8 +9165,9 @@ /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "NR" = ( -/obj/machinery/hypnochair, -/turf/open/floor/iron/dark, +/obj/structure/alien/weeds/xen, +/obj/item/stack/sticky_tape, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "NS" = ( /obj/structure/table, @@ -8147,6 +9250,16 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"Ol" = ( +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/awaymission/black_mesa) +"Om" = ( +/obj/structure/closet/secure_closet/security, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "On" = ( /obj/structure/decorative/shelf/crates1, /turf/open/floor/bamboo, @@ -8164,10 +9277,9 @@ /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Or" = ( -/obj/structure/sign/departments/chemistry{ - pixel_x = -31 - }, -/turf/open/floor/iron/textured_large, +/obj/structure/alien/weeds/xen, +/obj/item/gun/ballistic/rifle/boltaction/pipegun, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "Os" = ( /obj/effect/turf_decal/stripes/corner, @@ -8195,6 +9307,11 @@ /obj/item/stack/cable_coil, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"Ox" = ( +/obj/structure/bed, +/obj/item/bedsheet, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "OA" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/locked, @@ -8226,6 +9343,10 @@ /obj/item/fireaxe/metal_h2_axe, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"OF" = ( +/obj/machinery/destructive_scanner, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "OH" = ( /obj/structure/table, /obj/item/folder/blue, @@ -8249,6 +9370,13 @@ /obj/effect/gibspawner/human, /turf/open/floor/iron/dark/textured_large, /area/awaymission/black_mesa) +"ON" = ( +/obj/structure/cable, +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "OO" = ( /obj/effect/spawner/random/bioluminescent_plant/weak, /turf/open/water/beach/xen, @@ -8371,6 +9499,16 @@ }, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"Pp" = ( +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = -8 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 9; + pixel_y = 12 + }, +/turf/open/floor/iron/textured_large, +/area/awaymission/black_mesa) "Pq" = ( /obj/structure/alien/weeds/xen, /turf/open/floor/iron/green/side{ @@ -8398,6 +9536,13 @@ /obj/structure/cable, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) +"Pv" = ( +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Px" = ( /obj/structure/window/reinforced/spawner{ dir = 1 @@ -8412,8 +9557,15 @@ /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "PB" = ( -/obj/item/ammo_box/magazine/mmg_box, -/turf/open/floor/iron/dark, +/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull, +/turf/open/misc/ironsand/black_mesa, +/area/awaymission/black_mesa) +"PC" = ( +/obj/structure/deployable_barricade/metal{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating/cobblestone, /area/awaymission/black_mesa) "PD" = ( /obj/structure/chair/sofa/bamboo/left{ @@ -8425,6 +9577,7 @@ /obj/effect/spawner/random/exotic/antag_gear, /obj/structure/closet/crate/secure/loot, /obj/effect/spawner/random/exotic/antag_gear_weak, +/obj/effect/spawner/random/exotic/antag_gear_weak, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "PF" = ( @@ -8482,6 +9635,13 @@ }, /turf/open/floor/wood/parquet, /area/awaymission/black_mesa) +"PR" = ( +/obj/structure/noticeboard/directional/north, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "PS" = ( /obj/structure/toilet{ dir = 8 @@ -8523,6 +9683,19 @@ /obj/item/storage/medkit/advanced, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"Qf" = ( +/obj/machinery/vending/coffee{ + default_price = 0; + extra_price = 0; + fair_market_price = 0; + name = "\improper Jim Norton's Quebecois Coffee" + }, +/obj/structure/sign/poster/contraband/robust_softdrinks{ + name = "Jim Norton's Quebecois Coffee"; + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "Qg" = ( /turf/open/water/beach/xen, /area/awaymission/black_mesa/xen) @@ -8573,6 +9746,10 @@ /obj/structure/railing/corner, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"Qs" = ( +/obj/machinery/vending/cola/red, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Qt" = ( /obj/structure/railing{ dir = 1 @@ -8601,6 +9778,7 @@ "Qx" = ( /obj/structure/table, /obj/item/extinguisher, +/obj/item/ammo_box/magazine/multi_sprite/g17, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "Qy" = ( @@ -8618,12 +9796,8 @@ /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) "QC" = ( -/obj/structure/deployable_barricade/metal{ - dir = 1 - }, -/obj/structure/deployable_barricade/metal{ - dir = 4 - }, +/obj/item/stack/sheet/iron/ten, +/obj/item/stack/sheet/iron/ten, /turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "QD" = ( @@ -8634,16 +9808,26 @@ /obj/item/ammo_box/magazine/multi_sprite/ladon, /turf/open/floor/plating, /area/awaymission/black_mesa) +"QE" = ( +/obj/effect/decal/cleanable/blood/footprints, +/obj/item/gun/ballistic/shotgun/m23, +/turf/open/floor/iron/dark/blue, +/area/awaymission/black_mesa) "QG" = ( /obj/effect/random_mob_placer/xen, /turf/open/floor/iron, /area/awaymission/black_mesa) +"QH" = ( +/obj/machinery/door_timer{ + id = "Mesa 4"; + name = "Cell 4"; + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "QI" = ( /obj/structure/rack, -/obj/item/stack/sheet/mineral/plasma{ - amount = 10; - name = "solid thing" - }, +/obj/item/construction/rld, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "QJ" = ( @@ -8740,6 +9924,16 @@ "QZ" = ( /turf/closed/indestructible/rock, /area/space) +"Rb" = ( +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 20 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/open/floor/iron/smooth, +/area/awaymission/black_mesa) "Re" = ( /obj/effect/turf_decal/trimline/darkblue/filled/corner{ dir = 4 @@ -8766,6 +9960,18 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/plating, /area/awaymission/black_mesa) +"Rm" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/security, +/turf/open/floor/iron, +/area/awaymission/black_mesa) +"Rn" = ( +/obj/structure/lattice/catwalk, +/obj/structure/chair/plastic{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa/xen) "Ro" = ( /obj/structure/rack/shelf, /obj/machinery/light/cold{ @@ -8775,11 +9981,8 @@ /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "Rp" = ( -/obj/machinery/door/airlock/science{ - id_tag = "chemiguess" - }, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/iron/textured, +/obj/item/book/granter/crafting_recipe/cooking_sweets_101, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "Rq" = ( /obj/machinery/light/cold, @@ -8813,6 +10016,17 @@ /obj/item/reagent_containers/food/drinks/mug/tea, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"Rw" = ( +/obj/machinery/door/window/brigdoor/security/cell{ + dir = 4; + id = "Mesa 6" + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) +"Rx" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Ry" = ( /obj/structure/chair, /obj/machinery/light/broken{ @@ -8906,6 +10120,10 @@ }, /turf/open/floor/plating, /area/awaymission/black_mesa) +"RU" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "RV" = ( /obj/structure/closet/crate/bin, /obj/machinery/light/broken{ @@ -8914,11 +10132,22 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"RX" = ( +/obj/item/ammo_casing/shotgun/buckshot, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "RY" = ( /obj/structure/table, /obj/item/folder/red, /turf/open/misc/ice, /area/awaymission/black_mesa) +"RZ" = ( +/obj/structure/rack/shelf, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, +/turf/open/floor/iron/textured, +/area/awaymission/black_mesa) "Sb" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced/spawner/north{ @@ -9033,7 +10262,10 @@ /turf/open/floor/mineral/titanium/white, /area/awaymission/black_mesa) "SB" = ( -/obj/structure/rack/gunrack, +/obj/structure/closet/crate/secure/weapon, +/obj/item/stack/sheet/iron/twenty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "SE" = ( @@ -9055,6 +10287,13 @@ /obj/structure/table/abductor, /turf/open/misc/dirt/planet/xen, /area/awaymission/black_mesa/xen) +"SI" = ( +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/open/floor/iron/smooth, +/area/awaymission/black_mesa) "SJ" = ( /obj/machinery/dna_scannernew, /turf/open/floor/iron/textured_large, @@ -9067,9 +10306,10 @@ /turf/open/floor/mineral/titanium/white, /area/awaymission/black_mesa) "SN" = ( -/obj/structure/cable, -/obj/structure/rack, -/turf/open/floor/iron/dark, +/obj/structure/railing, +/obj/structure/table, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, +/turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "SQ" = ( /obj/machinery/portable_atmospherics/canister/nob, @@ -9079,6 +10319,12 @@ /obj/machinery/portable_atmospherics/canister/hydrogen, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"ST" = ( +/obj/structure/closet/secure_closet/brig, +/obj/item/poster/random_contraband, +/obj/effect/spawner/random/contraband/permabrig_gear, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "SU" = ( /obj/machinery/light/cold{ dir = 4 @@ -9111,6 +10357,15 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) +"Td" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/iron/textured_large, +/area/awaymission/black_mesa) "Te" = ( /obj/machinery/door/airlock/multi_tile/glass, /turf/open/floor/iron/textured, @@ -9193,6 +10448,26 @@ "Tv" = ( /turf/open/floor/circuit/red, /area/awaymission/black_mesa) +"Tw" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + dir = 2; + icon_state = "right"; + name = "Reception Window" + }, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Brig Control Desk"; + req_access_txt = "3" + }, +/obj/item/paper, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/item/storage/fancy/donut_box, +/obj/item/paper, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Tx" = ( /obj/machinery/light/broken{ dir = 1 @@ -9211,6 +10486,11 @@ dir = 8 }, /area/awaymission/black_mesa) +"Tz" = ( +/obj/structure/cable, +/obj/item/ammo_casing/spent, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "TA" = ( /obj/effect/decal/remains/human, /turf/open/floor/iron/dark, @@ -9226,6 +10506,12 @@ }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) +"TD" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "floor5" + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "TF" = ( /obj/item/storage/medkit/regular, /turf/open/floor/iron/smooth_large, @@ -9234,6 +10520,7 @@ /obj/structure/closet/crate/secure/loot, /obj/effect/spawner/random/exotic/antag_gear, /obj/effect/spawner/random/exotic/antag_gear_weak, +/obj/effect/spawner/random/exotic/antag_gear_weak, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "TH" = ( @@ -9278,9 +10565,10 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "TU" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable, -/turf/open/floor/iron/dark, +/obj/structure/table, +/obj/item/ammo_box/magazine/multi_sprite/ladon, +/obj/item/ammo_box/magazine/multi_sprite/g17, +/turf/open/floor/wood/parquet, /area/awaymission/black_mesa) "TV" = ( /obj/effect/random_mob_placer/xen/zombie, @@ -9298,6 +10586,22 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"TY" = ( +/obj/structure/sign/warning/nosmoking/circle{ + pixel_y = 32 + }, +/obj/item/storage/fancy/cigarettes/cigpack_uplift{ + pixel_x = 13; + pixel_y = -3 + }, +/obj/structure/table, +/obj/machinery/reagentgrinder, +/obj/item/lighter{ + pixel_x = 11; + pixel_y = 7 + }, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "TZ" = ( /obj/structure/chair/office{ dir = 1 @@ -9349,8 +10653,9 @@ /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) "Ul" = ( -/obj/structure/closet/crate/secure/weapon, -/obj/item/stack/sheet/iron/twenty, +/obj/structure/rack, +/obj/item/storage/box/ammo_box, +/obj/item/storage/box/ammo_box, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Um" = ( @@ -9359,7 +10664,16 @@ /area/awaymission/black_mesa/xen) "Un" = ( /obj/structure/rack/gunrack, -/obj/item/gun/ballistic/automatic/smartgun, +/obj/item/gun/ballistic/automatic/smartgun{ + desc = "Suppressive Manual Action Reciprocating Taser rifle. A gauss rifle fitted to fire miniature shock-bolts. Looks like this one is prety heavy, but it has a scope on it."; + name = "\improper OP-10 'S.M.A.R.T.' Rifle"; + recharge_time = 60; + recoil = 3; + slowdown = 0.25; + zoom_amt = 4; + zoom_out_amt = 2; + zoomable = 1 + }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) "Uo" = ( @@ -9421,7 +10735,6 @@ /area/awaymission/black_mesa/xen) "Uz" = ( /obj/structure/table, -/obj/item/ammo_box/magazine/m16, /obj/item/storage/box/hecu_rations, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) @@ -9433,9 +10746,9 @@ "UB" = ( /obj/structure/rack/shelf, /obj/item/melee/baton/security, -/obj/item/storage/box/lethalshot, -/obj/item/storage/box/lethalshot, /obj/item/gun/ballistic/shotgun/automatic/as2, +/obj/item/storage/box/ammo_box/shotgun_12g, +/obj/item/storage/box/ammo_box/shotgun_12g, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "UC" = ( @@ -9466,7 +10779,7 @@ "UG" = ( /obj/structure/table, /obj/item/grenade/gas_crystal/nitrous_oxide_crystal, -/obj/item/ammo_box/magazine/multi_sprite/ladon, +/obj/item/ammo_box/magazine/multi_sprite/g17, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "UH" = ( @@ -9482,9 +10795,10 @@ /turf/open/floor/iron/freezer, /area/awaymission/black_mesa) "UI" = ( -/obj/item/flashlight/seclite, -/obj/item/ammo_box/magazine/mmg_box, -/turf/open/floor/iron/dark, +/obj/structure/deployable_barricade/metal{ + dir = 8 + }, +/turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "UJ" = ( /obj/machinery/light/broken, @@ -9565,9 +10879,14 @@ /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "Vc" = ( -/obj/item/ammo_box/magazine/m9mm/ap, +/obj/item/ammo_box/magazine/multi_sprite/g17/hp, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) +"Vd" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/awaymission/black_mesa) "Ve" = ( /turf/open/floor/iron/textured, /area/awaymission/black_mesa) @@ -9577,6 +10896,13 @@ /obj/item/gun_maintenance_supplies, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"Vg" = ( +/obj/machinery/door/window/brigdoor/security/cell{ + dir = 4; + id = "Mesa 5" + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Vh" = ( /obj/structure/rack/shelf, /obj/item/storage/medkit/advanced, @@ -9586,13 +10912,20 @@ /obj/item/storage/medkit/expeditionary, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) -"Vi" = ( -/obj/machinery/chem_heater, +"Vk" = ( +/obj/structure/table/glass, +/obj/item/clothing/accessory/medal/plasma/nobel_science, +/obj/item/clothing/glasses/science{ + pixel_y = -2 + }, +/obj/item/clothing/head/beret/science{ + pixel_y = 2 + }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) -"Vk" = ( -/obj/machinery/chem_dispenser/fullupgrade, -/turf/open/floor/iron/dark, +"Vm" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/turf/open/floor/iron/dark/blue, /area/awaymission/black_mesa) "Vo" = ( /obj/structure/alien/weeds/node, @@ -9603,12 +10936,9 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) -"Vr" = ( -/obj/machinery/chem_master, -/obj/machinery/light/cold{ - dir = 1 - }, -/turf/open/floor/iron/dark, +"Vq" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/iron, /area/awaymission/black_mesa) "Vs" = ( /obj/structure/railing{ @@ -9627,10 +10957,29 @@ /turf/open/floor/engine, /area/awaymission/black_mesa/xen) "Vv" = ( -/obj/structure/sign/warning/nosmoking/circle{ - pixel_y = 32 +/obj/structure/table/glass, +/obj/item/clothing/accessory/medal/plasma/nobel_science{ + pixel_x = 7 + }, +/obj/item/clothing/accessory/medal/plasma/nobel_science{ + pixel_x = -6 + }, +/obj/item/clothing/glasses/science{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/glasses/science{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/clothing/head/beret/science{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/clothing/head/beret/science{ + pixel_x = -5; + pixel_y = 2 }, -/obj/structure/closet/secure_closet/chemical, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Vw" = ( @@ -9662,7 +11011,8 @@ /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "VB" = ( -/obj/structure/closet/secure_closet/medical1, +/obj/structure/chair/office, +/obj/effect/mob_spawn/ghost_role/human/black_mesa, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "VC" = ( @@ -9828,6 +11178,31 @@ /obj/machinery/chem_master, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"Wq" = ( +/obj/structure/rack/shelf, +/obj/item/storage/box/nri_survival_pack{ + name = "russian survival pack" + }, +/obj/item/knife/combat, +/obj/item/clothing/glasses/night, +/obj/item/clothing/suit/armor/vest/russian/nri{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/clothing/head/helmet/rus_helmet/nri{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/clothing/under/costume/nri{ + pixel_x = 7 + }, +/obj/item/clothing/shoes/combat, +/obj/item/storage/belt/military/nri, +/obj/item/clothing/gloves/tackler/combat/insulated, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/awaymission/black_mesa) "Wr" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/engine, @@ -9855,11 +11230,16 @@ /turf/open/floor/iron/freezer, /area/awaymission/black_mesa) "Wz" = ( -/obj/machinery/chem_mass_spec, -/obj/machinery/light/cold{ - dir = 8 +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 20 }, -/turf/open/floor/iron/dark, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = -9 + }, +/obj/structure/sign/poster/contraband/pwr_game{ + pixel_y = 31 + }, +/turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "WA" = ( /obj/structure/rack/shelf, @@ -9982,12 +11362,18 @@ /obj/effect/spawner/random/bioluminescent_plant, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) +"WY" = ( +/obj/structure/table, +/obj/item/storage/fancy/cigarettes/cigpack_uplift, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "WZ" = ( /obj/structure/fluff/tram_rail{ dir = 1 }, /obj/structure/fluff/tram_rail, /obj/effect/spawner/random/exotic/antag_gear_weak, +/obj/effect/spawner/random/exotic/antag_gear_weak, /turf/open/floor/plating, /area/awaymission/black_mesa) "Xa" = ( @@ -10090,6 +11476,22 @@ /mob/living/simple_animal/hostile/blackmesa/xen/headcrab, /turf/open/floor/mineral/titanium/white, /area/awaymission/black_mesa) +"Xw" = ( +/obj/structure/rack/shelf, +/obj/item/clothing/head/helmet/blueshirt/skyrat{ + pixel_x = -5; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/blueshirt{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/blueshirt/skyrat/guard{ + pixel_x = -5; + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Xx" = ( /obj/machinery/blackbox_recorder, /turf/open/floor/iron/textured_large, @@ -10114,6 +11516,7 @@ "XF" = ( /obj/structure/table, /obj/structure/alien/weeds/xen, +/obj/effect/spawner/random/exotic/technology, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) "XG" = ( @@ -10157,6 +11560,14 @@ }, /turf/open/misc/dirt/planet/xen, /area/awaymission/black_mesa/xen) +"XQ" = ( +/obj/machinery/door_timer{ + id = "Mesa 2"; + name = "Cell 2"; + pixel_x = -32 + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "XR" = ( /obj/structure/table, /obj/machinery/light/cold{ @@ -10200,6 +11611,12 @@ }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) +"XZ" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/spawner/random/contraband, +/obj/effect/spawner/random/contraband/permabrig_gear, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "Ya" = ( /obj/structure/rack/shelf, /obj/item/storage/medkit/advanced, @@ -10216,7 +11633,7 @@ /turf/closed/wall/r_wall, /area/awaymission/black_mesa) "Yh" = ( -/obj/machinery/medical_kiosk, +/obj/machinery/chem_heater, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Yi" = ( @@ -10276,6 +11693,14 @@ "Yr" = ( /turf/closed/wall/r_wall, /area/awaymission/black_mesa) +"Yt" = ( +/obj/structure/closet/crate/secure/weapon, +/obj/item/minespawner/explosive, +/obj/item/minespawner/explosive, +/obj/item/minespawner/explosive, +/obj/item/minespawner/explosive, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "Yx" = ( /obj/item/target, /turf/open/floor/engine, @@ -10308,23 +11733,20 @@ }, /turf/open/floor/iron/dark/textured_large, /area/awaymission/black_mesa) +"YE" = ( +/obj/structure/closet/crate/large, +/obj/item/ammo_box/a357, +/turf/open/floor/plating, +/area/awaymission/black_mesa) "YF" = ( /obj/structure/fluff/bus/passable{ icon_state = "topdoor" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_large{ icon_state = "bus" }, /area/awaymission/black_mesa) "YG" = ( -/obj/effect/bump_teleporter{ - id = "amsup"; - id_target = "amsdown" - }, -/obj/structure/railing{ - dir = 6 - }, /obj/structure/alien/weeds/xen, /turf/open/floor/mineral/titanium, /area/awaymission/black_mesa) @@ -10367,10 +11789,18 @@ /turf/open/floor/engine, /area/awaymission/black_mesa) "YU" = ( -/obj/structure/table, -/obj/item/stack/ore/bluespace_crystal, +/obj/machinery/chem_mass_spec, +/obj/machinery/light/cold{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) +"YW" = ( +/obj/structure/cable, +/obj/item/ammo_casing/spent, +/obj/item/ammo_casing/spent, +/turf/open/floor/iron, +/area/awaymission/black_mesa) "YZ" = ( /obj/structure/closet/crate/wooden, /obj/item/storage/medkit/regular, @@ -10382,6 +11812,10 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/xen) +"Zb" = ( +/obj/item/ammo_box/magazine/mp5, +/turf/open/misc/dirt/planet/xen, +/area/awaymission/black_mesa/xen) "Zc" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/hypospray/medipen/stimulants, @@ -10412,6 +11846,10 @@ }, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"Zi" = ( +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, +/turf/open/floor/iron/smooth_large, +/area/awaymission/black_mesa) "Zk" = ( /obj/item/storage/medkit/advanced, /turf/open/misc/xen, @@ -10569,8 +12007,11 @@ /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "ZU" = ( -/obj/machinery/destructive_scanner, -/turf/open/floor/iron/dark, +/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "ZV" = ( /obj/structure/lattice/catwalk, @@ -10585,6 +12026,10 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"ZY" = ( +/obj/machinery/chem_dispenser/fullupgrade, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) (1,1,1) = {" rz @@ -16903,10 +18348,10 @@ rz rz rz oE -AN +Fu GI Fu -AN +Fu oE rz rz @@ -17259,7 +18704,7 @@ rz rz rz rz -rz +QZ rz rz rz @@ -17515,7 +18960,7 @@ rz rz rz rz -rz +QZ rz rz rz @@ -17772,13 +19217,13 @@ rz rz rz rz +QZ rz rz rz +QZ rz -rz -rz -rz +QZ rz rz "} @@ -18029,10 +19474,10 @@ rz rz rz rz +QZ rz rz -rz -rz +QZ rz rz rz @@ -18287,8 +19732,8 @@ rz rz rz rz -rz -rz +QZ +QZ rz rz rz @@ -18801,7 +20246,7 @@ rz rz rz rz -rz +QZ rz rz rz @@ -19057,7 +20502,7 @@ rz rz rz rz -rz +QZ rz rz rz @@ -19314,13 +20759,13 @@ rz rz rz rz +QZ rz rz rz +QZ rz -rz -rz -rz +QZ rz rz "} @@ -19571,10 +21016,10 @@ rz rz rz rz +QZ rz rz -rz -rz +QZ rz rz rz @@ -19829,8 +21274,8 @@ rz rz rz rz -rz -rz +QZ +QZ rz rz rz @@ -20343,7 +21788,7 @@ rz rz rz rz -rz +QZ rz rz rz @@ -20599,7 +22044,7 @@ rz rz rz rz -rz +QZ rz rz rz @@ -20856,13 +22301,13 @@ rz rz rz rz +QZ rz rz rz +QZ rz -rz -rz -rz +QZ rz rz "} @@ -21113,10 +22558,10 @@ rz rz rz rz +QZ rz rz -rz -rz +QZ rz rz rz @@ -21371,8 +22816,8 @@ rz rz rz rz -rz -rz +QZ +QZ rz rz rz @@ -21890,7 +23335,7 @@ rz rz rz rz -rz +QZ rz rz "} @@ -21964,7 +23409,7 @@ rz oE Fu JU -iy +nk Fu Fu Fu @@ -22856,7 +24301,7 @@ Dx oE Fu xa -AN +Fu GI oE rz @@ -23370,7 +24815,7 @@ Dx Fu GI Fu -AN +Fu oE oE rz @@ -23796,7 +25241,7 @@ JA JA JA JA -JA +Is Is yh pz @@ -23881,7 +25326,7 @@ oE rz rz oE -AN +Fu GI Fu uM @@ -24053,7 +25498,7 @@ Fu Fu JA JA -JA +Rn Is MM AB @@ -24310,12 +25755,12 @@ Fu Fu JA JA -JA +gU Is MM AB LK -jy +gx ex rv rv @@ -24563,11 +26008,11 @@ JA JA JA Fu -WX +ou Fu Fu JA -JA +Is Is yh AB @@ -25599,7 +27044,7 @@ JA JA Eb yh -jy +ju ft TC zy @@ -25609,7 +27054,7 @@ XY yh yh WW -WW +mK MM Is JA @@ -28716,7 +30161,7 @@ Fu Fu Fu OW -BO +Zb md md md @@ -28977,7 +30422,7 @@ md md zs md -BO +Zb OW Fu Fu @@ -29042,7 +30487,7 @@ Fu Fu Fu Fu -QU +Fu Fu Fu Fu @@ -29064,7 +30509,7 @@ CY Fu Fu Fu -QU +Fu Fu Fu Fu @@ -29556,7 +31001,7 @@ Fu Fu Fu Fu -QU +Fu Fu Fu Fu @@ -29578,7 +31023,7 @@ CY Fu Fu Fu -QU +Fu Fu Fu Fu @@ -29994,7 +31439,7 @@ rz rz oE Vc -AN +Fu Fu Dx Dx @@ -30070,7 +31515,7 @@ Fu Fu Fu Fu -QU +Fu Fu Fu Fu @@ -30092,7 +31537,7 @@ CY Fu Fu Fu -QU +Fu Fu Fu Fu @@ -30252,7 +31697,7 @@ oE oE Vc Fu -Fu +lI Fu Dx oE @@ -30507,7 +31952,7 @@ rz rz oE LC -Fu +lI Uy uM Fu @@ -30582,11 +32027,11 @@ oE Dx Fu Fu -QU Fu -QU Fu -QU +Fu +Fu +Fu Fu CY CY @@ -30604,11 +32049,11 @@ Fu CY CY Fu -QU Fu -QU Fu -QU +Fu +Fu +Fu Fu Fu Fu @@ -30767,7 +32212,7 @@ yj Fu WX Fu -AN +Fu Fu oE rz @@ -30840,9 +32285,9 @@ Dx Fu Fu Fu +Fu QU -QU -QU +Fu Fu Fu CY @@ -30862,9 +32307,9 @@ Ix Ix Fu Fu +Fu QU -QU -QU +Fu Fu Fu Fu @@ -31021,8 +32466,8 @@ rz rz oE Vc -AN Fu +lI Uy Fu oE @@ -31098,7 +32543,7 @@ Fu Fu Fu Fu -QU +Fu Fu Fu Fu @@ -31120,7 +32565,7 @@ CY Fu Fu Fu -QU +Fu Fu Fu Fu @@ -31355,7 +32800,7 @@ Fu Fu Fu Fu -Fu +QU Fu Fu Fu @@ -31377,7 +32822,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -31869,7 +33314,7 @@ Fu Fu Fu Fu -Fu +QU Fu Fu Fu @@ -31891,7 +33336,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -32383,7 +33828,7 @@ Dx Fu Fu GI -Fu +QU Fu Fu SK @@ -32405,7 +33850,7 @@ Ix SK Fu Fu -Fu +QU Fu Cy Fu @@ -32897,7 +34342,7 @@ Fu Fu Fu Fu -Fu +QU Fu Fu Fu @@ -32919,7 +34364,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -33087,7 +34532,7 @@ No No Yr vC -vC +dQ wh No Yr @@ -33346,7 +34791,7 @@ Yr vC vC vC -vC +gB Yr No No @@ -33411,7 +34856,7 @@ Dx Fu Fu Fu -Fu +QU Fu Fu Fu @@ -33433,7 +34878,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -33925,7 +35370,7 @@ Dx Dx Fu Fu -Fu +QU Fu Fu SK @@ -33947,7 +35392,7 @@ CY SK Fu Fu -Fu +QU Fu Fu Fu @@ -34439,7 +35884,7 @@ Dx Dx Fu Fu -Fu +QU Fu Fu Fu @@ -34461,7 +35906,7 @@ Ix Fu Fu Fu -Fu +QU Fu Fu Fu @@ -34953,7 +36398,7 @@ Dx Dx Fu Fu -Fu +QU Fu Fu Fu @@ -34975,7 +36420,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -35467,7 +36912,7 @@ Dx Dx Fu Fu -GI +os Fu Fu Fu @@ -35489,7 +36934,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -35981,7 +37426,7 @@ Dx Fu Fu Fu -Fu +QU Fu Fu SK @@ -36003,7 +37448,7 @@ CY SK Fu Fu -Fu +QU Fu Fu Fu @@ -36495,7 +37940,7 @@ Dx Dx Fu Fu -Fu +QU Fu Fu Fu @@ -36517,7 +37962,7 @@ Ix Fu Fu Fu -GI +os Fu Fu Fu @@ -36927,8 +38372,9 @@ rz rz rz No -No Yr +Du +PV PV Yr No @@ -36938,7 +38384,6 @@ No No No No -No Yr TQ hP @@ -37009,7 +38454,7 @@ oE Dx Fu Fu -Fu +QU Fu Fu Fu @@ -37031,7 +38476,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -37183,10 +38628,11 @@ rz rz rz rz -rz No Yr PV +PV +Du Yr No rz @@ -37194,7 +38640,6 @@ rz rz rz rz -rz No Yr TQ @@ -37440,10 +38885,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -37451,7 +38897,6 @@ rz rz rz rz -rz No Yr TQ @@ -37460,7 +38905,7 @@ No No Yr Tp -bm +TU IU Cg Yr @@ -37523,7 +38968,7 @@ oE Dx Dx Fu -Fu +QU Fu Fu SK @@ -37545,7 +38990,7 @@ CY SK Fu Fu -Fu +QU Fu Fu Fu @@ -37697,10 +39142,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -37708,7 +39154,6 @@ rz rz rz rz -rz No Yr rO @@ -37954,10 +39399,11 @@ rz rz rz rz -rz No Yr +PV DX +Du Yr No rz @@ -37965,7 +39411,6 @@ rz rz rz rz -rz No Yr No @@ -38037,7 +39482,7 @@ rz oE Dx Fu -Fu +QU Fu Fu Fu @@ -38059,7 +39504,7 @@ Ix Fu Fu Fu -Fu +QU Fu Fu Fu @@ -38211,10 +39656,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -38222,7 +39668,6 @@ rz rz rz rz -rz No Yr No @@ -38264,10 +39709,10 @@ Yr Eq Yr No -rz -rz -rz -rz +BY +id +mx +EX rz rz rz @@ -38468,9 +39913,10 @@ rz rz rz rz -rz No Yr +Du +PV PV Yr No @@ -38479,7 +39925,6 @@ rz rz rz rz -rz No No No @@ -38521,28 +39966,28 @@ eE Ve Yr No -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz +No +No +HI +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No rz rz rz @@ -38551,7 +39996,7 @@ rz oE Dx Fu -Fu +QU Fu Fu Fu @@ -38573,7 +40018,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -38725,10 +40170,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -38762,7 +40208,6 @@ rz rz rz rz -rz No Yr KD @@ -38777,34 +40222,34 @@ KD eE Ve Yr +Yr +Yr +Yr +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +Yr No rz rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Fu Fu @@ -38982,10 +40427,11 @@ rz rz rz rz -rz No Yr PV +PV +DX Yr No rz @@ -39019,7 +40465,6 @@ rz rz rz rz -rz No Yr KD @@ -39034,38 +40479,38 @@ KD eE Ve Yr +Vq +LW +AQ +ON +Yr +xw +bi +Dy +bi +bi +bi +Yr +AY +ST +kS +AY +ov +kS +AY +qv +kS +Yr No rz rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Dx Fu -Fu +QU Fu Fu Fu @@ -39087,7 +40532,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -39239,10 +40684,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -39276,7 +40722,6 @@ rz rz rz rz -rz No Yr KD @@ -39291,34 +40736,34 @@ KD eE Ve Yr +Qs +LW +AY +JI +Yr +tu +LW +LW +LW +LW +LW +Yr +Ox +LW +kS +Ox +LW +kS +Ox +LW +kS +Yr No rz rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Dx Fu @@ -39496,9 +40941,10 @@ rz rz rz rz -rz No Yr +DX +PV PV Yr No @@ -39533,7 +40979,6 @@ rz rz rz rz -rz No Yr KD @@ -39548,38 +40993,38 @@ KD eE Ve Yr +ck +LW +rU +lP +Yr +kS +kS +kS +Rm +kS +kS +Yr +kS +nO +mA +kS +vE +mA +kS +oe +mA +Yr No rz rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Dx Fu -Fu +QU Fu Fu SK @@ -39601,7 +41046,7 @@ CY SK Fu Fu -Fu +QU Fu Fu Fu @@ -39672,6 +41117,14 @@ ak ak ak ak +ak +ak +ak +jy +ak +ak +ak +ak kg ak ak @@ -39679,14 +41132,6 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak No No rz @@ -39753,10 +41198,11 @@ rz rz rz rz -rz No Yr +Du PV +Du Yr No rz @@ -39790,7 +41236,6 @@ rz rz rz rz -rz No Yr KD @@ -39805,34 +41250,34 @@ KD eE Ve Yr +iP +LW +LW +Rx +Vd +qx +LW +LW +Rx +LW +LW +Aa +Rx +bf +xQ +Rx +QG +XQ +Tz +Ed +yq +Yr No rz rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Dx Dx @@ -39918,17 +41363,17 @@ No ak ak ak -ba +Wj ba ba ba EA et ba +ba +ba Wj ba -ba -ba ak ba et @@ -40010,10 +41455,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -40047,7 +41493,6 @@ rz rz rz rz -rz No Yr KD @@ -40062,38 +41507,38 @@ KD eE Ve Yr +dy +LW +LW +Rx +Vm +LW +LW +Rx +Rx +Rx +Rx +kS +uZ +Rx +Rx +Rx +Rx +Rx +Rx +Rx +qZ +Yr No rz rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE oE Dx -Fu +QU Fu Fu Fu @@ -40115,7 +41560,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -40188,6 +41633,8 @@ ba ba ba ba +ba +ba Wj ba ba @@ -40195,9 +41642,7 @@ ba ba ba ba -ba -ba -ba +Wj ba ba ak @@ -40267,10 +41712,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -40304,7 +41750,6 @@ rz rz rz rz -rz No Yr KD @@ -40319,6 +41764,28 @@ KD eE Ve Yr +iq +LW +LW +Rx +DF +LW +Ed +Rx +LW +LW +LW +Aa +Rx +Ed +QH +YW +LW +fp +Rx +LW +sj +Yr No rz rz @@ -40326,28 +41793,6 @@ rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Dx Fu @@ -40435,8 +41880,8 @@ ba ba ba ba +Wj ba -WB ba ba ba @@ -40524,10 +41969,11 @@ rz rz rz rz -rz No Yr PV +Du +PV Yr No rz @@ -40561,7 +42007,6 @@ rz rz rz rz -rz No Yr KD @@ -40576,29 +42021,29 @@ KD eE Ve Yr +qx +LW +Ed +Rx +Vd +LW +LW +Rx +LW +QG +LW +Yr +kS +aT +mA +kS +Vg +mA +kS +Rw +mA +Yr No -No -No -No -No -No -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz rz rz rz @@ -40607,7 +42052,7 @@ rz rz oE Fu -Fu +QU Fu Fu Fu @@ -40629,7 +42074,7 @@ CY Fu Fu Fu -Fu +QU Fu Fu Fu @@ -40781,10 +42226,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -40818,7 +42264,6 @@ rz rz rz rz -rz No Yr KD @@ -40831,12 +42276,29 @@ KD KD KD eE -Ve -Yr -Yr -Yr +fZ Yr +LW +LW +LW +kS +av +av +av +kS +LW +LW +LW Yr +eu +LW +kS +eu +LW +kS +eu +LW +kS Yr No rz @@ -40845,23 +42307,6 @@ rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Fu GI @@ -40953,14 +42398,14 @@ ak ak ak ak +ak +ak +ak +ak +ak +ak +ak kg -ak -ak -ak -ak -ak -ak -ak FQ ak ak @@ -41038,10 +42483,11 @@ rz rz rz rz -rz No Yr -Du +PV +NL +PV Yr No rz @@ -41075,7 +42521,6 @@ rz rz rz rz -rz No Ja KD @@ -41089,11 +42534,28 @@ wa wa cC Ve +Aa +Rx +Rx +Rx +kS +xq +ml +go +kS +LW +LW +LW Yr -jS -vC -No -No +AY +XZ +kS +AY +Je +kS +AY +XZ +kS Yr No rz @@ -41102,26 +42564,9 @@ rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE oE -Fu +QU Fu Fu SK @@ -41143,7 +42588,7 @@ Ix SK Fu Fu -Fu +QU Fu Fu Dx @@ -41215,17 +42660,17 @@ ak ak ak ak +ak +ak +ak +ak +ak +ak +ak kg ak ak ak -ak -ak -ak -ak -ak -ak -ak ba ba ba @@ -41234,7 +42679,7 @@ ba ba ba nz -ba +vr ba ba ba @@ -41295,10 +42740,11 @@ rz rz rz rz -rz No Yr +PV DX +PV Yr No rz @@ -41332,7 +42778,6 @@ rz rz rz rz -rz No Yr WU @@ -41346,11 +42791,28 @@ TJ TJ Ve Ve -hT -oZ -wh -vC -No +Vd +Rx +LW +bf +nZ +CX +JV +QE +jQ +Gg +HJ +iF +Yr +Yr +Yr +Yr +Yr +Yr +av +av +av +av Yr No rz @@ -41360,23 +42822,6 @@ rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Fu Fu @@ -41552,10 +42997,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -41589,7 +43035,6 @@ rz rz rz rz -rz No Yr KD @@ -41603,11 +43048,28 @@ TJ TJ nS Ve -Ve -KK -Cb -No -No +Aa +QG +LW +LW +Vd +Hw +IJ +qh +kS +LW +xd +LW +Yr +rK +Om +ND +Om +kV +Om +kS +Gw +GH Yr No rz @@ -41617,23 +43079,6 @@ rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Fu Fu @@ -41809,10 +43254,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -41846,7 +43292,6 @@ rz rz rz rz -rz No Yr KD @@ -41861,34 +43306,34 @@ Od yT Ve Yr -vC -No -No -No +LW +bf +LW +Vd +av +av +av +kS +LW +RU +RX +Yr +LW +LW +El +LW +El +LW +kS +oF +KQ Yr No -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz +No +No +No +No +No rz rz oE @@ -42066,9 +43511,10 @@ rz rz rz rz -rz No Yr +Du +PV PV Yr No @@ -42103,7 +43549,6 @@ rz rz rz rz -rz No Yr KD @@ -42116,38 +43561,38 @@ KD KD KD eE -Ve -Yr -Yr -Yr +fZ Yr +gA +LW +LW +LW +Vd +LW +LW +Rx +RX +LW +LW Yr +qx +LW +Ed +LW +KQ +LW +kS +pS +wD Yr +Hl +Hl +Hl +Hl +Hl No rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE oE Fu @@ -42284,7 +43729,7 @@ dk cI LL Oq -UK +ap Xq cj cj @@ -42323,10 +43768,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -42360,7 +43806,6 @@ rz rz rz rz -rz No Yr KD @@ -42375,34 +43820,34 @@ KD eE Ve Yr +EY +LW +bf +LW +jn +LW +LW +Rx +bf +LW +bf +Aa +cq +LW +bf +FB +bf +zU +Ol +qE +cq +Yr +Hl +Wq +Jc +bt +Hl No -No -No -No -No -No -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz rz rz rz @@ -42539,7 +43984,7 @@ lD dk Gd zR -FB +UK UK QQ UK @@ -42580,10 +44025,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -42617,7 +44063,6 @@ rz rz rz rz -rz No Yr KD @@ -42632,37 +44077,37 @@ KD eE Ve Yr +bf +we +HJ +HJ +gm +Gn +bf +Rx +Rx +Rx +Rx +kS +jf +Tz +Rx +Rx +Rx +Rx +Tw +uq +LW +FG +CR +Jk +um +Fm +Hl No rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Fu Fu @@ -42837,10 +44282,11 @@ rz rz rz rz -rz No Yr PV +PV +Du Yr No rz @@ -42874,7 +44320,6 @@ rz rz rz rz -rz No Yr KD @@ -42889,37 +44334,37 @@ KD eE Ve Yr +Ez +vt +fb +Ez +Vd +ky +cF +HJ +JX +Ed +LW +Aa +LW +QG +bf +KQ +TD +HJ +dp +HJ +Pv +Yr +Hl +Hl +Hl +Hl +Hl No rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Fu Fu @@ -43094,10 +44539,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -43131,7 +44577,6 @@ rz rz rz rz -rz No Yr KD @@ -43146,34 +44591,34 @@ KD eE Ve Yr +kb +JM +EO +aW +av +AH +AQ +AQ +AQ +bf +bf +Yr +qx +LW +Ed +bf +zU +LW +kS +ww +hV +Yr +No +No +No +No +No No -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz rz rz rz @@ -43351,10 +44796,11 @@ rz rz rz rz -rz No Yr +Du PV +DX Yr No rz @@ -43388,7 +44834,6 @@ rz rz rz rz -rz No Yr KD @@ -43403,6 +44848,28 @@ KD eE Ve Yr +PR +GU +GU +GU +av +Ej +hh +iQ +WY +LW +LW +Yr +LW +cq +El +LW +El +LW +kS +Xw +KQ +Yr No rz rz @@ -43413,28 +44880,6 @@ rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Fu Fu @@ -43608,10 +45053,11 @@ rz rz rz rz -rz No Yr PV +PV +PV Yr No rz @@ -43645,7 +45091,6 @@ rz rz rz rz -rz No Yr KD @@ -43660,6 +45105,28 @@ KD eE rO Yr +Qf +MY +lh +vF +av +rU +rU +jA +rU +LW +wd +Yr +BI +Om +of +Om +Ck +Om +kS +GS +LW +Yr No rz rz @@ -43670,28 +45137,6 @@ rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE Fu Fu @@ -43866,9 +45311,10 @@ No No No No -No Yr PV +PV +PV Yr No rz @@ -43902,7 +45348,6 @@ rz rz rz rz -rz No Yr KD @@ -43917,6 +45362,28 @@ KD Vs fj Yr +Yr +Yr +Yr +Yr +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +Yr +Yr +Yr No rz rz @@ -43927,28 +45394,6 @@ rz rz rz rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz oE oE Fu @@ -44062,7 +45507,7 @@ ak ca ec AX -UK +rg UK uk cj @@ -44124,8 +45569,9 @@ Yr Yr Yr Yr -Yr +PV oh +PV Yr No rz @@ -44159,7 +45605,6 @@ rz rz rz rz -rz No Yr KD @@ -44175,28 +45620,28 @@ Tm fj Yr No -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz -rz +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No +No rz rz rz @@ -44337,7 +45782,7 @@ ba iv ba Mu -ak +TP TP TP ak @@ -44380,10 +45825,11 @@ PV PV BX DX +uw +PV +Du PV Yr -Du -Yr No rz rz @@ -44416,7 +45862,6 @@ rz rz rz rz -rz No Yr Yr @@ -44576,7 +46021,7 @@ ak ca ec AX -UK +rg UK sy cj @@ -44637,8 +46082,9 @@ XA PV PV PV +Nj +PV PV -ni PV Yr No @@ -44673,7 +46119,6 @@ rz rz rz rz -rz No Yr KD @@ -44898,6 +46343,7 @@ Yr Yr Yr Yr +Yr No rz rz @@ -44930,7 +46376,6 @@ rz rz rz rz -rz No Yr KD @@ -45109,7 +46554,7 @@ iv nz dk IS -rg +hw UK Zy Al @@ -45156,7 +46601,7 @@ No No No No -rz +No rz rz rz @@ -45365,10 +46810,10 @@ jG iv IY sV -bR -KG -UI -PB +UK +UK +UK +UK Ji cj ak @@ -45621,11 +47066,11 @@ Fq jG iv Qu -dC -mf -FB -mx -PB +sV +UK +UK +LL +UK QI cj ak @@ -45877,13 +47322,13 @@ Fq Fq Hf ak -nz +PC dk yz -Lv -Lv -mf -SN +UK +UK +UK +UK cj ak ak @@ -46134,16 +47579,16 @@ kN Cr Yr ak -nz +PC dk Fk LV Qi Ul -TU +Yt cj ak -No +ak No rz rz @@ -46174,7 +47619,7 @@ rz rz No Yr -Du +YE PV Yr No @@ -46391,7 +47836,7 @@ UL kN ts ak -lD +Ec dk dk dk @@ -46400,6 +47845,7 @@ cj cj cj ak +ak No rz rz @@ -46410,7 +47856,6 @@ rz rz rz rz -rz No No Yr @@ -46648,20 +48093,20 @@ UL DJ ts ak -QC -vm -If -If -If -If +yb +ia +xu +xu +xu +xu vm ak ak +ak No rz rz rz -rz No No No @@ -46910,6 +48355,7 @@ ak ak ak ak +EK ak ak ak @@ -46918,7 +48364,6 @@ No rz rz rz -rz No Yr Yr @@ -47166,13 +48611,13 @@ ts Yr ak ak -ak +Gz +Gz +Gz ak ak ak No -No -rz rz rz rz @@ -47424,6 +48869,8 @@ Yr Yr ak ak +Dc +ak ak ak No @@ -47431,8 +48878,6 @@ No rz rz rz -rz -rz No Yr Gm @@ -47680,12 +49125,12 @@ kN kH Yr Yr -ak -ak +Gz +Gz +Gz ak No -rz -rz +No rz rz rz @@ -47763,7 +49208,7 @@ Yr KD KD Xa -pX +qu nj sf Xa @@ -47938,10 +49383,10 @@ kN kN Yr Yr +ak +ak +ak No -No -No -rz rz rz rz @@ -48196,9 +49641,9 @@ kN kH Yr No -rz -rz -rz +No +No +No rz rz rz @@ -49265,7 +50710,7 @@ kN kN kN kN -FV +kN mR Yr No @@ -50029,13 +51474,13 @@ Yr No Yr nf -op +kN DD DD kN kN kN -kN +Lv kN kN kN @@ -50286,8 +51731,8 @@ Yr No Yr zX -No -No +xR +Av kN qK kN @@ -50522,7 +51967,7 @@ No Yr EF OD -Jn +FV ts kN fX @@ -51843,7 +53288,7 @@ kN kN zb kN -eT +Bx Yr No No @@ -52403,7 +53848,7 @@ rz No Yr kN -kN +BE Xj Sh Yr @@ -52503,14 +53948,14 @@ rz No ak ak -ak +jy ak ak ba ba ak ak -ak +jy No rz No @@ -53024,7 +54469,7 @@ ba ba ba ak -hv +ak No rz No @@ -53273,7 +54718,7 @@ rz No ak ak -hv +ak ak ak ak @@ -53352,7 +54797,7 @@ No Yr kN kN -eT +MZ Cz Yr Yr @@ -53361,8 +54806,8 @@ No rz No Yr -ED -ED +nH +Iq kH kN kN @@ -53618,7 +55063,7 @@ No rz No Yr -ED +Iq kN kN kN @@ -53628,7 +55073,7 @@ kN kN kN ED -ED +Iq ED ED Yr @@ -55604,7 +57049,7 @@ fj fj gw HS -HS +NR HS fj fj @@ -55842,10 +57287,10 @@ rz No ak ak -ak -ak -ak -ak +bR +bR +bR +ni ak ak ba @@ -55859,9 +57304,9 @@ fj fj fj HS -HS +Mi JT -HS +Or yr HS fj @@ -56117,9 +57562,9 @@ fj fj oO ak -ak -ak -HS +ML +PB +Mi HS fj fj @@ -56356,9 +57801,9 @@ rz rz No Yr -Jn +dC TI -Ve +mf zj Yr TQ @@ -56373,10 +57818,10 @@ fj fj fj oO -ak +MF es -ak -ak +QC +Rp ak fj fj @@ -56613,8 +58058,8 @@ rz rz No Yr -TQ -TQ +hv +iy GB TQ Yr @@ -58207,7 +59652,7 @@ fj Yr kN aM -zg +Zi Yr kN kN @@ -58472,7 +59917,7 @@ kN Yr fj Yr -EP +RZ Nd il Yr @@ -59936,12 +61381,12 @@ No Yr ak Hb -nA +VY Wn bj ak Hb -mz +ZD Wn bj ak @@ -60193,12 +61638,12 @@ No Yr ak Hb -nA +VY ow YD ak Hb -mz +ZD ow YD ak @@ -60562,10 +62007,10 @@ Yr Jv nM Yr -cS +YG ny cS -cS +lW Yr UL ln @@ -60707,12 +62152,12 @@ No Yr ak Hb -nA +VY Wn YD ak Hb -nA +VY Wn YD ak @@ -60819,10 +62264,10 @@ Yr Jv BM GX -vl -cS -cS +YG +YG cS +lW Yr UL UL @@ -60974,7 +62419,7 @@ YF UE ak Hb -mz +ZD Wn bj ak @@ -61077,9 +62522,9 @@ Jv BM nM YG +YG cS -cS -cS +lW Yr nM nM @@ -61231,7 +62676,7 @@ DT ho ak Hb -mz +ZD ow YD Ek @@ -61333,10 +62778,10 @@ Yr Jv nM Yr +YG cS cS -cS -cS +lW Yr nM Dj @@ -61745,7 +63190,7 @@ eH eH ak Hb -mz +ZD Wn YD ak @@ -61838,7 +63283,7 @@ kN lV lV Yr -kN +Gl WK Yr No @@ -62610,9 +64055,9 @@ fj fj No No -No -No -No +rz +rz +rz No No No @@ -62866,10 +64311,10 @@ fj fj fj No -No -No -No -No +rz +rz +rz +rz rz rz rz @@ -63123,10 +64568,10 @@ fj fj fj No -No -No -No -No +rz +rz +rz +rz rz rz rz @@ -63380,10 +64825,10 @@ No No No No -No -No -No -No +rz +rz +rz +rz rz rz rz @@ -63657,7 +65102,7 @@ rz rz No Yr -mK +qY nM nM jV @@ -63702,7 +65147,7 @@ wF ts lZ lZ -Jq +XF Yr No rz @@ -63959,7 +65404,7 @@ wF ts lZ Ij -Jq +XF Yr No rz @@ -64121,8 +65566,8 @@ rz No Yr PV -Du -Du +NL +NL PV Du Du @@ -64216,7 +65661,7 @@ wF ts lZ wS -Jq +XF Yr No rz @@ -66630,9 +68075,9 @@ rz rz No Yr -aJ -aJ -aJ +UT +UT +UT Yr No rz @@ -66902,10 +68347,10 @@ rz rz Yr yw -UL +AN Nv -UL -UL +KG +Ln LZ lJ lJ @@ -67004,7 +68449,7 @@ Yr cS ny cS -cS +kL Yr No rz @@ -67159,10 +68604,10 @@ rz rz Yr NB -UL -UL -UL -UL +Fr +FM +Fr +Mc qF TQ TQ @@ -67258,10 +68703,10 @@ BF nM BM GX -Mi cS cS cS +kL Yr No rz @@ -67430,7 +68875,7 @@ PE Vh TG Ya -UL +TG Qd Yr iJ @@ -67515,10 +68960,10 @@ nM nM BM nM -FM cS cS cS +kL Yr No rz @@ -67775,7 +69220,7 @@ Yr cS cS cS -cS +kL Yr No rz @@ -68499,7 +69944,7 @@ jE Yr NQ Ve -OR +tL ZV ZV ZV @@ -69280,9 +70725,9 @@ lJ SU Yr No -rz -rz -rz +No +No +No No Yr YA @@ -69498,9 +70943,9 @@ KV Yn TQ Yr -TQ -UL -TQ +UI +ly +UI Yr No rz @@ -69536,10 +70981,10 @@ Yr Yr Yr Yr +Yr +Yr +Yr No -rz -rz -rz No Yr UK @@ -69588,7 +71033,7 @@ Yr Iy lZ ph -Ub +XF lZ Ly ts @@ -69755,9 +71200,9 @@ KV HN TQ Yr -TQ -UL -TQ +Wz +Rb +Pp Yr No rz @@ -69786,17 +71231,17 @@ Ve Ve cU Yr -Vi -Ln -Wz +VB +UK +Yr Yh NJ YU +Kp +Bt +KZ Yr No -rz -rz -rz No Yr VA @@ -70012,9 +71457,9 @@ KV Yn TQ Yr -TQ -UL -TQ +ZU +SI +fc Yr No rz @@ -70044,16 +71489,16 @@ Ve Pm Yr Vk -Mc +UK +Yr +ZY +Td TQ TQ TQ -ZU +OF Yr No -rz -rz -rz No Yr UK @@ -70102,7 +71547,7 @@ Yr oB lZ ph -Ub +XF AE OU ts @@ -70271,7 +71716,7 @@ TQ Yr TQ UL -TQ +Ht Yr No rz @@ -70300,17 +71745,17 @@ ID Ve Pm Yr -Vr +VB bw -TQ -TQ +Yr +xI Ff -Fr +TQ +TQ +TQ +lU Yr No -rz -rz -rz No Yr QT @@ -70558,16 +72003,16 @@ Ve OT Yr Vv +UK +aH +UK TQ TQ TQ TQ -NR +wJ Yr No -rz -rz -rz No Yr UK @@ -70815,16 +72260,16 @@ Ve Yr Yr VB -MF -ML UK +Yr +TY UK Jr +Fy +Ah +yi Yr No -rz -rz -rz No Yr zH @@ -71072,16 +72517,16 @@ Ve PX Yr Yr -ts +pr +Yr +Yr +op +Yr +Yr Yr -ts -Rp Yr Yr No -rz -rz -rz No Yr Sw @@ -71328,17 +72773,17 @@ Ve Ve Ve Te -Su +kQ Ve Te +uW Ve -Ve -Or +TQ Yr No -rz -rz -rz +No +No +No No Yr QT @@ -71354,7 +72799,7 @@ Pr PF QW PF -QW +PF RT Sb LR @@ -71373,7 +72818,7 @@ Hl rW dK dK -ge +SN sP sP bP @@ -74340,9 +75785,9 @@ rz rz No Yr -aJ -aJ -aJ +UT +UT +UT Yr No rz diff --git a/_maps/RandomZLevels/wildwest_skyrat.dmm b/_maps/RandomZLevels/wildwest_skyrat.dmm index 9c205bc225b..18c979104df 100644 --- a/_maps/RandomZLevels/wildwest_skyrat.dmm +++ b/_maps/RandomZLevels/wildwest_skyrat.dmm @@ -628,7 +628,7 @@ /turf/open/floor/iron/cafeteria, /area/awaymission/wildwest/mines) "ee" = ( -/obj/item/ammo_box/magazine/m16, +/obj/item/ammo_box/magazine/m16/vintage, /turf/open/misc/ironsand, /area/awaymission/wildwest/vault) "ej" = ( @@ -3158,7 +3158,7 @@ /area/awaymission/wildwest/vault) "Sg" = ( /obj/structure/closet/crate, -/obj/item/ammo_box/magazine/m16, +/obj/item/ammo_box/magazine/m16/vintage, /turf/open/floor/iron, /area/awaymission/wildwest/refine) "Sj" = ( diff --git a/modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi b/modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi index 309cfdcb4a3..5a5b0ab23a3 100644 Binary files a/modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi and b/modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi differ diff --git a/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi b/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi index 1696627b815..65a755df784 100644 Binary files a/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi and b/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi differ diff --git a/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_digi.dmi b/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_digi.dmi index e0d79be3703..c3c07858d54 100644 Binary files a/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_digi.dmi and b/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_digi.dmi differ diff --git a/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_muzzled.dmi b/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_muzzled.dmi index 7f6dcdaa6ec..44777a8e546 100644 Binary files a/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_muzzled.dmi and b/modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_muzzled.dmi differ diff --git a/modular_skyrat/modules/black_mesa/code/armaments/__armament_bodyarmor.dm b/modular_skyrat/modules/black_mesa/code/armaments/__armament_bodyarmor.dm index 444d31741c1..81dfde90d4a 100644 --- a/modular_skyrat/modules/black_mesa/code/armaments/__armament_bodyarmor.dm +++ b/modular_skyrat/modules/black_mesa/code/armaments/__armament_bodyarmor.dm @@ -22,7 +22,7 @@ description = "Contains a set of two hazardous environment armor pieces. This armor gives you a robust all-around protection, as well as mild regeneration." item_type = /obj/item/storage/box/armor_set/pcv max_purchase = 4 - cost = 18 + cost = 20 /obj/item/storage/box/armor_set name = "box of armor" @@ -41,16 +41,16 @@ desc = "Box containing a basic armor vest and helmet." /obj/item/storage/box/armor_set/normal/PopulateContents() - new /obj/item/clothing/suit/armor/vest/security(src) - new /obj/item/clothing/head/helmet/sec(src) + new /obj/item/clothing/suit/armor/vest/hecu(src) + new /obj/item/clothing/head/helmet/hecu(src) /obj/item/storage/box/armor_set/bulletproof name = "bulletproof armor set" desc = "Box containing a bulletproof armor vest and helmet." /obj/item/storage/box/armor_set/bulletproof/PopulateContents() - new /obj/item/clothing/suit/armor/bulletproof(src) - new /obj/item/clothing/head/helmet/alt(src) + new /obj/item/clothing/suit/armor/bulletproof/hecu(src) + new /obj/item/clothing/head/helmet/alt/hecu(src) /obj/item/storage/box/armor_set/pcv name = "PCV Mk. II armor set" diff --git a/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm b/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm index 58736e8a053..e268e677334 100644 --- a/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm +++ b/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm @@ -17,8 +17,8 @@ /datum/armament_entry/hecu/primary/submachinegun/mp5 item_type = /obj/item/gun/ballistic/automatic/mp5 - max_purchase = 4 - cost = 7 + max_purchase = 2 + cost = 10 /datum/armament_entry/hecu/primary/assaultrifle subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE @@ -27,8 +27,8 @@ /datum/armament_entry/hecu/primary/assaultrifle/m16 item_type = /obj/item/gun/ballistic/automatic/m16 max_purchase = 1 - cost = 12 - magazine = /obj/item/ammo_box/magazine/m16/extended + cost = 14 + magazine = /obj/item/ammo_box/magazine/m16 /datum/armament_entry/hecu/primary/shotgun subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN @@ -55,7 +55,15 @@ /datum/armament_entry/hecu/primary/special/sniper_rifle item_type = /obj/item/gun/ballistic/automatic/cfa_rifle max_purchase = 1 - cost = 15 + cost = 18 + +/datum/armament_entry/hecu/primary/special/hmg + item_type = /obj/item/mounted_machine_gun_folded + max_purchase = 1 + cost = 22 + magazine = /obj/item/ammo_box/magazine/mmg_box + mags_to_spawn = 1 + magazine_cost = 2 /obj/item/storage/box/ammo_box/shotgun_12g diff --git a/modular_skyrat/modules/black_mesa/code/armaments/_armaments_secondary.dm b/modular_skyrat/modules/black_mesa/code/armaments/_armaments_secondary.dm index 57d9c657cd2..52d8d6d3cca 100644 --- a/modular_skyrat/modules/black_mesa/code/armaments/_armaments_secondary.dm +++ b/modular_skyrat/modules/black_mesa/code/armaments/_armaments_secondary.dm @@ -17,7 +17,21 @@ max_purchase = 4 mags_to_spawn = 3 -/datum/armament_entry/hecu/secondary/pistol/deagle - item_type = /obj/item/gun/ballistic/automatic/pistol/deagle - max_purchase = 1 - cost = 9 +/datum/armament_entry/hecu/secondary/pistol/revolver + item_type = /obj/item/gun/ballistic/revolver/detective + max_purchase = 4 + cost = 3 + mags_to_spawn = 0 + magazine = /obj/item/storage/box/ammo_box/revolver + magazine_cost = 4 + +/obj/item/storage/box/ammo_box/revolver + +/obj/item/storage/box/ammo_box/revolver/PopulateContents() + new /obj/item/ammo_box/c38(src) + new /obj/item/ammo_box/c38(src) + new /obj/item/ammo_box/c38(src) + new /obj/item/ammo_box/c38(src) + new /obj/item/ammo_box/c38/dumdum(src) + new /obj/item/ammo_box/c38/dumdum(src) + new /obj/item/ammo_box/c38/match(src) diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_explosives.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_explosives.dm index 49b75762575..310beb26f59 100644 --- a/modular_skyrat/modules/black_mesa/code/armaments/armament_explosives.dm +++ b/modular_skyrat/modules/black_mesa/code/armaments/armament_explosives.dm @@ -1,6 +1,6 @@ /datum/armament_entry/hecu/explosives category = ARMAMENT_CATEGORY_EXPLOSIVES - category_item_limit = 16 + category_item_limit = 8 /datum/armament_entry/hecu/explosives/frag item_type = /obj/item/grenade/frag diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_medical.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_medical.dm index 5c106532baf..08e11fd9572 100644 --- a/modular_skyrat/modules/black_mesa/code/armaments/armament_medical.dm +++ b/modular_skyrat/modules/black_mesa/code/armaments/armament_medical.dm @@ -23,7 +23,7 @@ /datum/armament_entry/hecu/medical/medkit/toxin item_type = /obj/item/storage/medkit/toxin max_purchase = 1 - cost = 3 + cost = 2 /datum/armament_entry/hecu/medical/medkit/fire item_type = /obj/item/storage/medkit/fire @@ -33,7 +33,12 @@ /datum/armament_entry/hecu/medical/medkit/o2 item_type = /obj/item/storage/medkit/o2 max_purchase = 1 - cost = 3 + cost = 2 + +/datum/armament_entry/hecu/medical/medkit/advanced + item_type = /obj/item/storage/medkit/advanced + max_purchase = 1 + cost = 4 /datum/armament_entry/hecu/medical/medkit/expeditionary item_type = /obj/item/storage/medkit/expeditionary @@ -63,17 +68,12 @@ max_purchase = 4 cost = 1 -/datum/armament_entry/hecu/medical/injector/oxandrolone - item_type = /obj/item/reagent_containers/hypospray/medipen/oxandrolone - max_purchase = 4 - cost = 1 - /datum/armament_entry/hecu/medical/injector/stimulant item_type = /obj/item/reagent_containers/hypospray/medipen/stimulants - max_purchase = 4 - cost = 1 + max_purchase = 2 + cost = 4 /datum/armament_entry/hecu/medical/injector/bag item_type = /obj/item/storage/bag/medpens max_purchase = 2 - cost = 4 + cost = 5 diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_melee.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_melee.dm index ae8caacef87..383950b3aef 100644 --- a/modular_skyrat/modules/black_mesa/code/armaments/armament_melee.dm +++ b/modular_skyrat/modules/black_mesa/code/armaments/armament_melee.dm @@ -20,4 +20,4 @@ /datum/armament_entry/hecu/melee/nonlethal/kravmaga item_type = /obj/item/clothing/gloves/krav_maga/combatglovesplus - cost = 12 + cost = 10 diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm index a57e99d7ae9..fbfa865aa6b 100644 --- a/modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm +++ b/modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm @@ -5,7 +5,7 @@ /datum/armament_entry/hecu/utility/survival_pack item_type = /obj/item/storage/box/nri_survival_pack max_purchase = 4 - cost = 4 + cost = 3 /datum/armament_entry/hecu/utility/pouch item_type = /obj/item/storage/bag/ammo @@ -20,34 +20,39 @@ /datum/armament_entry/hecu/utility/basic_tools item_type = /obj/item/storage/toolbox/mechanical max_purchase = 2 - cost = 2 + cost = 1 /datum/armament_entry/hecu/utility/advanced_tools name = "Powertoolbelt" description = "Tool belt full of power-ful tools." item_type = /obj/item/storage/belt/utility/full/powertools max_purchase = 1 - cost = 5 + cost = 4 + +/datum/armament_entry/hecu/utility/light_device + item_type = /obj/item/construction/rld/mini + max_purchase = 2 + cost = 3 /datum/armament_entry/hecu/utility/compact_shield item_type = /obj/item/shield/riot/tele max_purchase = 1 - cost = 10 + cost = 5 /datum/armament_entry/hecu/utility/flash_shield item_type = /obj/item/shield/riot/flash max_purchase = 1 - cost = 15 + cost = 10 /datum/armament_entry/hecu/utility/combat_shield item_type = /obj/item/shield/riot/pointman/hecu max_purchase = 1 - cost = 25 + cost = 20 /datum/armament_entry/hecu/utility/zipties item_type = /obj/item/storage/box/zipties - max_purchase = 1 - cost = 3 + max_purchase = 2 + cost = 1 /datum/armament_entry/hecu/utility/jammer name = "Radio Jammer" @@ -59,7 +64,7 @@ /datum/armament_entry/hecu/utility/suppressor item_type = /obj/item/suppressor max_purchase = 4 - cost = 4 + cost = 2 /datum/armament_entry/hecu/utility/bowman item_type = /obj/item/radio/headset/headset_faction/bowman diff --git a/modular_skyrat/modules/black_mesa/code/armor.dm b/modular_skyrat/modules/black_mesa/code/armor.dm new file mode 100644 index 00000000000..ddbdbb8acdf --- /dev/null +++ b/modular_skyrat/modules/black_mesa/code/armor.dm @@ -0,0 +1,110 @@ +/obj/item/clothing/suit/armor/vest/hecu + name = "plate carrier system" + desc = "A modular armor vest with inserted plates and armor elements that provide decent protection against most types of damage. Despite its modularity, however, you can't remove any of its pieces." + icon_state = "combat_vest" + inhand_icon_state = "armoralt" + blood_overlay_type = "armor" + icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi' + worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi' + worn_icon_digi = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_digi.dmi' + uses_advanced_reskins = TRUE + unique_reskin = list( + "Basic" = list( + RESKIN_ICON_STATE = "combat_vest", + RESKIN_WORN_ICON_STATE = "combat_vest" + ), + "Corpsman" = list( + RESKIN_ICON_STATE = "combat_vest_medic", + RESKIN_WORN_ICON_STATE = "combat_vest_medic" + ), + "Basic Black" = list( + RESKIN_ICON_STATE = "combat_vest_black", + RESKIN_WORN_ICON_STATE = "combat_vest_black" + ), + "Corpsman Black" = list( + RESKIN_ICON_STATE = "combat_vest_medic_black", + RESKIN_WORN_ICON_STATE = "combat_vest_medic_black" + ), + ) + +/obj/item/clothing/head/helmet/hecu + name = "combat helmet" + desc = "A (previously) common helmet design meant to protect its user's head from impacts." + icon_state = "combat_helmet" + icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi' + worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi' + worn_icon_digi = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_muzzled.dmi' + uses_advanced_reskins = TRUE + unique_reskin = list( + "Basic" = list( + RESKIN_ICON_STATE = "combat_helmet", + RESKIN_WORN_ICON_STATE = "combat_helmet" + ), + "Corpsman" = list( + RESKIN_ICON_STATE = "combat_helmet_medic", + RESKIN_WORN_ICON_STATE = "combat_helmet_medic" + ), + "Basic Black" = list( + RESKIN_ICON_STATE = "combat_helmet_black", + RESKIN_WORN_ICON_STATE = "combat_helmet_black" + ), + "Corpsman Black" = list( + RESKIN_ICON_STATE = "combat_helmet_medic_black", + RESKIN_WORN_ICON_STATE = "combat_helmet_medic_black" + ), + ) + +/obj/item/clothing/suit/armor/bulletproof/hecu + name = "ceramic vest" + desc = "Vest made from some brittle and highly conductive, yet incredibly impact- and shock-resistant material. Might be of best use against bullets and explosives." + icon_state = "ceramic_vest" + icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi' + worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi' + worn_icon_digi = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_digi.dmi' + uses_advanced_reskins = TRUE + unique_reskin = list( + "Basic" = list( + RESKIN_ICON_STATE = "ceramic_vest", + RESKIN_WORN_ICON_STATE = "ceramic_vest" + ), + "Corpsman" = list( + RESKIN_ICON_STATE = "ceramic_vest_medic", + RESKIN_WORN_ICON_STATE = "ceramic_vest_medic" + ), + "Basic Black" = list( + RESKIN_ICON_STATE = "ceramic_vest_black", + RESKIN_WORN_ICON_STATE = "ceramic_vest_black" + ), + "Corpsman Black" = list( + RESKIN_ICON_STATE = "ceramic_vest_medic_black", + RESKIN_WORN_ICON_STATE = "ceramic_vest_medic_black" + ), + ) + +/obj/item/clothing/head/helmet/alt/hecu + name = "ceramic helmet" + desc = "Helmet made from some brittle and highly conductive, yet incredibly impact- and shock-resistant material. Might be of best use against bullets and explosives." + icon_state = "ceramic_helmet" + icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi' + worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi' + worn_icon_digi = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_muzzled.dmi' + can_flashlight = FALSE + uses_advanced_reskins = TRUE + unique_reskin = list( + "Basic" = list( + RESKIN_ICON_STATE = "ceramic_helmet", + RESKIN_WORN_ICON_STATE = "ceramic_helmet" + ), + "Corpsman" = list( + RESKIN_ICON_STATE = "ceramic_helmet_medic", + RESKIN_WORN_ICON_STATE = "ceramic_helmet_medic" + ), + "Basic Black" = list( + RESKIN_ICON_STATE = "ceramic_helmet_black", + RESKIN_WORN_ICON_STATE = "ceramic_helmet_black" + ), + "Corpsman Black" = list( + RESKIN_ICON_STATE = "ceramic_helmet_medic_black", + RESKIN_WORN_ICON_STATE = "ceramic_helmet_medic_black" + ), + ) diff --git a/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm b/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm index d425e73b1f5..15f96d9c312 100644 --- a/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm +++ b/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm @@ -8,6 +8,11 @@ flavour_text = "You are a scientist in a top secret government facility. You blacked out. Now, you have woken up to the horrors that lay within." restricted_species = list(/datum/species/human) +/obj/effect/mob_spawn/ghost_role/human/black_mesa/special(mob/living/carbon/human/spawned_human) + . = ..() + spawned_human.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_MIND) + spawned_human.remove_language(/datum/language/common) + /datum/outfit/science_team name = "Scientist" uniform = /obj/item/clothing/under/rank/rnd/scientist/skyrat/hlscience @@ -33,6 +38,11 @@ outfit = /datum/outfit/security_guard you_are_text = "You are a security guard in a top secret government facility. You blacked out. Now, you have woken up to the horrors that lay within. DO NOT TRY TO EXPLORE THE LEVEL. STAY AROUND YOUR AREA." +/obj/effect/mob_spawn/ghost_role/human/black_mesa/guard/special(mob/living/carbon/human/spawned_human) + . = ..() + spawned_human.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_MIND) + spawned_human.remove_language(/datum/language/common) + /obj/item/clothing/under/rank/security/peacekeeper/sol/traffic/blackmesa name = "security guard uniform" desc = "About that beer I owe'd ya!" @@ -67,6 +77,11 @@ important_text = "Do not try to explore the level unless Vanguard is dead or cooperative. Stay around your area. Allowed races are humans and IPCs." restricted_species = list(/datum/species/human, /datum/species/robotic/ipc) +/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/special(mob/living/carbon/human/spawned_human) + . = ..() + spawned_human.remove_language(/datum/language/common) + spawned_human.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_MIND) + /obj/item/clothing/under/rank/security/officer/hecu name = "urban camouflage BDU" desc = "A baggy military camouflage uniform with an ERDL pattern. The range of whites and greys proves useful in urban environments." @@ -121,10 +136,10 @@ mask = /obj/item/clothing/mask/gas/hecu2 gloves = /obj/item/clothing/gloves/combat belt = /obj/item/storage/belt/military/assault/hecu - ears = /obj/item/radio/headset + ears = /obj/item/radio/headset/headset_faction shoes = /obj/item/clothing/shoes/combat - l_pocket = /obj/item/grenade/smokebomb - r_pocket = /obj/item/binoculars + l_pocket = /obj/item/reagent_containers/food/drinks/flask + r_pocket = /obj/item/flashlight/flare back = /obj/item/storage/backpack/ert/odst/hecu backpack_contents = list( /obj/item/storage/box/survival/radio, @@ -142,6 +157,55 @@ equipped_human.faction |= FACTION_HECU /datum/id_trim/hecu - assignment = "HECU Soldier" + assignment = "HECU Marine" + trim_state = "trim_securityofficer" + access = list(ACCESS_BRIG_ENTRANCE, ACCESS_SECURITY, ACCESS_AWAY_SEC) + +/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/leader + name = "HECU Squad Leader" + prompt_name = "a tactical squad's leader" + outfit = /datum/outfit/hecu/leader + you_are_text = "You are an elite tactical squad's leader deployed into the research facility to contain the infestation." + flavour_text = "You and four other marines have been selected for a guard duty near one of the Black Mesa's entrances. Due to the lack of any real briefing, and your briefing officer's death during the landing, you have no clue as to what your objective is, so you and your group have set up a camp here. You haven't heard much from the north-west post, except for the sounds of gunshots, and their radios went silent. On top of that, your escape helicopter was shot down mid-flight, and another one won't arrive so soon; with your machinegunner being shot down with a precise headshot by something, or SOMEONE. You are likely on your own, at least for now." + important_text = "Keep and sustain marines' morale and discipline. Delegate responsibilities at the best of your abilities. Do not try to explore the level unless Vanguard is dead or cooperative. Stay around your area. Allowed races are humans and IPCs." + restricted_species = list(/datum/species/human, /datum/species/robotic/ipc) + +/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/leader/special(mob/living/carbon/human/spawned_human) + . = ..() + spawned_human.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_MIND) + spawned_human.grant_language(/datum/language/neorusskya, TRUE, TRUE, LANGUAGE_MIND) + spawned_human.grant_language(/datum/language/yangyu, TRUE, TRUE, LANGUAGE_MIND) + spawned_human.remove_language(/datum/language/common) + +/datum/outfit/hecu/leader + name = "HECU Captain" + uniform = /obj/item/clothing/under/rank/security/officer/hecu + head = /obj/item/clothing/head/beret/sec + mask = /obj/item/clothing/mask/gas/hecu2 + gloves = /obj/item/clothing/gloves/tackler/combat/insulated + belt = /obj/item/storage/belt/military/assault/hecu + ears = /obj/item/radio/headset/headset_faction/bowman/captain + shoes = /obj/item/clothing/shoes/combat + l_pocket = /obj/item/grenade/smokebomb + r_pocket = /obj/item/binoculars + back = /obj/item/storage/backpack/ert/odst/hecu + backpack_contents = list( + /obj/item/storage/box/survival/radio, + /obj/item/storage/medkit/emergency, + /obj/item/storage/box/hecu_rations, + /obj/item/knife/combat, + /obj/item/armament_points_card/assaultops, + /obj/item/book/granter/martial/cqc + ) + id = /obj/item/card/id + id_trim = /datum/id_trim/hecu_leader + skillchips = list(/obj/item/skillchip/chameleon/reload) + +/datum/outfit/hecu/leader/post_equip(mob/living/carbon/human/equipped_human, visualsOnly) + . = ..() + equipped_human.faction |= FACTION_HECU + +/datum/id_trim/hecu_leader + assignment = "HECU Captain" trim_state = "trim_securityofficer" access = list(ACCESS_BRIG_ENTRANCE, ACCESS_SECURITY, ACCESS_AWAY_SEC) diff --git a/modular_skyrat/modules/black_mesa/code/mobs/headcrab.dm b/modular_skyrat/modules/black_mesa/code/mobs/headcrab.dm index 3cc70a41faf..2a7dab4e2e5 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/headcrab.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/headcrab.dm @@ -14,8 +14,8 @@ ranged_message = "jumps" taunt_chance = 100 turns_per_move = 7 - maxHealth = 100 - health = 100 + maxHealth = 50 + health = 50 speed = 3 ranged = TRUE dodging = TRUE diff --git a/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm b/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm index f7d30e3b76d..836dce4adde 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm @@ -24,7 +24,7 @@ attack_verb_simple = "punch" attack_sound = 'sound/weapons/punch1.ogg' combat_mode = TRUE - loot = list(/obj/item/melee/baton) + loot = list(/obj/effect/gibspawner/human, /obj/item/melee/baton) atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) unsuitable_atmos_damage = 7.5 faction = list(FACTION_HECU) @@ -159,7 +159,7 @@ icon_living = "security_guard_ranged" casingtype = /obj/item/ammo_casing/b9mm projectilesound = 'sound/weapons/gun/pistol/shot.ogg' - loot = list(/obj/item/clothing/suit/armor/vest/blueshirt, /obj/item/gun/ballistic/automatic/pistol/g17/mesa) + loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/suit/armor/vest/blueshirt, /obj/item/gun/ballistic/automatic/pistol/g17/mesa) rapid_melee = 1 /mob/living/simple_animal/hostile/blackmesa/blackops diff --git a/modular_skyrat/modules/black_mesa/code/mobs/nihilanth.dm b/modular_skyrat/modules/black_mesa/code/mobs/nihilanth.dm index d3ef01d815e..34d681f4b9f 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/nihilanth.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/nihilanth.dm @@ -20,7 +20,7 @@ ranged = TRUE rapid = 3 alert_cooldown = 2 MINUTES - harm_intent_damage = 5 + harm_intent_damage = 50 melee_damage_lower = 30 melee_damage_upper = 40 attack_verb_continuous = "lathes" @@ -28,7 +28,7 @@ attack_sound = 'sound/weapons/punch1.ogg' status_flags = NONE del_on_death = TRUE - wander = FALSE + wander = TRUE loot = list(/obj/effect/gibspawner/xeno, /obj/item/stack/sheet/bluespace_crystal/fifty, /obj/item/key/gateway, /obj/item/uber_teleporter) movement_type = FLYING @@ -66,13 +66,14 @@ . = ..() alert_sound_to_playing('modular_skyrat/modules/black_mesa/sound/mobs/nihilanth/nihilanth_death01.ogg') new /obj/effect/singularity_creation(loc) - message_admins("[src] has been defeated, a spacetime cascade will occur in 10 seconds.") - addtimer(CALLBACK(src, .proc/endgame_shit), 10 SECONDS) + message_admins("[src] has been defeated, a spacetime cascade might occur in 30 seconds.") + addtimer(CALLBACK(src, .proc/endgame_shit), 30 SECONDS) /mob/living/simple_animal/hostile/blackmesa/xen/nihilanth/proc/endgame_shit() to_chat(world, span_danger("You feel as though a powerful force has been defeated...")) - var/datum/round_event_control/resonance_cascade/event_to_start = new() - event_to_start.runEvent() + if(prob(60)) + var/datum/round_event_control/resonance_cascade/event_to_start = new() + event_to_start.runEvent() /mob/living/simple_animal/hostile/blackmesa/xen/nihilanth/LoseAggro() . = ..() diff --git a/modular_skyrat/modules/black_mesa/code/resonance_cascade.dm b/modular_skyrat/modules/black_mesa/code/resonance_cascade.dm index d6602e9d4da..c18591513f5 100644 --- a/modular_skyrat/modules/black_mesa/code/resonance_cascade.dm +++ b/modular_skyrat/modules/black_mesa/code/resonance_cascade.dm @@ -14,7 +14,8 @@ /datum/round_event/portal_storm/resonance_cascade hostile_types = list( - /mob/living/simple_animal/hostile/blackmesa/xen/bullsquid = 30, - /mob/living/simple_animal/hostile/blackmesa/xen/houndeye = 30, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab = 30 + /mob/living/simple_animal/hostile/blackmesa/xen/bullsquid = 25, + /mob/living/simple_animal/hostile/blackmesa/xen/houndeye = 25, + /mob/living/simple_animal/hostile/blackmesa/xen/headcrab = 25, + /mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt/slave = 25 ) diff --git a/modular_skyrat/modules/black_mesa/code/turrets.dm b/modular_skyrat/modules/black_mesa/code/turrets.dm index 25ac3cce790..e3965876d9a 100644 --- a/modular_skyrat/modules/black_mesa/code/turrets.dm +++ b/modular_skyrat/modules/black_mesa/code/turrets.dm @@ -72,9 +72,12 @@ ..() /obj/machinery/porta_turret/syndicate/pod/toolbox/mesa - max_integrity = 100 + stun_projectile = /obj/projectile/bullet/advanced/b9mm/rubber + lethal_projectile = /obj/projectile/bullet/c9mm/ap + max_integrity = 150 + req_access = list(ACCESS_AWAY_SEC) faction = list(FACTION_HECU) - shot_delay = 0.75 + shot_delay = 0.5 /obj/machinery/porta_turret/black_mesa/friendly diff --git a/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm b/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm index 3c61bba3bf1..8a756eee34d 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm @@ -247,7 +247,7 @@ new /obj/item/gun/ballistic/automatic/akm(src) new /obj/item/ammo_box/magazine/akm(src) new /obj/item/gun/ballistic/automatic/m16(src) - new /obj/item/ammo_box/magazine/m16(src) + new /obj/item/ammo_box/magazine/m16/vintage(src) new /obj/item/gun/ballistic/automatic/mg34(src) new /obj/item/ammo_box/magazine/mg34(src) new /obj/item/gun/ballistic/automatic/mp40(src) diff --git a/modular_skyrat/modules/gunsgalore/code/guns/m16.dm b/modular_skyrat/modules/gunsgalore/code/guns/m16.dm index eafb729c51d..03f783c8fd0 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/m16.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/m16.dm @@ -11,7 +11,7 @@ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/m16/extended + mag_type = /obj/item/ammo_box/magazine/m16 can_suppress = FALSE burst_size = 3 fire_delay = 2 @@ -27,6 +27,15 @@ /obj/item/ammo_box/magazine/m16 name = "m16 magazine (5.56x45mm)" icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon_state = "m16e" + ammo_type = /obj/item/ammo_casing/a556 + caliber = "a556" + max_ammo = 30 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/m16/vintage + name = "vintage m16 magazine (5.56x45mm)" + icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi' icon_state = "m16" ammo_type = /obj/item/ammo_casing/a556 caliber = "a556" diff --git a/modular_skyrat/modules/hev_suit/code/hev_suit.dm b/modular_skyrat/modules/hev_suit/code/hev_suit.dm index e3bc3dc6f99..dd06b4d7e2c 100644 --- a/modular_skyrat/modules/hev_suit/code/hev_suit.dm +++ b/modular_skyrat/modules/hev_suit/code/hev_suit.dm @@ -11,7 +11,7 @@ #define HEV_ARMOR_POWEROFF list(20, 20, 20, 20, 30, 40, 40, 40, 40, 10) #define PCV_ARMOR_POWEROFF list(30, 30, 30, 30, 30, 30, 20, 20, 20, 10) -#define HEV_ARMOR_POWERON list(60, 60, 60, 60, 90, 100, 100, 100, 100, 30) +#define HEV_ARMOR_POWERON list(50, 50, 50, 50, 90, 100, 100, 100, 100, 30) #define PCV_ARMOR_POWERON list(40, 40, 40, 40, 60, 75, 50, 50, 50, 40) #define HEV_POWERUSE_AIRTANK 2 @@ -51,6 +51,7 @@ clothing_traits = list(TRAIT_REAGENT_SCANNER) visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR visor_flags = STOPSPRESSUREDAMAGE + dog_fashion = null slowdown = 0 /obj/item/clothing/suit/space/hev_suit diff --git a/modular_skyrat/modules/opposing_force/code/equipment/ammo.dm b/modular_skyrat/modules/opposing_force/code/equipment/ammo.dm index 65d18045f3b..1fcccb5a8e6 100644 --- a/modular_skyrat/modules/opposing_force/code/equipment/ammo.dm +++ b/modular_skyrat/modules/opposing_force/code/equipment/ammo.dm @@ -7,7 +7,7 @@ /datum/opposing_force_equipment/ammo/m16 item_type = /obj/item/ammo_box/magazine/m16 - description = "A twenty-round magazine for the M16 assault rifle. Uses 5.56x45mm ammunition." + description = "A thirty-round magazine for the M16 assault rifle. Uses 5.56x45mm ammunition." /datum/opposing_force_equipment/ammo/akm item_type = /obj/item/ammo_box/magazine/akm diff --git a/modular_skyrat/modules/opposing_force/code/items.dm b/modular_skyrat/modules/opposing_force/code/items.dm index 7829f27714d..ee0b1359b50 100644 --- a/modular_skyrat/modules/opposing_force/code/items.dm +++ b/modular_skyrat/modules/opposing_force/code/items.dm @@ -9,8 +9,6 @@ var/datum/component/uplink/hidden_uplink = GetComponent(/datum/component/uplink) hidden_uplink.name = "old radio" - - /obj/item/reagent_containers/glass/rag/large volume = 30 amount_per_transfer_from_this = 30 @@ -33,15 +31,6 @@ new /obj/item/clothing/suit/armor/vest/leather/gunman(src) new /obj/item/clothing/shoes/combat(src) -/obj/item/ammo_box/magazine/m16/extended - name = "m4a1 magazine (5.56x45mm)" - icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi' - icon_state = "m16e" - ammo_type = /obj/item/ammo_casing/a556 - caliber = "a556" - max_ammo = 30 - multiple_sprites = AMMO_BOX_FULL_EMPTY - /obj/item/autosurgeon/organ/syndicate/hackerman starting_organ = /obj/item/organ/cyberimp/arm/hacker diff --git a/tgstation.dme b/tgstation.dme index 3f58035be79..523402ced58 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4775,6 +4775,7 @@ #include "modular_skyrat\modules\biohazard_blob\code\biohazard_blob_structures.dm" #include "modular_skyrat\modules\biohazard_blob\code\mold_event.dm" #include "modular_skyrat\modules\black_mesa\code\area.dm" +#include "modular_skyrat\modules\black_mesa\code\armor.dm" #include "modular_skyrat\modules\black_mesa\code\bump_teleporter.dm" #include "modular_skyrat\modules\black_mesa\code\drops.dm" #include "modular_skyrat\modules\black_mesa\code\follow_component.dm"