diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm index 485ccef7016..2a0a9ff6c51 100644 --- a/_maps/RandomZLevels/blackmesa.dmm +++ b/_maps/RandomZLevels/blackmesa.dmm @@ -73,7 +73,7 @@ /obj/machinery/power/floodlight{ anchored = 1 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "au" = ( /obj/structure/extinguisher_cabinet/directional/east, @@ -155,7 +155,7 @@ /obj/machinery/light/cold{ dir = 8 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "aM" = ( /obj/item/clothing/mask/facehugger/dead, @@ -211,8 +211,8 @@ /turf/open/floor/iron/dark/textured_large, /area/awaymission/black_mesa) "aZ" = ( -/obj/effect/random_mob_placer/xen/zombie, -/turf/open/floor/iron/dark/yellow, +/obj/effect/baseturf_helper/black_mesa, +/turf/closed/indestructible/rock, /area/awaymission/black_mesa) "ba" = ( /turf/open/floor/plating/cobblestone, @@ -441,7 +441,7 @@ color = "#556B2F"; opacity = 1 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "cb" = ( /obj/effect/turf_decal/stripes{ @@ -640,6 +640,10 @@ /obj/item/pen, /turf/open/floor/iron, /area/awaymission/black_mesa) +"dk" = ( +/obj/structure/inflatable, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "dm" = ( /obj/structure/sign/warning/chemdiamond{ pixel_y = 32 @@ -703,6 +707,10 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) +"dH" = ( +/obj/effect/baseturf_helper/black_mesa_xen, +/turf/open/misc/xen, +/area/awaymission/black_mesa/xen) "dI" = ( /obj/machinery/modular_computer/console/preset/cargochat/science{ dir = 8 @@ -735,6 +743,15 @@ }, /turf/open/floor/plating/elevatorshaft, /area/awaymission/black_mesa) +"dR" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/chasm{ + planetary_atmos = 1 + }, +/area/awaymission/black_mesa) "dS" = ( /obj/structure/closet/crate, /obj/structure/alien/weeds/xen, @@ -836,7 +853,7 @@ /area/awaymission/black_mesa) "es" = ( /obj/effect/random_mob_placer/vortigaunt, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "et" = ( /obj/structure/flora/biolumi/lamp/weaklight, @@ -863,7 +880,7 @@ pixel_x = 7; pixel_y = 4 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "eA" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -931,7 +948,7 @@ /turf/open/floor/plating, /area/awaymission/black_mesa) "eQ" = ( -/obj/machinery/suit_storage_unit/mining, +/obj/machinery/suit_storage_unit/engine, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) "eS" = ( @@ -1169,7 +1186,9 @@ /obj/structure/railing/corner{ dir = 1 }, -/turf/open/chasm, +/turf/open/chasm{ + planetary_atmos = 1 + }, /area/awaymission/black_mesa) "gk" = ( /obj/effect/spawner/random/vending/colavend, @@ -1221,7 +1240,7 @@ "gw" = ( /obj/structure/alien/weeds/xen, /obj/structure/xen_crystal, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "gy" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ @@ -1413,7 +1432,7 @@ /area/awaymission/black_mesa) "hv" = ( /obj/effect/random_mob_placer/xen/zombie, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "hx" = ( /obj/structure/lattice/catwalk, @@ -1665,7 +1684,8 @@ /area/awaymission/black_mesa) "iM" = ( /obj/structure/bed/maint, -/turf/open/misc/ironsand, +/obj/item/armament_points_card/assaultops, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "iN" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -1677,7 +1697,7 @@ /area/awaymission/black_mesa) "iO" = ( /obj/structure/closet/crate/large, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "iR" = ( /obj/machinery/light/cold/directional/north, @@ -1800,14 +1820,16 @@ /area/awaymission/black_mesa) "jr" = ( /obj/structure/flora/biolumi/lamp/weaklight, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "jt" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ dir = 5 }, -/turf/open/chasm, +/turf/open/chasm{ + planetary_atmos = 1 + }, /area/awaymission/black_mesa) "ju" = ( /obj/structure/table, @@ -1943,7 +1965,7 @@ /area/awaymission/black_mesa) "kg" = ( /obj/effect/random_mob_placer/xen, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "kh" = ( /obj/effect/turf_decal/stripes, @@ -2220,16 +2242,11 @@ /obj/machinery/light/small/red/directional/west, /turf/open/floor/plating, /area/awaymission/black_mesa) -"ly" = ( -/obj/structure/alien/weeds/xen, -/obj/structure/shockplant, -/turf/open/floor/iron/smooth, -/area/awaymission/black_mesa) "lz" = ( /obj/machinery/light/cold{ dir = 4 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "lB" = ( /obj/structure/chair/sofa/bench/left{ @@ -2241,7 +2258,7 @@ /obj/structure/deployable_barricade/metal{ dir = 1 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "lE" = ( /obj/structure/table, @@ -2338,7 +2355,7 @@ /area/awaymission/black_mesa) "ma" = ( /obj/structure/table, -/obj/item/food/mre_course/dessert, +/obj/item/food/mre_course/dessert/chocolate, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) "mb" = ( @@ -2436,13 +2453,8 @@ /turf/open/floor/iron/dark, /area/awaymission/black_mesa/xen) "mx" = ( -/obj/structure/deployable_barricade/metal{ - dir = 1 - }, -/obj/machinery/deployable_turret/hmg/mesa{ - dir = 9 - }, -/turf/open/floor/plating/cobblestone, +/obj/item/mounted_machine_gun_folded, +/turf/open/floor/iron/dark, /area/awaymission/black_mesa) "my" = ( /obj/structure/chair/sofa/bench/right{ @@ -2476,6 +2488,10 @@ /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, /turf/open/floor/iron/dark/textured_large, /area/awaymission/black_mesa) "mD" = ( @@ -2498,7 +2514,6 @@ /obj/machinery/light/cold{ dir = 8 }, -/obj/effect/random_mob_placer/xen/zombie, /turf/open/floor/iron/freezer, /area/awaymission/black_mesa) "mJ" = ( @@ -2862,11 +2877,12 @@ /area/awaymission/black_mesa) "oz" = ( /obj/structure/rack/shelf, -/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/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, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "oA" = ( @@ -2920,15 +2936,15 @@ /area/awaymission/black_mesa) "oN" = ( /obj/structure/table, -/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat, /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) "oO" = ( /obj/item/storage/medkit/regular, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "oP" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ @@ -3444,7 +3460,7 @@ /area/awaymission/black_mesa/xen) "rw" = ( /obj/structure/deployable_barricade/metal, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "rx" = ( /obj/structure/extinguisher_cabinet/directional/south, @@ -3512,12 +3528,6 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/green, /area/awaymission/black_mesa) -"rM" = ( -/obj/structure/chair/stool, -/obj/structure/alien/weeds/xen, -/obj/effect/random_mob_placer/xen, -/turf/open/floor/iron/smooth, -/area/awaymission/black_mesa) "rO" = ( /turf/open/floor/iron/textured{ icon_state = "floorscorched2" @@ -3625,7 +3635,9 @@ /area/awaymission/black_mesa) "sr" = ( /obj/structure/table, -/obj/item/gun/ballistic/automatic/proto/unrestricted, +/obj/item/gun/ballistic/automatic/proto/unrestricted{ + name = "\improper Saber SMG" + }, /turf/open/misc/xen, /area/awaymission/black_mesa/xen) "ss" = ( @@ -3813,7 +3825,7 @@ /area/awaymission/black_mesa) "tk" = ( /obj/structure/rack/shelf, -/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/mp5, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "tl" = ( @@ -3904,7 +3916,9 @@ /obj/structure/railing{ dir = 10 }, -/turf/open/chasm, +/turf/open/chasm{ + planetary_atmos = 1 + }, /area/awaymission/black_mesa) "tF" = ( /obj/effect/spawner/random/vending/snackvend, @@ -3966,11 +3980,13 @@ /obj/structure/railing{ dir = 9 }, -/turf/open/chasm, +/turf/open/chasm{ + planetary_atmos = 1 + }, /area/awaymission/black_mesa) "tZ" = ( /obj/item/chair, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "uc" = ( /obj/structure/chair/plastic{ @@ -4027,7 +4043,7 @@ /area/awaymission/black_mesa) "uo" = ( /obj/structure/flippedtable, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "up" = ( /obj/machinery/modular_computer/console/preset/civilian{ @@ -4095,8 +4111,8 @@ /area/awaymission/black_mesa) "uB" = ( /obj/effect/bump_teleporter{ - id_target = "factory_lower_start"; - id = "factory_lower_end" + id = "factory_lower_end"; + id_target = "factory_lower_start" }, /turf/open/floor/vault/alien, /area/awaymission/black_mesa/xen) @@ -4112,11 +4128,11 @@ /area/awaymission/black_mesa) "uF" = ( /obj/structure/rack/shelf, -/obj/item/ammo_box/magazine/p90, -/obj/item/ammo_box/magazine/p90, -/obj/item/ammo_box/magazine/p90, -/obj/item/ammo_box/magazine/p90, -/obj/item/ammo_box/magazine/p90, +/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/smooth_large, /area/awaymission/black_mesa) "uG" = ( @@ -4273,7 +4289,7 @@ dir = 4 }, /obj/structure/marker_beacon/burgundy, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "vn" = ( /obj/effect/turf_decal/trimline/brown/filled/line, @@ -4692,7 +4708,7 @@ dir = 4 }, /obj/structure/cable, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "xv" = ( /obj/item/assembly/shock_kit, @@ -4856,7 +4872,7 @@ dir = 4 }, /obj/structure/cable, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "yc" = ( /obj/machinery/light/cold{ @@ -4933,7 +4949,7 @@ "yr" = ( /obj/structure/alien/weeds/xen, /obj/effect/spawner/random/bioluminescent_plant/weak, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "ys" = ( /obj/effect/turf_decal/stripes, @@ -4971,14 +4987,6 @@ /area/awaymission/black_mesa) "yz" = ( /obj/structure/closet/crate/secure/weapon, -/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, -/obj/item/ammo_box/magazine/m16, -/obj/item/ammo_box/magazine/m16, /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) @@ -5118,7 +5126,7 @@ /area/awaymission/black_mesa) "zq" = ( /obj/structure/rack/gunrack, -/obj/item/gun/ballistic/automatic/cfa_wildcat, +/obj/item/gun/ballistic/automatic/mp5, /turf/open/floor/iron/dark/blue, /area/awaymission/black_mesa) "zs" = ( @@ -5180,10 +5188,8 @@ }, /area/awaymission/black_mesa/xen) "zE" = ( -/obj/item/ammo_box/magazine/cm762, -/turf/open/floor/iron/smooth_large{ - icon_state = "damaged2" - }, +/obj/item/ammo_box/magazine/m16/extended, +/turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "zF" = ( /obj/structure/alien/resin/membrane, @@ -5384,15 +5390,6 @@ /area/awaymission/black_mesa) "AK" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/minespawner/explosive, -/obj/item/minespawner/explosive, -/obj/item/minespawner/explosive, -/obj/item/minespawner/explosive, -/obj/item/minespawner/explosive, -/obj/item/minespawner/explosive, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "AL" = ( @@ -5493,13 +5490,6 @@ /obj/effect/gibspawner/human, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) -"Bu" = ( -/obj/structure/rack/shelf, -/obj/item/reagent_containers/hypospray/medipen/stimulants, -/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat, -/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat, -/turf/open/floor/iron/smooth, -/area/awaymission/black_mesa) "Bv" = ( /obj/item/food/urinalcake, /turf/open/floor/iron/smooth_large, @@ -5599,7 +5589,7 @@ pixel_x = -12; pixel_y = 13 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "BX" = ( /obj/machinery/light/small{ @@ -5934,8 +5924,8 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) "DB" = ( -/obj/item/storage/box/gunset/m23, -/turf/open/floor/iron/dark, +/obj/item/ammo_box/magazine/m16/extended, +/turf/open/floor/iron/textured, /area/awaymission/black_mesa) "DD" = ( /obj/effect/gibspawner/human, @@ -6138,7 +6128,6 @@ dir = 5 }, /obj/structure/table, -/obj/item/storage/medkit/expeditionary, /obj/item/storage/box/bodybags, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) @@ -6174,7 +6163,7 @@ /area/awaymission/black_mesa) "EK" = ( /obj/structure/cable, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "EL" = ( /obj/effect/turf_decal/stripes, @@ -6260,11 +6249,6 @@ /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, -/obj/item/ammo_box/magazine/m16, -/obj/item/ammo_box/magazine/m16, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Fl" = ( @@ -6393,7 +6377,7 @@ /area/awaymission/black_mesa/xen) "FQ" = ( /obj/machinery/porta_turret/black_mesa, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "FR" = ( /obj/structure/table, @@ -6433,7 +6417,7 @@ "Ga" = ( /obj/structure/closet/crate/large, /obj/structure/closet/crate/large, -/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat, +/obj/item/ammo_box/magazine/mp5, /turf/open/floor/plating, /area/awaymission/black_mesa) "Gb" = ( @@ -6647,7 +6631,9 @@ /obj/structure/railing{ dir = 1 }, -/turf/open/chasm, +/turf/open/chasm{ + planetary_atmos = 1 + }, /area/awaymission/black_mesa) "Hh" = ( /obj/structure/rack, @@ -6759,12 +6745,6 @@ }, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) -"HJ" = ( -/obj/effect/turf_decal/trimline/green/filled/line, -/obj/effect/random_mob_placer/xen, -/obj/structure/alien/weeds/xen, -/turf/open/floor/iron/smooth, -/area/awaymission/black_mesa) "HL" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -6804,7 +6784,7 @@ /area/awaymission/black_mesa) "HS" = ( /obj/structure/alien/weeds/xen, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "HV" = ( /turf/open/misc/beach/coastline_t/sandwater_inner/xen{ @@ -6864,7 +6844,7 @@ /obj/structure/deployable_barricade/metal{ dir = 4 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "Ig" = ( /obj/effect/random_mob_placer/xen, @@ -6949,8 +6929,10 @@ /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa) "IA" = ( -/turf/open/misc/ironsand, -/area/awaymission/black_mesa) +/obj/structure/table, +/obj/item/food/mre_course/dessert/cake, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa/xen) "IB" = ( /obj/machinery/atmospherics/components/binary/crystallizer, /turf/open/floor/iron/textured_large, @@ -6973,7 +6955,7 @@ pixel_x = -7; pixel_y = 7 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "IF" = ( /obj/structure/railing/corner{ @@ -7112,7 +7094,7 @@ /area/awaymission/black_mesa) "Jp" = ( /obj/structure/closet/crate/large, -/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat, +/obj/item/ammo_box/magazine/mp5, /turf/open/floor/plating, /area/awaymission/black_mesa) "Jq" = ( @@ -7230,8 +7212,8 @@ /turf/open/floor/mineral/titanium/white, /area/awaymission/black_mesa) "JT" = ( -/obj/item/greentext, -/turf/open/misc/ironsand, +/obj/item/book/granter/crafting_recipe/pipegun_prime, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "JU" = ( /obj/structure/inflatable{ @@ -7767,7 +7749,7 @@ /area/awaymission/black_mesa/xen) "Mu" = ( /obj/structure/marker_beacon/burgundy, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "Mv" = ( /obj/effect/turf_decal/stripes/corner{ @@ -7790,7 +7772,7 @@ pixel_x = 8; pixel_y = -17 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "MA" = ( /obj/structure/spacevine/xen/thick, @@ -7869,6 +7851,15 @@ /obj/item/storage/medkit/emergency, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa) +"MR" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/chasm{ + planetary_atmos = 1 + }, +/area/awaymission/black_mesa) "MT" = ( /obj/structure/cable, /obj/machinery/power/port_gen/pacman, @@ -8063,7 +8054,9 @@ /obj/structure/railing/corner{ dir = 4 }, -/turf/open/chasm, +/turf/open/chasm{ + planetary_atmos = 1 + }, /area/awaymission/black_mesa) "NQ" = ( /obj/structure/extinguisher_cabinet/directional/north, @@ -8124,8 +8117,8 @@ /area/awaymission/black_mesa) "Ob" = ( /obj/effect/bump_teleporter{ - id_target = "factory_upper_start"; - id = "factory_upper_end" + id = "factory_upper_end"; + id_target = "factory_upper_start" }, /turf/open/floor/vault/alien, /area/awaymission/black_mesa/xen) @@ -8196,7 +8189,6 @@ /area/awaymission/black_mesa) "Ow" = ( /obj/item/stack/cable_coil, -/obj/item/storage/belt/utility/full, /obj/item/clothing/glasses/welding, /obj/item/lightreplacer, /obj/structure/rack/shelf, @@ -8342,7 +8334,9 @@ /obj/structure/railing{ dir = 8 }, -/turf/open/chasm, +/turf/open/chasm{ + planetary_atmos = 1 + }, /area/awaymission/black_mesa) "Ph" = ( /obj/machinery/light/cold, @@ -8417,6 +8411,10 @@ }, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) +"PB" = ( +/obj/item/ammo_box/magazine/mmg_box, +/turf/open/floor/iron/dark, +/area/awaymission/black_mesa) "PD" = ( /obj/structure/chair/sofa/bamboo/left{ dir = 8 @@ -8536,15 +8534,7 @@ /turf/open/floor/engine, /area/awaymission/black_mesa) "Qi" = ( -/obj/structure/closet/crate/secure/weapon, -/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/ammo_box/magazine/multi_sprite/g17, -/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/ammo_box/magazine/multi_sprite/g17, +/obj/machinery/armament_station/hecu, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Qk" = ( @@ -8575,7 +8565,9 @@ /obj/structure/railing{ dir = 6 }, -/turf/open/chasm, +/turf/open/chasm{ + planetary_atmos = 1 + }, /area/awaymission/black_mesa) "Qr" = ( /obj/structure/railing/corner, @@ -8632,7 +8624,7 @@ /obj/structure/deployable_barricade/metal{ dir = 4 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "QD" = ( /obj/structure/railing{ @@ -9014,10 +9006,6 @@ }, /turf/open/floor/iron/textured, /area/awaymission/black_mesa) -"Sv" = ( -/obj/item/gun/ballistic/automatic/cfa_rifle, -/turf/open/floor/iron/smooth_large, -/area/awaymission/black_mesa) "Sw" = ( /obj/item/keycard/yellow, /turf/open/floor/iron/dark, @@ -9140,12 +9128,18 @@ }, /turf/open/floor/plating, /area/awaymission/black_mesa) +"Th" = ( +/obj/structure/lattice/catwalk, +/turf/open/chasm{ + planetary_atmos = 1 + }, +/area/awaymission/black_mesa) "Ti" = ( /obj/structure/flora/biolumi/lamp/weaklight{ pixel_x = -12; pixel_y = 11 }, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "Tk" = ( /obj/machinery/modular_computer/console/preset/civilian, @@ -9271,7 +9265,7 @@ /area/awaymission/black_mesa) "TP" = ( /obj/machinery/power/floodlight, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "TQ" = ( /turf/open/floor/iron/textured_large, @@ -9341,7 +9335,7 @@ /area/awaymission/black_mesa) "Ui" = ( /obj/structure/deployable_barricade/metal/plasteel, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "Uj" = ( /obj/effect/turf_decal/stripes{ @@ -9356,17 +9350,7 @@ /area/awaymission/black_mesa/xen) "Ul" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/ammo_box/magazine/m12g/dragon, -/obj/item/ammo_box/magazine/m12g, -/obj/item/ammo_box/magazine/m12g, -/obj/item/ammo_box/magazine/m12g, -/obj/item/ammo_box/magazine/m12g/slug, -/obj/item/ammo_box/magazine/m12g/slug, -/obj/item/ammo_box/magazine/m12g, -/obj/item/ammo_box/magazine/m12g/slug, -/obj/item/ammo_box/magazine/m12g/slug, -/obj/item/ammo_box/magazine/m12g, -/obj/item/ammo_box/magazine/m12g, +/obj/item/stack/sheet/iron/twenty, /turf/open/floor/iron/dark, /area/awaymission/black_mesa) "Um" = ( @@ -9565,7 +9549,9 @@ /obj/machinery/light/cold{ dir = 1 }, -/turf/open/chasm, +/turf/open/chasm{ + planetary_atmos = 1 + }, /area/awaymission/black_mesa) "Vb" = ( /obj/effect/turf_decal/stripes{ @@ -9630,8 +9616,8 @@ "Vt" = ( /obj/structure/lattice/catwalk, /obj/effect/bump_teleporter{ - id = "lambda_destination"; - density = 0 + density = 0; + id = "lambda_destination" }, /turf/open/floor/engine, /area/awaymission/black_mesa/xen) @@ -9682,7 +9668,7 @@ /area/awaymission/black_mesa) "VD" = ( /obj/structure/bookcase/random/religion, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "VE" = ( /obj/structure/railing, @@ -9814,7 +9800,9 @@ "Wk" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, -/turf/open/chasm, +/turf/open/chasm{ + planetary_atmos = 1 + }, /area/awaymission/black_mesa) "Wn" = ( /obj/structure/fluff/bus/passable, @@ -9871,7 +9859,8 @@ "WA" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/hypospray/medipen/stimulants, -/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat, +/obj/item/ammo_box/magazine/mp5, +/obj/item/ammo_box/magazine/mp5, /turf/open/floor/iron/smooth, /area/awaymission/black_mesa) "WB" = ( @@ -10013,7 +10002,7 @@ dir = 4 }, /obj/structure/deployable_barricade/metal, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "Xe" = ( /obj/structure/table, @@ -10115,7 +10104,7 @@ "XB" = ( /obj/machinery/porta_turret/black_mesa, /obj/structure/flora/biolumi/lamp/weaklight, -/turf/open/misc/ironsand, +/turf/open/misc/ironsand/black_mesa, /area/awaymission/black_mesa) "XF" = ( /obj/structure/table, @@ -15249,7 +15238,7 @@ uK rv ma tX -ma +IA rv rv Uv @@ -17303,7 +17292,7 @@ Fu Fu Fu Fu -Fu +dH RP rv JU @@ -37910,7 +37899,7 @@ cj cj cj cj -IA +ak rw Mu No @@ -38167,9 +38156,9 @@ cj Lf cB cj -IA +ak rw -IA +ak No rz rz @@ -38424,9 +38413,9 @@ cj Px xc cj -IA +ak rw -IA +ak No rz rz @@ -38514,15 +38503,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -38681,9 +38670,9 @@ cj Px uh cj -IA +ak rw -IA +ak No rz rz @@ -38771,15 +38760,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -38938,9 +38927,9 @@ UK UK UK sV -IA +ak Ui -IA +ak No No No @@ -39028,15 +39017,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -39195,11 +39184,11 @@ UK UK UK sV -IA +ak Ui -IA -IA -IA +ak +ak +ak No rz rz @@ -39285,15 +39274,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -39409,29 +39398,29 @@ rz rz No No -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak XB -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak No No No @@ -39452,11 +39441,11 @@ UK IS Ao cj -IA +ak rw Mu -IA -IA +ak +ak No rz rz @@ -39542,15 +39531,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -39665,34 +39654,34 @@ rz rz No No -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak kg -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak No No rz @@ -39709,11 +39698,11 @@ UK Eu so cj -IA +ak rw -IA -IA -IA +ak +ak +ak No No rz @@ -39799,15 +39788,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -39921,9 +39910,9 @@ rz rz No No -IA -IA -IA +ak +ak +ak ba ba ba @@ -39935,7 +39924,7 @@ Wj ba ba ba -IA +ak ba et ba @@ -39948,30 +39937,30 @@ ba ba et ba -IA -IA +ak +ak aL No No rz No cj -cj -cj -cj +dk +dk +dk cj sV cj sV +dk +dk cj -cj -cj -IA +ak rw -IA -IA -IA -IA +ak +ak +ak +ak No rz rz @@ -40056,15 +40045,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -40177,9 +40166,9 @@ rz rz No No -IA -IA -IA +ak +ak +ak ba ba ba @@ -40206,29 +40195,29 @@ ba ba ba ba -IA -IA -IA +ak +ak +ak No No No -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak UK -IA +ak UK -IA -IA -IA -IA +ak +ak +ak +ak rw -IA -IA -IA -IA +ak +ak +ak +ak No rz rz @@ -40313,15 +40302,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -40433,9 +40422,9 @@ rz rz rz No -IA -IA -IA +ak +ak +ak ba ba ba @@ -40465,26 +40454,26 @@ ba ba ba ba -IA +ak Mu aL No -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak UK -IA +ak UK -IA -IA -IA +ak +ak +ak at rw -IA -IA -IA +ak +ak +ak tZ No No @@ -40570,15 +40559,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -40690,17 +40679,17 @@ rz rz No No -IA +ak kg ba ba ba ba -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak ba ba ba @@ -40708,7 +40697,7 @@ ba ba ba et -IA +ak ba ba ba @@ -40722,9 +40711,9 @@ ba ba ba ba -IA -IA -IA +ak +ak +ak Yr If If @@ -40739,11 +40728,11 @@ If If xu Xd -IA -IA +ak +ak tZ -IA -IA +ak +ak No No rz @@ -40827,15 +40816,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -40946,32 +40935,32 @@ rz rz rz No -IA -IA -IA +ak +ak +ak ba ba ba ba -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak kg -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak FQ -IA -IA -IA -IA +ak +ak +ak +ak et ba ba @@ -40992,16 +40981,16 @@ ba ba ba ba -IA +ak Mu EK -IA +ak Mu -IA -IA -IA +ak +ak +ak uo -IA +ak No No No @@ -41084,9 +41073,9 @@ rz rz No Ja -Zv -Zv -Zv +KD +KD +KD VH QM VF @@ -41203,35 +41192,35 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak kg -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak ba ba ba @@ -41239,7 +41228,7 @@ ba ba ba ba -mx +nz ba ba ba @@ -41252,21 +41241,21 @@ ba ba ba EK -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak uo -IA -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak +ak No rz rz @@ -41342,8 +41331,8 @@ rz No Yr WU -Zv -Zv +KD +KD VH QM VF @@ -41460,14 +41449,14 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA -IA +ak +ak +ak No No No @@ -41484,16 +41473,16 @@ No No No No -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak ba ba nz @@ -41509,21 +41498,21 @@ ba ba ba iv -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak tZ -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak No rz rz @@ -41598,9 +41587,9 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF @@ -41717,14 +41706,14 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA -IA +ak +ak +ak No rz rz @@ -41747,12 +41736,12 @@ No No No No -IA -IA +ak +ak lz -IA +ak Mu -IA +ak hj ro oq @@ -41766,21 +41755,21 @@ ba oq HF iv -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak Mu -IA +ak +dk cj cj cj cj -cj -IA -IA -IA +ak +ak +ak No rz rz @@ -41855,9 +41844,9 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF @@ -41974,13 +41963,13 @@ rz rz No No -IA -IA +ak +ak ba ba ba iO -IA +ak No No rz @@ -42011,9 +42000,9 @@ No No lz Yr -IA -IA -IA +ak +ak +ak ba ba ba @@ -42024,20 +42013,20 @@ ba ba iv ba -IA -IA -IA +ak +ak +ak tZ -IA -cj -cj +ak +dk +dk AD cv wZ cj cj -IA -IA +ak +ak No rz rz @@ -42112,15 +42101,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH UX VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -42230,14 +42219,14 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA -IA +ak +ak +ak No rz rz @@ -42268,11 +42257,11 @@ rz No No No -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak ba ba ba @@ -42281,12 +42270,12 @@ ba sp DQ HF -IA -IA -IA +ak +ak +ak lD -cj -cj +dk +dk cI LL Oq @@ -42294,7 +42283,7 @@ UK Xq cj cj -IA +ak No rz No @@ -42306,13 +42295,13 @@ jZ gK XJ vU -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD aU zC gK @@ -42369,15 +42358,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -42487,13 +42476,13 @@ rz rz rz No -IA -IA -IA +ak +ak +ak ba ba -IA -IA +ak +ak No No rz @@ -42523,15 +42512,15 @@ rz rz rz No -IA -IA +ak +ak Mu -IA -IA -IA +ak +ak +ak Mu -IA -IA +ak +ak ba ba ba @@ -42539,10 +42528,10 @@ ba iv Il ba -IA +ak Mu lD -cj +dk Gd zR FB @@ -42551,7 +42540,7 @@ QQ UK mk cj -IA +ak No rz No @@ -42562,15 +42551,15 @@ gK gK gK Bk -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD yJ gK gK @@ -42626,15 +42615,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -42744,13 +42733,13 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA +ak +ak No rz rz @@ -42787,8 +42776,8 @@ cj cj cj cj -IA -IA +ak +ak ba ba ba @@ -42808,7 +42797,7 @@ UK UK AS cj -IA +ak No rz No @@ -42819,15 +42808,15 @@ gK gK MI Bk -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD yJ MI gK @@ -42883,15 +42872,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -43001,13 +42990,13 @@ rz rz rz No -IA +ak iO ba ba ba -IA -IA +ak +ak No rz rz @@ -43044,19 +43033,19 @@ qt ws NM cj -IA -IA -IA +ak +ak +ak ba ba ba iv ba ba -IA +ak Mu lD -cj +dk Gt UK GQ @@ -43065,7 +43054,7 @@ UK UK Gs cj -IA +ak No rz No @@ -43076,15 +43065,15 @@ gK gK oX kJ -Zv -Zv -Zv +KD +KD +KD Jh mF eO -Zv -Zv -Zv +KD +KD +KD QP oX gK @@ -43140,15 +43129,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -43258,12 +43247,12 @@ rz rz rz No -IA -IA +ak +ak ba Wj -IA -IA +ak +ak No No rz @@ -43302,19 +43291,19 @@ LL Uo cj rw -IA -IA +ak +ak ba ba ba iv ba ba -IA -IA +ak +ak lD -cj -cj +dk +dk Sx UK UK @@ -43322,7 +43311,7 @@ UK lM cj cj -IA +ak No rz No @@ -43333,15 +43322,15 @@ gK gK TK kJ -Zv -Zv -Zv +KD +KD +KD QP qz kJ -Zv -Zv -Zv +KD +KD +KD QP dr gK @@ -43397,15 +43386,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -43515,12 +43504,12 @@ rz rz No No -IA -IA +ak +ak ba ba -IA -IA +ak +ak No rz rz @@ -43559,27 +43548,27 @@ xo EL cj rw -IA -IA +ak +ak ba ba ba iv ba ba -IA -IA +ak +ak lD -IA -cj -cj +ak +dk +dk EC vO MP cj cj -IA -IA +ak +ak No rz No @@ -43590,15 +43579,15 @@ gK gK oX kJ -Zv -Zv -Zv +KD +KD +KD Qh Up Dq -Zv -Zv -Zv +KD +KD +KD QP oX gK @@ -43654,15 +43643,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE rO Yr @@ -43771,13 +43760,13 @@ rz rz rz No -IA -IA -IA +ak +ak +ak ba ba -IA -IA +ak +ak No rz rz @@ -43816,7 +43805,7 @@ UK EZ cj rw -IA +ak ba ba ba @@ -43825,18 +43814,18 @@ iv FL ba ba -IA +ak lD at -IA +ak +dk cj cj cj cj -cj -IA +ak Mu -IA +ak No rz No @@ -43847,15 +43836,15 @@ gK gK MI Bk -Zv -Zv -Zv -Zv +KD +KD +KD +KD rp -Zv -Zv -Zv -Zv +KD +KD +KD +KD yJ MI gK @@ -43911,15 +43900,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Vs fj Yr @@ -44028,12 +44017,12 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA +ak iO No rz @@ -44064,7 +44053,7 @@ rz rz rz No -IA +ak ca ec AX @@ -44073,7 +44062,7 @@ UK uk cj rw -IA +ak ba ba ba @@ -44089,11 +44078,11 @@ If If If If -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak No rz No @@ -44104,15 +44093,15 @@ gK yV gK Bk -Zv -Zv -Zv -Zv +KD +KD +KD +KD rp -Zv -Zv -Zv -Zv +KD +KD +KD +KD yJ gK gK @@ -44168,15 +44157,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Tm fj Yr @@ -44285,13 +44274,13 @@ rz rz rz No -IA -IA +ak +ak WB ba ba -IA -IA +ak +ak No rz rz @@ -44321,7 +44310,7 @@ rz rz rz No -IA +ak ca vp Iw @@ -44343,14 +44332,14 @@ ba iv ba Mu -IA +ak TP TP -IA +ak Mu -IA -IA -IA +ak +ak +ak No rz No @@ -44362,13 +44351,13 @@ gK gK Tr vZ -Zv -Zv -Zv +KD +KD +KD rp -Zv -Zv -Zv +KD +KD +KD Ym bI gK @@ -44542,13 +44531,13 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA +ak +ak No rz rz @@ -44578,7 +44567,7 @@ rz rz rz No -IA +ak ca ec AX @@ -44599,15 +44588,15 @@ ba ba iv nz +dk +dk +dk +dk cj cj cj -cj -cj -cj -cj -IA -IA +ak +ak No rz rz @@ -44621,9 +44610,9 @@ gK Tr Fh vZ -Zv +KD rp -Zv +KD Ym Fh bI @@ -44682,15 +44671,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD fj fj Yr @@ -44799,13 +44788,13 @@ rz rz No No -IA -IA +ak +ak ba ba ba -IA -IA +ak +ak No rz rz @@ -44835,7 +44824,7 @@ rz rz rz No -IA +ak ca vp Iw @@ -44856,15 +44845,15 @@ iv iv iv nz -cj +dk AK Hh Ow SB mO cj -IA -IA +ak +ak No rz rz @@ -44939,15 +44928,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Vs fj Yr @@ -45055,13 +45044,13 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA +ak +ak No No rz @@ -45092,12 +45081,12 @@ rz rz rz No -IA +ak ca ec AX UK -xo +UK CG sV HE @@ -45113,15 +45102,15 @@ Fq Hf iv nz -cj +dk IS rg -DB +UK Zy Al cj -IA -IA +ak +ak No rz rz @@ -45196,15 +45185,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE aN Yr @@ -45312,13 +45301,13 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA +ak +ak No rz rz @@ -45349,12 +45338,12 @@ rz rz rz No -IA +ak ca vp Iw Iw -LL +UK qi cj Tb @@ -45374,11 +45363,11 @@ sV bR KG LL -UK +PB Ji cj -IA -IA +ak +ak No rz rz @@ -45453,15 +45442,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -45569,13 +45558,13 @@ rz rz rz No -IA -IA +ak +ak ba ba -IA -IA -IA +ak +ak +ak No rz rz @@ -45606,7 +45595,7 @@ rz rz rz No -IA +ak ca gM nQ @@ -45618,7 +45607,7 @@ Tb ba ba ba -IA +ak Fw Fq Fq @@ -45630,12 +45619,12 @@ Qu dC mf FB -UK -UK +mx +PB QI cj -IA -IA +ak +ak No rz rz @@ -45710,15 +45699,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE ID Yr @@ -45826,13 +45815,13 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA +ak +ak No rz rz @@ -45875,24 +45864,24 @@ Tb ba ba ba -IA +ak Gv Fq Fq Fq Fq Hf -IA +ak nz -cj +dk yz Lv Lv mf SN cj -IA -IA +ak +ak No rz rz @@ -45967,15 +45956,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -46083,13 +46072,13 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA +ak +ak No rz rz @@ -46132,23 +46121,23 @@ rZ ba ba ba -IA +ak Yr kN Cr kN Cr Yr -IA +ak nz -cj +dk Fk LV Qi Ul TU cj -IA +ak No No rz @@ -46224,15 +46213,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE fZ Yr @@ -46340,13 +46329,13 @@ rz rz No No -IA +ak kg ba ba ba -IA -IA +ak +ak No rz rz @@ -46380,32 +46369,32 @@ rz rz No No -IA -IA +ak +ak ba ba ba ba ba ba -IA -IA +ak +ak ts kN UL UL kN ts -IA +ak lD +dk +dk +dk +dk cj cj cj -cj -cj -cj -cj -IA +ak No rz rz @@ -46481,15 +46470,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -46596,14 +46585,14 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA -IA +ak +ak +ak No rz rz @@ -46637,23 +46626,23 @@ rz rz rz No -IA -IA -IA +ak +ak +ak ba ba ba -IA -IA -IA -IA +ak +ak +ak +ak ts jO UL UL DJ ts -IA +ak QC vm If @@ -46661,8 +46650,8 @@ If If If vm -IA -IA +ak +ak No rz rz @@ -46738,15 +46727,15 @@ rz rz No Yr -Zv -Zv +KD +KD eA Xa Xa Xa eA -Zv -Zv +KD +KD eE mm Yr @@ -46853,14 +46842,14 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA -IA +ak +ak +ak No rz rz @@ -46894,32 +46883,32 @@ rz rz rz No -IA -IA -IA -IA +ak +ak +ak +ak ba ba -IA -IA -IA -IA +ak +ak +ak +ak ts kN UL UL kN ts -IA -IA -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak +ak +ak No rz rz @@ -46995,15 +46984,15 @@ rz rz No Yr -Zv -Zv +KD +KD nF hO SM Eo nF -wa -wa +dR +dR cC fZ Yr @@ -47110,13 +47099,13 @@ rz rz rz No -IA -IA +ak +ak ba ba -IA +ak kg -IA +ak No No rz @@ -47153,11 +47142,11 @@ rz No No No -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak Ds ts ts @@ -47170,12 +47159,12 @@ Yr ts ts Yr -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak No No rz @@ -47252,15 +47241,15 @@ rz rz No uI -Zv -Zv +KD +KD bv SM br SM bv -TJ -TJ +Th +Th Ve Ve he @@ -47367,13 +47356,13 @@ rz rz rz No -IA -IA +ak +ak ba ba -IA -IA -IA +ak +ak +ak No rz rz @@ -47410,10 +47399,10 @@ rz rz rz No -IA -IA -IA -IA +ak +ak +ak +ak Yr Yr kN @@ -47428,10 +47417,10 @@ kN kN Yr Yr -IA -IA -IA -IA +ak +ak +ak +ak No No rz @@ -47510,14 +47499,14 @@ rz No Yr WU -Zv +KD nF oa SM yD nF -TJ -TJ +Th +Th vy Ve he @@ -47624,12 +47613,12 @@ rz rz rz No -IA +ak iO ba ba -IA -IA +ak +ak No No rz @@ -47668,8 +47657,8 @@ rz rz No No -IA -IA +ak +ak Yr Yr kH @@ -47686,9 +47675,9 @@ kN kH Yr Yr -IA -IA -IA +ak +ak +ak No rz rz @@ -47766,15 +47755,15 @@ rz rz No Yr -Zv -Zv +KD +KD Xa pX nj sf Xa -Od -Od +MR +MR yT fZ Yr @@ -47881,12 +47870,12 @@ rz rz rz No -IA -IA +ak +ak ba WB -IA -IA +ak +ak No rz rz @@ -48023,15 +48012,15 @@ rz rz No Yr -Zv -Zv +KD +KD Xa pX nj SM Xa -Zv -Zv +KD +KD eE Ve Yr @@ -48138,12 +48127,12 @@ rz rz rz No -IA -IA +ak +ak ba ba -IA -IA +ak +ak No rz rz @@ -48280,15 +48269,15 @@ rz rz No Yr -Zv -Zv +KD +KD Xa pX nj SM Xa -Zv -Zv +KD +KD eE Ve Yr @@ -48395,12 +48384,12 @@ rz rz rz No -IA +ak ba ba ba -IA -IA +ak +ak No rz rz @@ -48537,15 +48526,15 @@ rz rz No Yr -Zv -Zv +KD +KD Xa ik nj SM Xa -Zv -Zv +KD +KD DK fZ Yr @@ -48652,12 +48641,12 @@ rz rz rz No -IA +ak ba ba ba -IA -IA +ak +ak No rz rz @@ -48681,8 +48670,8 @@ rz rz No No -zE -zE +lV +lV kH kN kN @@ -48794,15 +48783,15 @@ rz rz No Yr -Zv -Zv +KD +KD Xa pX nj Lx Xa -Zv -Zv +KD +KD eE Ve Yr @@ -48909,12 +48898,12 @@ rz rz rz No -IA -IA +ak +ak ba ba -IA -IA +ak +ak No rz rz @@ -49051,15 +49040,15 @@ rz rz No Yr -Zv -Zv +KD +KD nF SA SM kj nF -Zv -Zv +KD +KD eE Ve Yr @@ -49166,12 +49155,12 @@ rz rz rz No -IA +ak kg ba ba -IA -IA +ak +ak No rz rz @@ -49195,9 +49184,9 @@ rz rz No Yr -zE +lV +kN kN -Sv kN kN Yr @@ -49249,11 +49238,11 @@ eq kN kN Cl -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD ZL Wf kN @@ -49308,15 +49297,15 @@ rz rz No Yr -Zv -Zv +KD +KD eA Xa Xa Xa eA -Zv -Zv +KD +KD eE Br Yr @@ -49423,12 +49412,12 @@ rz rz rz No -IA -IA +ak +ak ba ba -IA -IA +ak +ak No No rz @@ -49506,12 +49495,12 @@ st Np Np sI -Zv +KD lF lF lF -Zv -Zv +KD +KD Ny kN Xh @@ -49565,15 +49554,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE fZ Yr @@ -49680,13 +49669,13 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA +ak +ak No rz rz @@ -49763,7 +49752,7 @@ kh Nt gK Zx -Zv +KD lF GK lF @@ -49822,15 +49811,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD eE Ve Yr @@ -49937,13 +49926,13 @@ rz rz rz No -IA +ak jr ba ba ba -IA -IA +ak +ak No rz rz @@ -50020,12 +50009,12 @@ pA uy uy xi -Zv +KD lF lF lF -Zv -Zv +KD +KD Ny kN FK @@ -50079,15 +50068,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH Cu VF -Zv -Zv -Zv +KD +KD +KD kk UF Yr @@ -50195,12 +50184,12 @@ rz rz No No -IA -IA +ak +ak ba ba ba -IA +ak No rz rz @@ -50277,11 +50266,11 @@ kN kN kN Cl -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD UW IF kN @@ -50452,8 +50441,8 @@ rz rz rz No -IA -IA +ak +ak ba ba ba @@ -50593,15 +50582,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No No @@ -50709,12 +50698,12 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA +ak No rz rz @@ -50850,15 +50839,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -50966,12 +50955,12 @@ rz rz rz No -IA -IA +ak +ak ba ba -IA -IA +ak +ak No No rz @@ -51107,15 +51096,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -51223,13 +51212,13 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA +ak +ak No No rz @@ -51364,15 +51353,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -51480,14 +51469,14 @@ rz rz rz No -IA -IA +ak +ak ba ba ba -IA -IA -IA +ak +ak +ak No No rz @@ -51621,15 +51610,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -51736,16 +51725,16 @@ rz rz rz No -IA -IA -IA -IA +ak +ak +ak +ak ba ba ba -IA -IA -IA +ak +ak +ak No rz No @@ -51878,15 +51867,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -51993,16 +51982,16 @@ rz rz rz No -IA -IA -IA -IA +ak +ak +ak +ak ba ba ba -IA +ak jr -IA +ak No rz No @@ -52135,15 +52124,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -52250,16 +52239,16 @@ rz rz rz No -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak ba ba -IA -IA -IA +ak +ak +ak No rz No @@ -52392,15 +52381,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -52507,16 +52496,16 @@ rz rz rz No -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak ba ba -IA -IA -IA +ak +ak +ak No rz No @@ -52649,15 +52638,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -52763,17 +52752,17 @@ rz rz rz No -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak ba ba -IA -IA -IA +ak +ak +ak No rz No @@ -52906,15 +52895,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -53020,16 +53009,16 @@ rz rz rz No -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak ba ba ba -IA +ak hv No rz @@ -53163,15 +53152,15 @@ rz rz No hK -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -53277,17 +53266,17 @@ rz rz rz No -IA -IA +ak +ak hv -IA -IA -IA +ak +ak +ak ba ba ba -IA -IA +ak +ak No rz No @@ -53421,14 +53410,14 @@ rz No Yr WU -Zv -Zv +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -53533,18 +53522,18 @@ rz rz rz No -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak ba ba ba -IA -IA +ak +ak No rz No @@ -53677,15 +53666,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -53790,18 +53779,18 @@ rz rz rz No -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak jr -IA -IA +ak +ak ba ba -IA -IA +ak +ak No No No @@ -53934,15 +53923,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -54047,19 +54036,19 @@ rz rz rz No -IA -IA -IA -IA +ak +ak +ak +ak iO -IA -IA +ak +ak ba ba ba -IA -IA -IA +ak +ak +ak No No Yr @@ -54191,15 +54180,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -54304,19 +54293,19 @@ rz rz rz No -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak ba ba ba -IA -IA -IA +ak +ak +ak No No Yr @@ -54448,15 +54437,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -54561,19 +54550,19 @@ rz rz rz No -IA +ak iO iO -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak ba ba -IA -IA -IA +ak +ak +ak No No Yr @@ -54705,15 +54694,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -54818,19 +54807,19 @@ rz rz rz No -IA -IA -IA -IA +ak +ak +ak +ak FQ -IA -IA -IA +ak +ak +ak ba ba -IA +ak FQ -IA +ak No No Yr @@ -54962,15 +54951,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -55075,19 +55064,19 @@ rz rz rz No -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak ba ba -IA -IA -IA +ak +ak +ak No No fj @@ -55219,15 +55208,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -55332,19 +55321,19 @@ rz rz rz No -IA +ak iO iO iO -IA +ak iO -IA -IA +ak +ak ba ba -IA +ak jr -IA +ak No No fj @@ -55476,15 +55465,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH QM VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -55589,19 +55578,19 @@ rz rz rz No -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak ba ba -IA -IA -IA +ak +ak +ak No No fj @@ -55733,15 +55722,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH UX VF -Zv -Zv -Zv +KD +KD +KD Yr No rz @@ -55846,19 +55835,19 @@ rz rz rz No -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak ba ba -IA -IA -IA +ak +ak +ak No No fj @@ -55990,15 +55979,15 @@ rz rz No Yr -Zv -Zv -Zv +KD +KD +KD VH WZ VF -Zv -Zv -Zv +KD +KD +KD Yr No No @@ -56122,9 +56111,9 @@ fj fj fj oO -IA -IA -IA +ak +ak +ak HS HS fj @@ -56379,11 +56368,11 @@ fj fj fj oO -IA +ak es -IA -IA -IA +ak +ak +ak fj fj fj @@ -57430,7 +57419,7 @@ UL UL mG Qv -aZ +Qv pC pC pC @@ -60772,7 +60761,7 @@ Yr Fq Yr Ve -ja +UY UY Ve Yr @@ -61543,7 +61532,7 @@ fj fj Yr fd -kN +zE kN kN Yr @@ -63723,25 +63712,25 @@ rz rz No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -63980,25 +63969,25 @@ rz rz No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -64237,25 +64226,25 @@ rz rz No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -64494,25 +64483,25 @@ rz rz No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -64751,25 +64740,25 @@ rz rz No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -65008,25 +64997,25 @@ rz rz No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -65265,25 +65254,25 @@ rz rz No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -65522,25 +65511,25 @@ rz rz No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -65779,25 +65768,25 @@ rz rz No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD eA Xa Xa Xa eA -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -66036,25 +66025,25 @@ rz rz No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD tY -wa -wa +dR +dR nF hO Xu kj nF -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -66293,25 +66282,25 @@ No No No Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD Hg -TJ -TJ +Th +Th bv SM SM SM Xa -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -66554,21 +66543,21 @@ Yr Yr Pg tE -Zv -Zv -Zv +KD +KD +KD Hg -TJ -TJ +Th +Th nF oa SM SM Xa -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -66809,23 +66798,23 @@ LA UK UK nT -TJ -TJ -wa -wa -wa +Th +Th +dR +dR +dR gj -TJ -TJ +Th +Th Xa on JS SM Xa -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -67066,23 +67055,23 @@ CL CL CL nT -TJ -TJ -TJ -TJ -TJ -TJ -TJ -TJ +Th +Th +Th +Th +Th +Th +Th +Th Xa on JS SM Xa -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -67323,23 +67312,23 @@ UK UK UK nT -TJ -TJ -Od -Od -Od +Th +Th +MR +MR +MR NO -TJ -TJ +Th +Th Xa on JS SM Xa -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -67580,23 +67569,23 @@ ts ts Yr Yr -TJ +Th Wk -Zv -Zv -Zv +KD +KD +KD Hg -TJ -TJ +Th +Th Xa on JS SM Xa -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -67839,21 +67828,21 @@ yR Yr Va Wk -Zv -Zv -Zv +KD +KD +KD Hg -TJ -TJ +Th +Th Xa on JS SM Xa -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -68094,23 +68083,23 @@ LW LW LW fW -Od +MR Qq -Zv -Zv -Zv +KD +KD +KD jt -Od -Od +MR +MR nF SA SM kj nF -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -68351,23 +68340,23 @@ LW LW yR Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD eA Xa Xa Xa eA -Zv -Zv -Zv -Zv +KD +KD +KD +KD Yr No rz @@ -68608,23 +68597,23 @@ rI Yr Yr Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD Zv VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -68863,25 +68852,25 @@ Yr Eq Yr Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -69120,25 +69109,25 @@ PV PV PV Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -69231,7 +69220,7 @@ hi Yr No Yr -Bu +WA UL Zc UL @@ -69377,25 +69366,25 @@ PV PV PV Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -69599,7 +69588,7 @@ lZ Ly ts Ms -jc +nM mY Yr Du @@ -69634,25 +69623,25 @@ RK PV PV Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -69891,25 +69880,25 @@ PV PV PV Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -70148,25 +70137,25 @@ Yr Eq Yr Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -70405,25 +70394,25 @@ PV PV PV Yr -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD +KD VH QM VF -Zv -Zv -Zv -Zv -Zv +KD +KD +KD +KD +KD Yr No rz @@ -71266,7 +71255,7 @@ Ve ct XS Ve -Ve +DB kD jh jh @@ -71898,10 +71887,10 @@ bP sP tB tB -rM +tB sP mj -jc +nM Jm Yr Yr @@ -72411,7 +72400,7 @@ Hl bP UJ Yr -ly +nM Yr QS Hl @@ -72673,7 +72662,7 @@ sP sP Hl xp -HJ +Jm Yr fz bL @@ -73048,7 +73037,7 @@ rz rz No No -No +aZ Yr cS cS @@ -73434,7 +73423,7 @@ Wy Bp sP sP -Bp +sP xZ sP sP @@ -74376,16 +74365,16 @@ rz rz No Yr -IA +ak Mz -IA -IA +ak +ak ez -IA +ak kg -IA +ak jr -IA +ak Yr No No @@ -74634,15 +74623,15 @@ rz No Yr kg -IA -IA -IA -IA -IA -IA -IA -IA -IA +ak +ak +ak +ak +ak +ak +ak +ak +ak Yr No rz @@ -74890,15 +74879,15 @@ rz rz No Yr -IA +ak IE -IA +ak kg -IA +ak Ti -IA +ak BW -IA +ak kg Yr No diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index dc9bab99cf9..f037406dbfe 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -94,6 +94,8 @@ ignore += typesof(/obj/structure/biohazard_blob) //Unused - not supposed to be spawned without SSliquids ignore += typesof(/turf/open/openspace/ocean) + //Baseturf editors can only go up to ten, stop this. + ignore += typesof(/obj/effect/baseturf_helper) //SKYRAT EDIT END var/list/cached_contents = spawn_at.contents.Copy() diff --git a/modular_skyrat/modules/awaymissions_skyrat/icons/ballistic.dmi b/modular_skyrat/modules/awaymissions_skyrat/icons/ballistic.dmi new file mode 100644 index 00000000000..f09599eb4dc Binary files /dev/null and b/modular_skyrat/modules/awaymissions_skyrat/icons/ballistic.dmi differ diff --git a/modular_skyrat/modules/awaymissions_skyrat/icons/ballistic_l.dmi b/modular_skyrat/modules/awaymissions_skyrat/icons/ballistic_l.dmi new file mode 100644 index 00000000000..7af63f7acb9 Binary files /dev/null and b/modular_skyrat/modules/awaymissions_skyrat/icons/ballistic_l.dmi differ diff --git a/modular_skyrat/modules/awaymissions_skyrat/icons/ballistic_r.dmi b/modular_skyrat/modules/awaymissions_skyrat/icons/ballistic_r.dmi new file mode 100644 index 00000000000..7c55d7b434d Binary files /dev/null and b/modular_skyrat/modules/awaymissions_skyrat/icons/ballistic_r.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 new file mode 100644 index 00000000000..444d31741c1 --- /dev/null +++ b/modular_skyrat/modules/black_mesa/code/armaments/__armament_bodyarmor.dm @@ -0,0 +1,61 @@ + +/datum/armament_entry/hecu/bodyarmor + category = "Armor Kit" + category_item_limit = 4 + +/datum/armament_entry/hecu/bodyarmor/normal + name = "Basic Armor Kit" + description = "Contains a set of two basic armor pieces, meant to moderately protect your body against everything." + item_type = /obj/item/storage/box/armor_set/normal + max_purchase = 4 + cost = 6 + +/datum/armament_entry/hecu/bodyarmor/bulletproof + name = "Bulletproof Armor Kit" + description = "Contains a set of two bulletproof armor pieces, meant to greatly protect your body against bullets and explosives." + item_type = /obj/item/storage/box/armor_set/bulletproof + max_purchase = 4 + cost = 10 + +/datum/armament_entry/hecu/bodyarmor/pcv + name = "PCV Kit" + 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 + +/obj/item/storage/box/armor_set + name = "box of armor" + desc = "Box full of armor. Amazing." + icon_state = "box" + illustration = null + +/obj/item/storage/box/armor_set/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.set_holdable(list(/obj/item/clothing/suit/armor,/obj/item/clothing/suit/space/hev_suit/pcv,/obj/item/clothing/head/helmet)) + STR.max_items = 2 + +/obj/item/storage/box/armor_set/normal + name = "basic armor set" + 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) + +/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) + +/obj/item/storage/box/armor_set/pcv + name = "PCV Mk. II armor set" + desc = "Box containing a PCV Mark II armor vest and helmet." + +/obj/item/storage/box/armor_set/pcv/PopulateContents() + new /obj/item/clothing/suit/space/hev_suit/pcv(src) + new /obj/item/clothing/head/helmet/space/hev_suit/pcv(src) diff --git a/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm b/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm new file mode 100644 index 00000000000..58736e8a053 --- /dev/null +++ b/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm @@ -0,0 +1,69 @@ +#define ARMAMENT_SUBCATEGORY_SHOTGUN "Shotguns" + +/datum/armament_entry/hecu/primary + category = ARMAMENT_CATEGORY_PRIMARY + category_item_limit = 4 + slot_to_equip = ITEM_SLOT_SUITSTORE + cost = 10 + +/datum/armament_entry/hecu/primary/submachinegun + subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN + mags_to_spawn = 4 + +/datum/armament_entry/hecu/primary/submachinegun/p90 + item_type = /obj/item/gun/ballistic/automatic/p90 + max_purchase = 4 + cost = 7 + +/datum/armament_entry/hecu/primary/submachinegun/mp5 + item_type = /obj/item/gun/ballistic/automatic/mp5 + max_purchase = 4 + cost = 7 + +/datum/armament_entry/hecu/primary/assaultrifle + subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE + mags_to_spawn = 3 + +/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 + +/datum/armament_entry/hecu/primary/shotgun + subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN + mags_to_spawn = 1 + +/datum/armament_entry/hecu/primary/shotgun/shotgun_highcap + item_type = /obj/item/gun/ballistic/shotgun/m23 + max_purchase = 2 + cost = 5 + magazine = /obj/item/storage/box/ammo_box/shotgun_12g + magazine_cost = 4 + +/datum/armament_entry/hecu/primary/shotgun/autoshotgun_pump + item_type = /obj/item/gun/ballistic/shotgun/automatic/as2 + max_purchase = 1 + cost = 7 + magazine = /obj/item/storage/box/ammo_box/shotgun_12g + magazine_cost = 4 + +/datum/armament_entry/hecu/primary/special + subcategory = ARMAMENT_SUBCATEGORY_SPECIAL + mags_to_spawn = 2 + +/datum/armament_entry/hecu/primary/special/sniper_rifle + item_type = /obj/item/gun/ballistic/automatic/cfa_rifle + max_purchase = 1 + cost = 15 + +/obj/item/storage/box/ammo_box/shotgun_12g + +/obj/item/storage/box/ammo_box/shotgun_12g/PopulateContents() + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g/slug(src) + new /obj/item/ammo_box/magazine/m12g/slug(src) + new /obj/item/ammo_box/magazine/m12g/slug(src) + new /obj/item/ammo_box/magazine/m12g/dragon(src) diff --git a/modular_skyrat/modules/black_mesa/code/armaments/_armaments_secondary.dm b/modular_skyrat/modules/black_mesa/code/armaments/_armaments_secondary.dm new file mode 100644 index 00000000000..57d9c657cd2 --- /dev/null +++ b/modular_skyrat/modules/black_mesa/code/armaments/_armaments_secondary.dm @@ -0,0 +1,23 @@ +// SECONDARY WEAPONS +/datum/armament_entry/hecu/secondary + category = ARMAMENT_CATEGORY_SECONDARY + category_item_limit = 4 + cost = 5 + mags_to_spawn = 2 + +/datum/armament_entry/hecu/secondary/pistol + subcategory = ARMAMENT_SUBCATEGORY_PISTOL + +/datum/armament_entry/hecu/secondary/pistol/m1911 + item_type = /obj/item/gun/ballistic/automatic/pistol/m1911 + max_purchase = 4 + +/datum/armament_entry/hecu/secondary/pistol/glock + item_type = /obj/item/gun/ballistic/automatic/pistol/g17/mesa + 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 diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_explosives.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_explosives.dm new file mode 100644 index 00000000000..49b75762575 --- /dev/null +++ b/modular_skyrat/modules/black_mesa/code/armaments/armament_explosives.dm @@ -0,0 +1,28 @@ +/datum/armament_entry/hecu/explosives + category = ARMAMENT_CATEGORY_EXPLOSIVES + category_item_limit = 16 + +/datum/armament_entry/hecu/explosives/frag + item_type = /obj/item/grenade/frag + max_purchase = 8 + cost = 3 + +/datum/armament_entry/hecu/explosives/flashbang + item_type = /obj/item/grenade/flashbang + max_purchase = 8 + cost = 2 + +/datum/armament_entry/hecu/explosives/smoke + item_type = /obj/item/grenade/smokebomb + max_purchase = 8 + cost = 1 + +/datum/armament_entry/hecu/explosives/mine + item_type = /obj/item/minespawner/explosive + max_purchase = 8 + cost = 1 + +/datum/armament_entry/hecu/explosives/c4 + item_type = /obj/item/grenade/c4 + max_purchase = 3 + cost = 3 diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_medical.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_medical.dm new file mode 100644 index 00000000000..5c106532baf --- /dev/null +++ b/modular_skyrat/modules/black_mesa/code/armaments/armament_medical.dm @@ -0,0 +1,79 @@ +/datum/armament_entry/hecu/medical + category = ARMAMENT_CATEGORY_MEDICAL + category_item_limit = 20 + +/datum/armament_entry/hecu/medical/defib + item_type = /obj/item/defibrillator/loaded + max_purchase = 1 + cost = 4 + +/datum/armament_entry/hecu/medical/medkit + subcategory = ARMAMENT_SUBCATEGORY_MEDKIT + +/datum/armament_entry/hecu/medical/medkit/basic + item_type = /obj/item/storage/medkit/regular + max_purchase = 3 + cost = 3 + +/datum/armament_entry/hecu/medical/medkit/brute + item_type = /obj/item/storage/medkit/brute + max_purchase = 2 + cost = 3 + +/datum/armament_entry/hecu/medical/medkit/toxin + item_type = /obj/item/storage/medkit/toxin + max_purchase = 1 + cost = 3 + +/datum/armament_entry/hecu/medical/medkit/fire + item_type = /obj/item/storage/medkit/fire + max_purchase = 1 + cost = 3 + +/datum/armament_entry/hecu/medical/medkit/o2 + item_type = /obj/item/storage/medkit/o2 + max_purchase = 1 + cost = 3 + +/datum/armament_entry/hecu/medical/medkit/expeditionary + item_type = /obj/item/storage/medkit/expeditionary + max_purchase = 1 + cost = 5 + +/datum/armament_entry/hecu/medical/injector + subcategory = ARMAMENT_SUBCATEGORY_INJECTOR + +/datum/armament_entry/hecu/medical/injector/bloodloss + item_type = /obj/item/reagent_containers/hypospray/medipen/blood_loss + max_purchase = 4 + cost = 1 + +/datum/armament_entry/hecu/medical/injector/atropine + item_type = /obj/item/reagent_containers/hypospray/medipen/atropine + max_purchase = 4 + cost = 1 + +/datum/armament_entry/hecu/medical/injector/salacid + item_type = /obj/item/reagent_containers/hypospray/medipen/salacid + 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/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 + +/datum/armament_entry/hecu/medical/injector/bag + item_type = /obj/item/storage/bag/medpens + max_purchase = 2 + cost = 4 diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_melee.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_melee.dm new file mode 100644 index 00000000000..ae8caacef87 --- /dev/null +++ b/modular_skyrat/modules/black_mesa/code/armaments/armament_melee.dm @@ -0,0 +1,23 @@ +/datum/armament_entry/hecu/melee + category = ARMAMENT_CATEGORY_MELEE + category_item_limit = 4 + +/datum/armament_entry/hecu/melee/lethal + subcategory = ARMAMENT_SUBCATEGORY_MELEE_LETHAL + +/datum/armament_entry/hecu/melee/lethal/combat_knife + item_type = /obj/item/knife/combat + max_purchase = 4 + cost = 3 + +/datum/armament_entry/hecu/melee/nonlethal + subcategory = ARMAMENT_SUBCATEGORY_MELEE_NONLETHAL + +/datum/armament_entry/hecu/melee/nonlethal/baton + item_type = /obj/item/melee/baton + max_purchase = 4 + cost = 5 + +/datum/armament_entry/hecu/melee/nonlethal/kravmaga + item_type = /obj/item/clothing/gloves/krav_maga/combatglovesplus + cost = 12 diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_miscellaneous.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_miscellaneous.dm new file mode 100644 index 00000000000..ad51ba64056 --- /dev/null +++ b/modular_skyrat/modules/black_mesa/code/armaments/armament_miscellaneous.dm @@ -0,0 +1,48 @@ +/datum/armament_entry/hecu/misc + category = "Misc. Equipment" + category_item_limit = 24 + +/datum/armament_entry/hecu/misc/cigarettes + item_type = /obj/item/storage/fancy/cigarettes/cigpack_syndicate + max_purchase = 2 + cost = 1 + +/datum/armament_entry/hecu/misc/zippo + item_type = /obj/item/lighter + max_purchase = 1 + cost = 1 + +/datum/armament_entry/hecu/misc/rollie + item_type = /obj/item/clothing/mask/cigarette/rollie/cannabis + max_purchase = 8 + cost = 1 + +/datum/armament_entry/hecu/misc/pizza + item_type = /obj/item/food/pizza/margherita + max_purchase = 3 + cost = 1 + +/datum/armament_entry/hecu/misc/mre + item_type = /obj/item/storage/box/hecu_rations + max_purchase = 6 + cost = 1 + +/datum/armament_entry/hecu/misc/guitar + item_type = /obj/item/instrument/guitar + max_purchase = 1 + cost = 1 + +/datum/armament_entry/hecu/misc/cards + item_type = /obj/item/toy/cards/deck + max_purchase = 1 + cost = 1 + +/datum/armament_entry/hecu/misc/dosh + item_type = /obj/item/stack/spacecash/c1000 + max_purchase = 8 + cost = 1 + +/datum/armament_entry/hecu/misc/whiskey + item_type = /obj/item/reagent_containers/food/drinks/bottle/whiskey + max_purchase = 2 + cost = 1 diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm new file mode 100644 index 00000000000..b70221550d9 --- /dev/null +++ b/modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm @@ -0,0 +1,62 @@ +/datum/armament_entry/hecu/utility + category = ARMAMENT_CATEGORY_UTILITY + category_item_limit = 20 + +/datum/armament_entry/hecu/utility/survival_pack + item_type = /obj/item/storage/box/nri_survival_pack + max_purchase = 4 + cost = 4 + +/datum/armament_entry/hecu/utility/pouch + item_type = /obj/item/storage/bag/ammo + max_purchase = 8 + cost = 1 + +/datum/armament_entry/hecu/utility/pouch_knives + item_type = /obj/item/storage/bag/ammo/marksman + max_purchase = 4 + cost = 3 + +/datum/armament_entry/hecu/utility/basic_tools + item_type = /obj/item/storage/toolbox/mechanical + max_purchase = 2 + cost = 2 + +/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 + +/datum/armament_entry/hecu/utility/compact_shield + item_type = /obj/item/shield/riot/tele + max_purchase = 1 + cost = 10 + +/datum/armament_entry/hecu/utility/flash_shield + item_type = /obj/item/shield/riot/flash + max_purchase = 1 + cost = 15 + +/datum/armament_entry/hecu/utility/combat_shield + item_type = /obj/item/shield/riot/pointman/hecu + max_purchase = 1 + cost = 25 + +/datum/armament_entry/hecu/utility/zipties + item_type = /obj/item/storage/box/zipties + max_purchase = 1 + cost = 3 + +/datum/armament_entry/hecu/utility/jammer + name = "Radio Jammer" + description = "When activated, this cell powered device will block all outgoing radio communication." + item_type = /obj/item/jammer + max_purchase = 1 + cost = 4 + +/datum/armament_entry/hecu/utility/suppressor + item_type = /obj/item/suppressor + max_purchase = 4 + cost = 4 diff --git a/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm b/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm new file mode 100644 index 00000000000..6bea0bd027a --- /dev/null +++ b/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm @@ -0,0 +1,19 @@ +// VENDOR +/obj/machinery/armament_station/hecu + required_access = list(ACCESS_AWAY_SEC) + + armament_type = /datum/armament_entry/hecu + +// ARMAMENT ENTRIES + +/datum/armament_entry/hecu + var/mags_to_spawn = 5 + +/datum/armament_entry/hecu/after_equip(turf/safe_drop_location, obj/item/item_to_equip) + if(istype(item_to_equip, /obj/item/gun/ballistic)) + var/obj/item/gun/ballistic/spawned_ballistic_gun = item_to_equip + if(spawned_ballistic_gun.magazine && !istype(spawned_ballistic_gun.magazine, /obj/item/ammo_box/magazine/internal)) + var/obj/item/storage/box/ammo_box/spawned_box = new(safe_drop_location) + spawned_box.name = "ammo box - [spawned_ballistic_gun.name]" + for(var/i in 1 to mags_to_spawn) + new spawned_ballistic_gun.mag_type (spawned_box) diff --git a/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm b/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm index 9c88b06a1b5..398bb1a7314 100644 --- a/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm +++ b/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm @@ -63,8 +63,8 @@ prompt_name = "a tactical squad member" outfit = /datum/outfit/hecu you_are_text = "You are an elite tactical squad 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. 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, if any, 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 = "Do not try to explore the level unless Vanguard is dead. Stay around your area. Allowed races are humans and IPCs." + flavour_text = "You and four other marines have been selected for a guard duty near one of the Black Mesa's entrances. 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 = "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/item/clothing/under/rank/security/officer/hecu @@ -82,6 +82,7 @@ icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi' worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi' icon_state = "hecu_pack" + worn_icon_state = "hecu_pack" uses_advanced_reskins = TRUE unique_reskin = list( "Olive" = list( @@ -99,6 +100,7 @@ icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi' worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi' icon_state = "hecu_belt" + worn_icon_state = "hecu_belt" uses_advanced_reskins = TRUE unique_reskin = list( "Olive" = list( @@ -114,29 +116,24 @@ /datum/outfit/hecu name = "HECU Grunt" uniform = /obj/item/clothing/under/rank/security/officer/hecu - head = /obj/item/clothing/head/helmet/space/hev_suit/pcv mask = /obj/item/clothing/mask/gas/hecu2 gloves = /obj/item/clothing/gloves/combat - suit = /obj/item/clothing/suit/space/hev_suit/pcv - suit_store = /obj/item/gun/ballistic/automatic/m16 belt = /obj/item/storage/belt/military/assault/hecu ears = /obj/item/radio/headset - glasses = /obj/item/clothing/glasses/hud/health/sunglasses 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/ammo_box/magazine/m16 = 3, /obj/item/storage/medkit/emergency, /obj/item/storage/box/hecu_rations, - /obj/item/gun/ballistic/automatic/pistol/g17/mesa, - /obj/item/ammo_box/magazine/multi_sprite/g17 = 2, - /obj/item/knife/combat + /obj/item/knife/combat, + /obj/item/armament_points_card/assaultops ) id = /obj/item/card/id id_trim = /datum/id_trim/hecu + skillchips = list(/obj/item/skillchip/chameleon/reload) /datum/outfit/hecu/post_equip(mob/living/carbon/human/equipped_human, visualsOnly) . = ..() diff --git a/modular_skyrat/modules/black_mesa/code/guns.dm b/modular_skyrat/modules/black_mesa/code/guns.dm index 829abf9c1f3..b8548fbe83f 100644 --- a/modular_skyrat/modules/black_mesa/code/guns.dm +++ b/modular_skyrat/modules/black_mesa/code/guns.dm @@ -1,4 +1,4 @@ -/obj/item/gun/ballistic/automatic/laser/marksman +/obj/item/gun/ballistic/automatic/laser/marksman // Cheap replacement for a gauss rifle. name = "designated marksman rifle" desc = "A special laser beam sniper rifle designed by a certain now defunct research facility." icon_state = "ctfmarksman" @@ -31,3 +31,44 @@ tracer_type = /obj/effect/projectile/tracer/solar muzzle_type = /obj/effect/projectile/muzzle/solar impact_type = /obj/effect/projectile/impact/solar + +/obj/item/gun/ballistic/automatic/mp5 + name = "\improper MP5" + desc = "An old SMG, this one is chambered in 9mm, a very common and powerful cartridge. It has Heckler & Koch etched above the magazine well." + icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' + lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' + righthand_file ='modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + icon_state = "mp5" + inhand_icon_state = "mp5" + selector_switch_icon = TRUE + mag_type = /obj/item/ammo_box/magazine/mp5 + bolt_type = BOLT_TYPE_LOCKING + can_suppress = TRUE + burst_size = 3 + fire_delay = 1.25 + spread = 2.5 + mag_display = TRUE + alt_icons = TRUE + realistic = TRUE + load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magin.ogg' + load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magin.ogg' + rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_cock.ogg' + lock_back_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltback.ogg' + eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magout.ogg' + eject_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magout.ogg' + bolt_drop_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltforward.ogg' + fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire.ogg' + alternative_fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg' + suppressed_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg' + weapon_weight = WEAPON_MEDIUM + w_class = WEIGHT_CLASS_NORMAL + +/obj/item/ammo_box/magazine/mp5 + name = "MP5 magazine (9mm)" + desc = "Magazines taking 9mm ammunition; it fits in the MP5." + icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon_state = "mp5" + ammo_type = /obj/item/ammo_casing/c9mm + caliber = CALIBER_9MM + max_ammo = 30 + multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC diff --git a/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm b/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm index f608f4463d2..53165570061 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm @@ -9,7 +9,7 @@ /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/gordon_freeman name = "\improper Gordon Freeman" - desc = "Gordon Freeman in the flesh." + desc = "Gordon Freeman in the flesh. Or in the zombified form, it seems." icon_state = "gordon_freeman" speed = -2 environment_smash = ENVIRONMENT_SMASH_RWALLS @@ -67,8 +67,6 @@ /obj/effect/sliding_puzzle/freeman reward_type = /obj/item/keycard/freeman_boss_entry - - /obj/effect/freeman_blocker name = "freeman blocker" diff --git a/modular_skyrat/modules/black_mesa/code/rationpacks.dm b/modular_skyrat/modules/black_mesa/code/rationpacks.dm index 389e0abb4ff..e7345a164fd 100644 --- a/modular_skyrat/modules/black_mesa/code/rationpacks.dm +++ b/modular_skyrat/modules/black_mesa/code/rationpacks.dm @@ -17,16 +17,19 @@ name = "MRE main course - Pork and Beans" desc = "Main course of the ancient military ration designed for ground troops. This one is pork and beans covered in some tomato sauce." tastes = list("beans" = 1, "pork" = 1, "tomato sauce" = 1) + foodtypes = MEAT | VEGETABLES /obj/item/food/mre_course/main/macaroni name = "MRE main course - Macaroni and Cheese" desc = "Main course of the ancient military ration designed for ground troops. This one is preboiled macaroni covered in some federal reserve cheese." tastes = list("cold macaroni" = 1, "bland cheese" = 1) + foodtypes = DAIRY | GRAIN /obj/item/food/mre_course/main/rice name = "MRE main course - Rice and Beef" desc = "Main course of the ancient military ration designed for ground troops. This one is rice with beef, covered in gravy." tastes = list("dense rice" = 1, "bits of beef" = 1, "gravy" = 1) + foodtypes = GRAIN | MEAT /obj/item/food/mre_course/side name = "MRE side course" @@ -37,16 +40,19 @@ name = "MRE side course - Cornbread" desc = "Side course of the ancient military ration designed for ground troops. This one is cornbread." tastes = list("cornbread" = 1) + foodtypes = GRAIN /obj/item/food/mre_course/side/pie name = "MRE side course - Meat Pie" desc = "Side course of the ancient military ration designed for ground troops. This one is some meat pie." tastes = list("pie dough" = 1, "ground meat" = 1, "Texas" = 1) + foodtypes = MEAT | GRAIN /obj/item/food/mre_course/side/chicken name = "MRE side course - Sweet 'n Sour Chicken" desc = "Side course of the ancient military ration designed for ground troops. This one is some undefined chicken-looking meat covered in cheap reddish sauce." tastes = list("bits of chicken meat" = 1, "sweet and sour sauce" = 1, "salt" = 1) + foodtypes = MEAT | FRIED /obj/item/food/mre_course/dessert name = "MRE dessert" @@ -57,16 +63,19 @@ name = "MRE dessert - Cookie" desc = "Dessert of the ancient military ration designed for ground troops. This one is a big dry cookie." tastes = list("dryness" = 1, "hard cookie" = 1, "chocolate chip" = 1) + foodtypes = GRAIN | SUGAR /obj/item/food/mre_course/dessert/cake name = "MRE dessert - Apple Pie" desc = "Dessert of the ancient military ration designed for ground troops. This one is an amorphous apple pie." tastes = list("apple" = 1, "moist cake" = 1, "sugar" = 1) + foodtypes = GRAIN | SUGAR | FRUIT /obj/item/food/mre_course/dessert/chocolate name = "MRE dessert - Dark Chocolate" desc = "Dessert of the ancient military ration designed for ground troops. This one is a dark bar of chocolate." tastes = list("vanilla" = 1, "artificial chocolate" = 1, "chemicals" = 1) + foodtypes = JUNKFOOD | SUGAR /obj/item/storage/box/hecu_rations name = "Meal, Ready-to-Eat" diff --git a/modular_skyrat/modules/black_mesa/code/turfs.dm b/modular_skyrat/modules/black_mesa/code/turfs.dm index 630d079f8a5..151a8509b81 100644 --- a/modular_skyrat/modules/black_mesa/code/turfs.dm +++ b/modular_skyrat/modules/black_mesa/code/turfs.dm @@ -13,48 +13,67 @@ name = "black mesa sand baseturf editor" baseturf = /turf/open/misc/ironsand/black_mesa +/obj/effect/baseturf_helper/black_mesa_xen + name = "xen baseturf editor" + baseturf = /turf/open/water/xen_acid + /turf/closed/indestructible/rock/xen name = "strange wall" color = "#ac3b06" + baseturfs = /turf/closed/indestructible/rock/xen /turf/open/misc/xen name = "strange weeds" desc = "It feels soft to the touch, like a carpet... only... wet." icon = 'modular_skyrat/modules/black_mesa/icons/xen_turfs.dmi' icon_state = "xen_turf" + baseturfs = /turf/open/misc/xen footstep = FOOTSTEP_GRASS barefootstep = FOOTSTEP_GRASS + planetary_atmos = TRUE /turf/open/water/beach/xen desc = "It's mirky and filled with strange organisms." name = "xen water" icon = 'modular_skyrat/modules/black_mesa/icons/xen_turfs.dmi' + baseturfs = /turf/open/water/beach/xen initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = TRUE /turf/open/misc/beach/coastline_t/xen desc = "It's mirky and filled with strange organisms." name = "xen water" icon = 'modular_skyrat/modules/black_mesa/icons/xen_turfs.dmi' + baseturfs = /turf/open/misc/beach/coastline_t/xen initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = TRUE /turf/open/misc/beach/coastline_t/sandwater_inner/xen desc = "It's mirky and filled with strange organisms." name = "xen water" icon = 'modular_skyrat/modules/black_mesa/icons/xen_turfs.dmi' + baseturfs = /turf/open/misc/beach/coastline_t/sandwater_inner/xen initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = TRUE /turf/open/misc/beach/coastline_b/xen name = "xen water" desc = "It's mirky and filled with strange organisms." icon = 'modular_skyrat/modules/black_mesa/icons/xen_turfs.dmi' + baseturfs = /turf/open/misc/beach/coastline_b/xen initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = TRUE /turf/open/misc/dirt/planet/xen name = "strange path" color = "#ee5f1c" + baseturfs = /turf/open/misc/dirt/planet/xen + planetary_atmos = TRUE /turf/open/water/xen_acid + baseturfs = /turf/open/water/xen_acid initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = TRUE color = COLOR_VIBRANT_LIME light_range = 2 light_color = COLOR_VIBRANT_LIME diff --git a/modular_skyrat/modules/black_mesa/code/weapons.dm b/modular_skyrat/modules/black_mesa/code/weapons.dm index bf24a86e387..2cb5f307605 100644 --- a/modular_skyrat/modules/black_mesa/code/weapons.dm +++ b/modular_skyrat/modules/black_mesa/code/weapons.dm @@ -19,3 +19,38 @@ /obj/item/crowbar/freeman/ultimate/Initialize(mapload) . = ..() add_filter("rad_glow", 2, list("type" = "outline", "color" = "#fbff1479", "size" = 2)) + +/obj/item/shield/riot/pointman/hecu + name = "ballistic shield" + desc = "A shield fit for those that want to sprint headfirst into the unknown! Cumbersome as hell. Repair with iron." + icon_state = "ballistic" + icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/ballistic.dmi' + worn_icon_state = "ballistic_worn" + worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/ballistic.dmi' + inhand_icon_state = "ballistic" + lefthand_file = 'modular_skyrat/modules/awaymissions_skyrat/icons/ballistic_l.dmi' + righthand_file = 'modular_skyrat/modules/awaymissions_skyrat/icons/ballistic_r.dmi' + force = 14 + throwforce = 5 + throw_speed = 1 + throw_range = 1 + block_chance = 45 + slot_flags = ITEM_SLOT_BACK + w_class = WEIGHT_CLASS_BULKY + attack_verb_continuous = list("shoves", "bashes") + attack_verb_simple = list("shove", "bash") + transparent = TRUE + max_integrity = 150 + repairable_by = /obj/item/stack/sheet/iron //what to repair the shield with + + +/obj/item/shield/riot/pointman/hecu/shatter(mob/living/carbon/human/owner) + playsound(owner, 'sound/effects/glassbr3.ogg', 100) + new /obj/item/ballistic_broken((get_turf(src))) + +/obj/item/ballistic_broken + name = "broken ballistic shield" + desc = "An unsalvageable, unrecoverable mess of armor steel and kevlar. Should've maintained it, huh?" + icon_state = "ballistic_broken" + icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/ballistic.dmi' + w_class = WEIGHT_CLASS_BULKY diff --git a/modular_skyrat/modules/black_mesa/icons/mobs.dmi b/modular_skyrat/modules/black_mesa/icons/mobs.dmi index 341e3018a8b..fdcd63ebac3 100644 Binary files a/modular_skyrat/modules/black_mesa/icons/mobs.dmi and b/modular_skyrat/modules/black_mesa/icons/mobs.dmi differ diff --git a/modular_skyrat/modules/gunsafety/code/gun_safety.dm b/modular_skyrat/modules/gunsafety/code/gun_safety.dm index bd8f7725a47..d4012fc32b7 100644 --- a/modular_skyrat/modules/gunsafety/code/gun_safety.dm +++ b/modular_skyrat/modules/gunsafety/code/gun_safety.dm @@ -6,7 +6,7 @@ /obj/item/gun/energy has_gun_safety = TRUE - + /obj/item/gun/energy/plasmacutter has_gun_safety = FALSE @@ -15,7 +15,7 @@ /obj/item/gun/ballistic/rifle/enchanted has_gun_safety = FALSE - + /obj/item/gun/ballistic/automatic/laser/ctf has_gun_safety = FALSE @@ -27,4 +27,6 @@ /obj/item/gun/ballistic/automatic/pistol/deagle/ctf has_gun_safety = FALSE - + +/obj/item/gun/ballistic/automatic/pistol/g17/mesa + has_gun_safety = FALSE diff --git a/modular_skyrat/modules/gunsgalore/code/guns/m16.dm b/modular_skyrat/modules/gunsgalore/code/guns/m16.dm index 69d51165a73..eafb729c51d 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 + mag_type = /obj/item/ammo_box/magazine/m16/extended can_suppress = FALSE burst_size = 3 fire_delay = 2 diff --git a/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi b/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi index 661e828c92d..af52eb55875 100644 Binary files a/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi and b/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi differ diff --git a/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi b/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi index a01a6d0f7c1..83aca399185 100644 Binary files a/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi and b/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi differ diff --git a/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi b/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi index f1da910053c..cd31d6d5c3c 100644 Binary files a/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi and b/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi differ diff --git a/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi b/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi index 3e4b8e61576..6a788a57031 100644 Binary files a/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi and b/modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi differ diff --git a/modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_empty.ogg b/modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_empty.ogg new file mode 100644 index 00000000000..a82d05662ac Binary files /dev/null and b/modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_empty.ogg differ diff --git a/modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire.ogg b/modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire.ogg new file mode 100644 index 00000000000..5fd73bf002a Binary files /dev/null and b/modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire.ogg differ diff --git a/modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg b/modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg new file mode 100644 index 00000000000..7904073be8e Binary files /dev/null and b/modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg differ diff --git a/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltback.ogg b/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltback.ogg new file mode 100644 index 00000000000..b4e827e3077 Binary files /dev/null and b/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltback.ogg differ diff --git a/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltforward.ogg b/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltforward.ogg new file mode 100644 index 00000000000..2c0d338e23d Binary files /dev/null and b/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltforward.ogg differ diff --git a/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_cock.ogg b/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_cock.ogg new file mode 100644 index 00000000000..2032c6ff847 Binary files /dev/null and b/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_cock.ogg differ diff --git a/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magin.ogg b/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magin.ogg new file mode 100644 index 00000000000..fefc6444d1f Binary files /dev/null and b/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magin.ogg differ diff --git a/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magout.ogg b/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magout.ogg new file mode 100644 index 00000000000..86be191e830 Binary files /dev/null and b/modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magout.ogg differ diff --git a/modular_skyrat/modules/mounted_machine_gun/icons/turret_objects.dmi b/modular_skyrat/modules/mounted_machine_gun/icons/turret_objects.dmi index d329dd11daf..eb57f516bb6 100644 Binary files a/modular_skyrat/modules/mounted_machine_gun/icons/turret_objects.dmi and b/modular_skyrat/modules/mounted_machine_gun/icons/turret_objects.dmi differ diff --git a/modular_skyrat/modules/opposing_force/code/items.dm b/modular_skyrat/modules/opposing_force/code/items.dm index 51015dc35c5..7829f27714d 100644 --- a/modular_skyrat/modules/opposing_force/code/items.dm +++ b/modular_skyrat/modules/opposing_force/code/items.dm @@ -33,10 +33,10 @@ new /obj/item/clothing/suit/armor/vest/leather/gunman(src) new /obj/item/clothing/shoes/combat(src) -/obj/item/ammo_box/magazine/m16/extended //i will add custom sprites to this +/obj/item/ammo_box/magazine/m16/extended name = "m4a1 magazine (5.56x45mm)" icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi' - icon_state = "5.56mm" + icon_state = "m16e" ammo_type = /obj/item/ammo_casing/a556 caliber = "a556" max_ammo = 30 diff --git a/tgstation.dme b/tgstation.dme index 46d4c93486f..0ef400b24fa 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4745,6 +4745,15 @@ #include "modular_skyrat\modules\black_mesa\code\uber_teleporter.dm" #include "modular_skyrat\modules\black_mesa\code\weapons.dm" #include "modular_skyrat\modules\black_mesa\code\xen_crystal.dm" +#include "modular_skyrat\modules\black_mesa\code\armaments\__armament_bodyarmor.dm" +#include "modular_skyrat\modules\black_mesa\code\armaments\_armament_primary.dm" +#include "modular_skyrat\modules\black_mesa\code\armaments\_armaments_secondary.dm" +#include "modular_skyrat\modules\black_mesa\code\armaments\armament_explosives.dm" +#include "modular_skyrat\modules\black_mesa\code\armaments\armament_medical.dm" +#include "modular_skyrat\modules\black_mesa\code\armaments\armament_melee.dm" +#include "modular_skyrat\modules\black_mesa\code\armaments\armament_miscellaneous.dm" +#include "modular_skyrat\modules\black_mesa\code\armaments\armament_utility.dm" +#include "modular_skyrat\modules\black_mesa\code\armaments\hecu_armament_station.dm" #include "modular_skyrat\modules\black_mesa\code\mobs\bullsquid.dm" #include "modular_skyrat\modules\black_mesa\code\mobs\gordon_freeman.dm" #include "modular_skyrat\modules\black_mesa\code\mobs\headcrab.dm"