diff --git a/citadel.dme b/citadel.dme index b040dbb7d3b..63360afb2cc 100644 --- a/citadel.dme +++ b/citadel.dme @@ -4332,6 +4332,7 @@ #include "code\modules\projectiles\guns\projectile\semiauto.dm" #include "code\modules\projectiles\guns\projectile\shotgun.dm" #include "code\modules\projectiles\guns\projectile\sniper.dm" +#include "code\modules\projectiles\guns\projectile\caseless\pellet.dm" #include "code\modules\projectiles\guns\projectile\sniper\collapsible_sniper.dm" #include "code\modules\projectiles\magazines\magazine.dm" #include "code\modules\projectiles\magazines\smartmag.dm" diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 6c38e5f1a3c..0d19a6ecb53 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -66,6 +66,14 @@ icon_state = "target_q" desc = "A shooting target with a threatening silhouette." hp = 2350 // alium onest too kinda +/obj/item/target/basic + icon_state = "target_a" + desc = "A plain square shooting target." + hp = 1500 // i guess syndie targets are sturdier? +/obj/item/target/humanoid + icon_state = "target_b" + desc = "A shooting target that looks vaguely human shaped but not enough to cause controversy." + hp = 1800 // alium onest too kinda /obj/item/target/bullet_act(var/obj/projectile/Proj) var/p_x = Proj.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset Proj.p_x!" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index e04fb6e0c74..970aeacdb3d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -571,3 +571,12 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br if(prob(75)) new /obj/item/storage/backpack/dufflebag/sec(src) return ..() + +/obj/structure/closet/secure_closet/pelletguns + name = "pellet gun lockers" + desc = "Contains some pellet guns and pellets for recreational shooting. Can be issued to civilians without worry." + closet_appearance = /singleton/closet_appearance/secure_closet/security + req_access = list(ACCESS_SECURITY_BRIG) + starts_with = list( + /obj/item/gun/ballistic/caseless/pellet = 4, + /obj/item/ammo_magazine/pellets = 4) diff --git a/code/modules/cargo/supplypacks/recreation.dm b/code/modules/cargo/supplypacks/recreation.dm index 439c851e368..c148a8b5774 100644 --- a/code/modules/cargo/supplypacks/recreation.dm +++ b/code/modules/cargo/supplypacks/recreation.dm @@ -218,3 +218,13 @@ cost = 20 container_type = /obj/structure/closet/crate container_name = "DONKsoft Resupply crate" + +//Civilian Pellet +/datum/supply_pack/recreation/pelletgun + name = "Recreational Pellet Gun" + contains = list( + /obj/item/gun/ballistic/caseless/pellet, + /obj/item/ammo_magazine/pellets + ) + cost = 20 + container_type = /obj/structure/closet/crate diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index aa808695889..644644bfb5a 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -577,6 +577,16 @@ projectile_type = /obj/projectile/bullet/organic/wax materials_base = list("wax" = 100) +/obj/item/ammo_casing/p_pellet + name = "pellet" + desc = "Also know as a BB, it is shot from airguns for recreational shooting." + caliber = "pellet" + icon_state = "pellet" + projectile_type = /obj/projectile/bullet/practice + casing_flags = CASING_DELETE + + +//Musket Rounds /obj/item/ammo_casing/musket name = "musket ball" desc = "A solid ball made of lead." diff --git a/code/modules/projectiles/guns/projectile/caseless.dm b/code/modules/projectiles/guns/projectile/caseless.dm index fbce6e294db..9d424ef08c6 100644 --- a/code/modules/projectiles/guns/projectile/caseless.dm +++ b/code/modules/projectiles/guns/projectile/caseless.dm @@ -105,3 +105,16 @@ . = ..() var/fluff_date = rand(2501,2543) desc += "\nYou see a stamp on the side: GORLEX MARAUDERS, MANUFACTURED IN [fluff_date]." + + +/obj/item/gun/ballistic/caseless/pellet + name = "pellet gun" + desc = "An air powered rifle that shoots near harmless pellets. Used for recreation in enviroments where firearm ownership is restricted." + icon_state = "pellet" + item_state = "pellet" + wielded_item_state = "pellet-wielded" + caliber = "pellet" + fire_sound = 'sound/weapons/tap.ogg' + max_shells = 1 + ammo_type = /obj/item/ammo_casing/p_pellet + load_method = SINGLE_CASING diff --git a/code/modules/projectiles/guns/projectile/caseless/pellet.dm b/code/modules/projectiles/guns/projectile/caseless/pellet.dm new file mode 100644 index 00000000000..83b721c9b72 --- /dev/null +++ b/code/modules/projectiles/guns/projectile/caseless/pellet.dm @@ -0,0 +1,40 @@ +/////////////////////////////////////// +// Pellet Gun - For Recerational Use // +/////////////////////////////////////// + +#define DEFINE_CALIBER_PELLET 804 + +/obj/item/gun/ballistic/caseless/pellet + name = "pellet gun" + desc = "An air powered rifle that shoots near harmless plastic pellets. Used for recreation in enviroments where firearm ownership is restricted." + icon = 'icons/obj/gun/ballistic/caseless/pellet.dmi' + icon_state = "pellet" + item_state = "pellet" + wielded_item_state = "pellet-wielded" + caliber = "pellet" + fire_sound = 'sound/weapons/tap.ogg' + max_shells = 1 + ammo_type = /obj/item/ammo_casing/p_pellet + load_method = SINGLE_CASING + item_icons = list("left_hand" = 'icons/mob/items/lefthand_guns.dmi', "right_hand" = 'icons/mob/items/righthand_guns.dmi') + +/obj/item/ammo_casing/p_pellet + name = "pellet" + desc = "Also know as a BB, it is shot from airguns for recreational shooting." + icon = 'icons/obj/gun/ballistic/caseless/pellet.dmi' + caliber = "pellet" + icon_state = "pellet_single" + projectile_type = /obj/projectile/bullet/practice + casing_flags = CASING_DELETE + +/obj/item/ammo_magazine/pellets + name = "box of pellets" + desc = "A box containing small pellets for a pellet gun." + icon = 'icons/obj/gun/ballistic/caseless/pellet.dmi' + icon_state = "pelletbox" + caliber = "pellet" + mag_type = MAGAZINE + ammo_type = /obj/item/ammo_casing/p_pellet + materials_base = list(MAT_PLASTIC = 600) + max_ammo = 50 + multiple_sprites = 1 diff --git a/code/modules/projectiles/magazines/unsorted.dm b/code/modules/projectiles/magazines/unsorted.dm index 6f6f3ebe5a0..12af5d2212d 100644 --- a/code/modules/projectiles/magazines/unsorted.dm +++ b/code/modules/projectiles/magazines/unsorted.dm @@ -1102,6 +1102,17 @@ max_ammo = 10 multiple_sprites = 1 +/obj/item/ammo_magazine/pellets + name = "box of pellets" + desc = "A box containing small pellets for a pellet gun." + icon_state = "pelletbox" + caliber = "pellet" + mag_type = MAGAZINE + ammo_type = /obj/item/ammo_casing/p_pellet + materials_base = list(MAT_PLASTIC = 600) + max_ammo = 50 + multiple_sprites = 1 + /obj/item/ammo_magazine/mcompressedbio/compact max_ammo = 10 diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi index 1bd3902dd41..c2f51ff9d9d 100644 Binary files a/icons/mob/items/lefthand_guns.dmi and b/icons/mob/items/lefthand_guns.dmi differ diff --git a/icons/mob/items/righthand_guns.dmi b/icons/mob/items/righthand_guns.dmi index 603ec2ecedd..670767a6eac 100644 Binary files a/icons/mob/items/righthand_guns.dmi and b/icons/mob/items/righthand_guns.dmi differ diff --git a/icons/obj/gun/ballistic/caseless/pellet.dmi b/icons/obj/gun/ballistic/caseless/pellet.dmi new file mode 100644 index 00000000000..cae1dd372bd Binary files /dev/null and b/icons/obj/gun/ballistic/caseless/pellet.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index a9fad017c0f..48c2bce1399 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index 02c9a09f51a..3f2d4abc72c 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -1177,6 +1177,18 @@ /obj/machinery/space_heater, /turf/simulated/floor/plating, /area/engineering/engine_eva) +"aTS" = ( +/obj/structure/closet/crate, +/obj/item/target/basic, +/obj/item/target/basic, +/obj/item/target/basic, +/obj/item/target/basic, +/obj/item/target/humanoid, +/obj/item/target/humanoid, +/obj/item/target/humanoid, +/obj/item/target/humanoid, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "aTU" = ( /obj/item/radio/intercom{ dir = 1; @@ -1185,6 +1197,9 @@ }, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/medical/mentalhealth) +"aUB" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/rift/surfacebase/outside/outside1) "aUS" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -5070,7 +5085,7 @@ /area/rnd/testingroom) "dtp" = ( /obj/structure/symbol/sa, -/turf/simulated/wall/r_wall/prepainted, +/turf/simulated/wall/r_wall/prepainted/security, /area/rift/surfacebase/outside/outside1) "dtv" = ( /obj/machinery/light, @@ -7423,6 +7438,12 @@ }, /turf/simulated/floor/plating, /area/medical/virologymaint) +"ePh" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area/rift/surfacebase/outside/outside1) "ePm" = ( /turf/simulated/wall/prepainted, /area/rift/station/public_garden) @@ -12606,6 +12627,12 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/patient_wing) +"iej" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area/rift/surfacebase/outside/outside1) "ier" = ( /obj/structure/bed/chair/sofa/black/right{ dir = 8 @@ -16531,6 +16558,22 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/tankstorage) +"kBW" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/structure/fence{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "kCu" = ( /obj/structure/bed/padded, /obj/item/bedsheet/medical, @@ -16646,6 +16689,21 @@ /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) +"kFq" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/structure/window/wooden, +/obj/machinery/light/flamp/noshade, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "kFr" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17701,6 +17759,17 @@ /obj/structure/bookcase/legal/combo, /turf/simulated/floor/wood, /area/maintenance/research/lower) +"lky" = ( +/obj/structure/table/standard, +/obj/item/binoculars/spyglass, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "lkP" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18591,6 +18660,12 @@ /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/maint_bar) +"lQp" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area/rift/surfacebase/outside/outside1) "lQs" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green{ @@ -19372,6 +19447,10 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/psych_ward) +"mpA" = ( +/obj/structure/undies_wardrobe, +/turf/simulated/wall/r_wall/prepainted, +/area/rift/surfacebase/outside/outside1) "mpD" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ id = "violet_protocol"; @@ -22795,6 +22874,23 @@ }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside1) +"omU" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/structure/window/wooden, +/obj/machinery/light/flamp/noshade, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "onl" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -24669,10 +24765,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/surface_south) +"prz" = ( +/obj/structure/target_stake, +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area/rift/surfacebase/outside/outside1) "prO" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, /area/maintenance/research/lower) +"prQ" = ( +/obj/structure/grille, +/obj/structure/foamedmetal, +/turf/simulated/floor/plating, +/area/rift/surfacebase/outside/outside1) "prY" = ( /obj/machinery/vending/coffee, /obj/machinery/light{ @@ -26313,6 +26418,20 @@ "qqZ" = ( /turf/simulated/open, /area/turbolift/rhammerhead/midpoint) +"qrm" = ( +/obj/structure/fence/end{ + dir = 8 + }, +/obj/machinery/light/flamp/noshade, +/obj/structure/table/standard, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "qro" = ( /obj/machinery/air_alarm{ dir = 8; @@ -26360,6 +26479,20 @@ }, /turf/simulated/floor/tiled/monotile, /area/janitor) +"qsO" = ( +/obj/structure/fence/end{ + dir = 4 + }, +/obj/machinery/light/flamp/noshade, +/obj/structure/table/standard, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "qsP" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -27015,6 +27148,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/prison/upper) +"qNu" = ( +/obj/structure/fence/door{ + dir = 4 + }, +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area/rift/surfacebase/outside/outside1) "qNR" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, @@ -31498,6 +31637,16 @@ /obj/item/gps/dataknife, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"tnm" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/structure/window/wooden, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "tnt" = ( /obj/structure/table/standard, /obj/item/tape_recorder, @@ -33526,6 +33675,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rift/surfaceeva) +"uqx" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area/rift/surfacebase/outside/outside1) "urm" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -34435,6 +34590,16 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) +"uPP" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "uPS" = ( /obj/structure/railing, /obj/structure/disposalpipe/segment{ @@ -34511,6 +34676,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 1 }, +/obj/structure/closet/secure_closet/pelletguns, /turf/simulated/floor/tiled/steel, /area/security/checkpoint) "uSe" = ( @@ -35232,6 +35398,10 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_eva) +"vuA" = ( +/obj/structure/fence/door, +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area/rift/surfacebase/outside/outside1) "vuC" = ( /obj/structure/window/wooden{ dir = 8 @@ -36415,6 +36585,10 @@ "wes" = ( /turf/simulated/wall/r_wall/prepainted, /area/maintenance/evahallway) +"wey" = ( +/obj/structure/flora/rock/ice, +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area/rift/surfacebase/outside/outside1) "weE" = ( /obj/machinery/holopad, /obj/machinery/camera/network/research/xenobio{ @@ -36886,6 +37060,10 @@ }, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) +"wtm" = ( +/obj/structure/fence, +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area/rift/surfacebase/outside/outside1) "wtn" = ( /obj/structure/closet/secure_closet/medical2, /obj/item/clothing/suit/straight_jacket, @@ -37055,6 +37233,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologytransitwest) +"wwb" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/structure/fence{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "wwn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -37330,6 +37526,10 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) +"wFB" = ( +/obj/structure/flora/rock/ice/alternative_1, +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area/rift/surfacebase/outside/outside1) "wGa" = ( /obj/machinery/light/fairy{ dir = 8 @@ -38985,6 +39185,12 @@ /obj/effect/floor_decal/corner/green/bordercorner2, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"xEF" = ( +/obj/structure/bed/chair/bay{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside1) "xEV" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -45911,7 +46117,7 @@ iFN iFN iFN iFN -vUA +mpA vUA vUA iFN @@ -48440,9 +48646,9 @@ kAb uxH iFN iFN -iFN -iFN -iFN +oFG +oFG +oFG iFN iFN iFN @@ -48619,8 +48825,8 @@ omm vmW buC kAb -dER -iFN +kAb +kAb kAb kAb rQq @@ -48632,10 +48838,10 @@ kAb kAb kAb dER -iFN -efY -iFN -iFN +oFG +oFG +oFG +oFG hgE hgE hgE @@ -48813,25 +49019,25 @@ kAb kAb kAb kAb -dER -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +kAb +aUB +oFG +oFG +oFG +oFG +oFG +oFG +oFG +oFG +oFG +vuA +oFG +oFG +oFG +oFG iFN hgE hgE -hgE jEQ iFN iFN @@ -49008,21 +49214,21 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -xJx -iFN -iFN -iFN -iFN -iFN -iFN -xJx -iFN +aUB +oFG +oFG +wey +oFG +oFG +wFB +oFG +oFG +oFG +wwb +jPV +jPV +jPV +omU iFN iFN iFN @@ -49202,23 +49408,23 @@ xJx iFN iFN iFN +aUB +oFG +oFG +oFG +oFG +oFG +oFG +oFG +oFG +oFG +qrm +ubp +ubp +ubp +tnm iFN -iFN -iFN -iFN -lxF -iFN -iFN -iFN -iFN -lxF -iFN -iFN -iFN -iFN -iFN -iFN -iFN +efb iFN iFN iFN @@ -49395,22 +49601,22 @@ iFN iFN iFN iFN -vUA -vUA -vUA -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +aUB +aUB +aUB +oFG +oFG +oFG +oFG +prz +oFG +oFG +oFG +uPP +xEF +ubp +ubp +tnm iFN iFN iFN @@ -49589,22 +49795,22 @@ iFN iFN iFN iFN -vUA -vUA -vUA -iFN -iFN -lxF -iFN -efb -iFN -iFN -iFN -iFN -iFN -lxF -iFN -iFN +aUB +prQ +aUB +uqx +oFG +prz +oFG +oFG +oFG +oFG +oFG +lky +ubp +ubp +ubp +tnm iFN iFN iFN @@ -49783,22 +49989,22 @@ jDP iFN xJx iFN -vUA -vUA -vUA -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +aUB +aUB +aUB +oFG +prz +oFG +oFG +oFG +oFG +oFG +oFG +uPP +ubp +ubp +ubp +tnm iFN iFN iFN @@ -49978,21 +50184,21 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -lxF -iFN -iFN -iFN -lxF -iFN -iFN -iFN -iFN -iFN +aUB +oFG +oFG +oFG +oFG +prz +oFG +oFG +oFG +oFG +uPP +xEF +ubp +ubp +tnm iFN iFN iFN @@ -50171,22 +50377,22 @@ iFN iFN iFN iFN -jDP -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN iFN +aUB +oFG +oFG +oFG +oFG +oFG +oFG +oFG +oFG +oFG +qsO +aTS +ubp +ubp +tnm iFN iFN iFN @@ -50366,21 +50572,21 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -efb -iFN -iFN +aUB +oFG +oFG +oFG +oFG +oFG +oFG +oFG +oFG +oFG +kBW +kWH +kWH +kWH +kFq iFN iFN iFN @@ -50560,20 +50766,20 @@ lxF iFN iFN iFN -iFN -jDP -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +aUB +oFG +oFG +oFG +wey +oFG +oFG +lQp +oFG +oFG +vuA +oFG +oFG +oFG iFN iFN iFN @@ -50753,19 +50959,19 @@ iFN iFN iFN iFN -vUA +aUB dtp -vUA -iFN -iFN -iFN -iFN -vUA -vUA -vUA -uMA -iFN -iFN +aUB +oFG +oFG +oFG +oFG +aUB +aUB +aUB +oFG +ePh +oFG iFN iFN iFN @@ -50947,18 +51153,18 @@ iFN iFN iFN iFN -vUA +aUB oUd -vUA -iFN -iFN -iFN -iFN -vUA -vUA -vUA -iFN -iFN +aUB +qNu +wtm +wtm +wtm +aUB +prQ +aUB +oFG +ePh iFN iFN hgE @@ -51141,16 +51347,16 @@ iFN iFN iFN iFN -vUA -vUA -vUA -iFN -iFN -iFN -iFN -vUA -vUA -vUA +aUB +dtp +aUB +oFG +oFG +oFG +oFG +aUB +aUB +aUB hgE hgE hgE @@ -51336,11 +51542,11 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +iej +oFG +oFG +oFG +oFG hgE hgE hgE @@ -51530,8 +51736,8 @@ iFN iFN iFN iFN -iFN -iFN +oFG +oFG hgE hgE hgE