diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index b92743076b01..20bf8ac951e9 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -123,8 +123,9 @@ readied_block = 60 /obj/item/weapon/shield/riot/ballistic //FOR THE ROYAL MARINE SPEC DO NOT TOUCH SMELLY MAN - name = "Ballistic shield" + name = "FBS-B Ballistic shield" desc = "Ballistic shield used by the royal marines commando. This shield is commonly used during boarding actions due to its lightweight but durible design." + desc_lore = "The Fox Ballistic Shield-B (FBS-B), was originally introduced as the FBS, attempting to be a solution to high-impact operations following increased counter-insurgency deployments since 2151. It was designed to provide maximum protection, and for the user to be able to utilize their primary armament in tandem. By 2163 tertiary ballistics trials were undertaken to ascertain it's effectiveness against improved munitions, and was additionally used as an opportunity to deal with user complaints making their way up from quartermasters. The complaints of the original FBS were twofold: weight and extended usage in combat causing the side to melt closest to the barrel. After further material research and in the field tests were conducted, by 2171, the FBS had attained a ballistics protection classification of D, the highest available for a portable shield, by being able to stop a singular armor piercing round. This reported success was due to the usage of a new fibre reinforced lightweight composite. In the wake of the successful improvements, the FBS was later christened the FBS-B as with the enhanced shield, the user had a tendency for maximum aggression during engagements. The nickname 'Bellicose' was given to breachers by their squaddies and later became it's official designation." icon_state = "ballisticshield" item_state = "ballisticshield" base_icon_state = "ballisticshield" diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index b1128d907b45..58be1ea063e3 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -213,7 +213,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/royal_marine/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) // new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/medium, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) diff --git a/maps/templates/twe_ert_station.dmm b/maps/templates/twe_ert_station.dmm index 1ef4b4429a33..4586974c6ddb 100644 --- a/maps/templates/twe_ert_station.dmm +++ b/maps/templates/twe_ert_station.dmm @@ -13,12 +13,9 @@ /area/adminlevel/ert_station/royal_marines_station) "aq" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/prop/almayer/computers/sensor_computer2{ - density = 0; - pixel_y = 16 - }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "cargo_arrow" }, /area/adminlevel/ert_station/royal_marines_station) "ar" = ( @@ -50,10 +47,11 @@ }, /area/adminlevel/ert_station/royal_marines_station) "aK" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, +/turf/open/floor/plating, /area/adminlevel/ert_station/royal_marines_station) "aW" = ( /turf/closed/shuttle/twe_dropship{ @@ -94,6 +92,12 @@ icon_state = "red" }, /area/adminlevel/ert_station/royal_marines_station) +"cu" = ( +/obj/structure/machinery/shower{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/royal_marines_station) "cL" = ( /obj/structure/platform{ dir = 4 @@ -110,6 +114,16 @@ icon_state = "0,8" }, /area/adminlevel/ert_station/royal_marines_station) +"dj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/adminlevel/ert_station/royal_marines_station) "dm" = ( /obj/structure/closet/coffin/woodencrate, /obj/effect/decal/cleanable/dirt, @@ -211,6 +225,15 @@ icon_state = "red" }, /area/adminlevel/ert_station/royal_marines_station) +"fJ" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + id = "Delta_1"; + name = "\improper Bathroom" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/royal_marines_station) "fM" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -273,6 +296,12 @@ "gS" = ( /turf/closed/wall/almayer/outer, /area/adminlevel/ert_station/royal_marines_station) +"gT" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "orange" + }, +/area/adminlevel/ert_station/royal_marines_station) "gU" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "1,11" @@ -363,6 +392,15 @@ /obj/structure/blocker/invisible_wall, /turf/open/void, /area/adminlevel/ert_station/royal_marines_station) +"ja" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/adminlevel/ert_station/royal_marines_station) "je" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -486,6 +524,13 @@ icon_state = "plate" }, /area/adminlevel/ert_station/royal_marines_station) +"kT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/adminlevel/ert_station/royal_marines_station) "kW" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -556,6 +601,16 @@ icon_state = "cargo" }, /area/adminlevel/ert_station/royal_marines_station) +"mb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/almayer/computers/sensor_computer1{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/royal_marines_station) "mc" = ( /obj/structure/platform, /obj/structure/blocker/invisible_wall, @@ -583,13 +638,11 @@ }, /area/adminlevel/ert_station/royal_marines_station) "mK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/almayer/computers/sensor_computer1{ - density = 0; - pixel_y = 16 +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, /area/adminlevel/ert_station/royal_marines_station) "nj" = ( @@ -611,6 +664,19 @@ icon_state = "red" }, /area/adminlevel/ert_station/royal_marines_station) +"nw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "nI" = ( /obj/structure/machinery/light{ dir = 8 @@ -638,6 +704,15 @@ icon_state = "plate" }, /area/adminlevel/ert_station/royal_marines_station) +"od" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/adminlevel/ert_station/royal_marines_station) "oo" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -693,18 +768,12 @@ }, /area/adminlevel/ert_station/royal_marines_station) "pL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 9; + icon_state = "red" }, /area/adminlevel/ert_station/royal_marines_station) "pO" = ( @@ -935,6 +1004,17 @@ icon_state = "plate" }, /area/adminlevel/ert_station/royal_marines_station) +"vm" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "vB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, @@ -960,11 +1040,27 @@ icon_state = "cargo" }, /area/adminlevel/ert_station/royal_marines_station) +"xb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/almayer/computers/sensor_computer2{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/royal_marines_station) "xm" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "0,7" }, /area/adminlevel/ert_station/royal_marines_station) +"xx" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/royal_marines_station) "xy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -1091,11 +1187,21 @@ icon_state = "orange" }, /area/adminlevel/ert_station/royal_marines_station) +"Aq" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "Au" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + icon_state = "dark_sterile" }, /area/adminlevel/ert_station/royal_marines_station) "AQ" = ( @@ -1155,6 +1261,23 @@ "CT" = ( /turf/closed/wall/r_wall/elevator/gears, /area/adminlevel/ert_station/royal_marines_station) +"Dc" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 29 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "Dg" = ( /turf/open/floor/almayer{ dir = 4; @@ -1175,11 +1298,39 @@ icon_state = "plate" }, /area/adminlevel/ert_station/royal_marines_station) +"DA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/mirror{ + pixel_x = -29 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "DS" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "4,15" }, /area/adminlevel/ert_station/royal_marines_station) +"DU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/airlock/almayer/generic{ + id = "Delta_1"; + name = "\improper Bathroom" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/royal_marines_station) "DV" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -1196,6 +1347,22 @@ icon_state = "8,8" }, /area/adminlevel/ert_station/royal_marines_station) +"EJ" = ( +/obj/structure/mirror{ + pixel_x = -29 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "EK" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "7,11" @@ -1446,6 +1613,14 @@ icon_state = "plate" }, /area/adminlevel/ert_station/royal_marines_station) +"JM" = ( +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "JO" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -1569,6 +1744,15 @@ icon_state = "plate" }, /area/adminlevel/ert_station/royal_marines_station) +"MX" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "orange" + }, +/area/adminlevel/ert_station/royal_marines_station) "MY" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -1678,9 +1862,11 @@ }, /area/adminlevel/ert_station/royal_marines_station) "Pb" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1 + }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "test_floor4" }, /area/adminlevel/ert_station/royal_marines_station) "Pd" = ( @@ -1872,6 +2058,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/adminlevel/ert_station/royal_marines_station) +"TP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/royal_marines_station) "TY" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer{ @@ -1918,6 +2111,15 @@ icon_state = "plate" }, /area/adminlevel/ert_station/royal_marines_station) +"Up" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "orange" + }, +/area/adminlevel/ert_station/royal_marines_station) "Uq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -1939,6 +2141,15 @@ }, /turf/open/floor/almayer, /area/adminlevel/ert_station/royal_marines_station) +"UF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "UH" = ( /turf/closed/wall/r_wall/elevator{ dir = 8 @@ -1975,19 +2186,12 @@ }, /area/adminlevel/ert_station/royal_marines_station) "Vt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "orange" }, /area/adminlevel/ert_station/royal_marines_station) "Vu" = ( @@ -2154,6 +2358,19 @@ "WS" = ( /turf/closed/wall/almayer, /area/adminlevel/ert_station/royal_marines_station) +"WW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "WY" = ( /obj/structure/platform{ dir = 1 @@ -2170,6 +2387,15 @@ /obj/structure/blocker/invisible_wall, /turf/open/void, /area/adminlevel/ert_station/royal_marines_station) +"WZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "Xe" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -2188,6 +2414,21 @@ icon_state = "orange" }, /area/adminlevel/ert_station/royal_marines_station) +"XB" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 29 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "XF" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -2220,6 +2461,11 @@ icon_state = "test_floor4" }, /area/adminlevel/ert_station/royal_marines_station) +"Zf" = ( +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/royal_marines_station) "Zk" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -2384,14 +2630,14 @@ Sv uq OE WS -RH -UJ -XF -XF -XF -XF -yK -OE +TP +DA +WZ +ad +ad +WZ +EJ +cu WS qZ XF @@ -2431,14 +2677,14 @@ Ac Xz Uc WS -qZ -je -Au -Au +TP +WW Au -gJ -Qi -yK +ad +ad +Zf +vm +cu WS RH je @@ -2479,12 +2725,12 @@ GZ WS WS WS -mI -jU -MJ -MJ -MJ -Xe +ad +DU +WS +WS +fJ +WS WS WS WS @@ -2508,9 +2754,9 @@ yQ hL yK yK -Nm -yK aK +yK +PB sb MJ MJ @@ -2524,16 +2770,16 @@ kh Uv dK yK -Nm +aK yK -sb -MJ -MJ -MJ -jU -RF +Up +gJ +gJ +gJ +kT +MX yK -Nm +aK yK sb MJ @@ -2555,9 +2801,9 @@ yQ hL hL yK -Nm +mK yK -aK +PB sb MJ MJ @@ -2571,7 +2817,7 @@ kh Uv RF yK -Nm +mK yK sb Bh @@ -2580,7 +2826,7 @@ xE xE RF yK -Nm +mK yK sb MJ @@ -2602,9 +2848,9 @@ hL hL XF yK -Nm -yK aK +yK +PB sb MJ MJ @@ -2618,7 +2864,7 @@ Tf Uv RF yK -Nm +aK yK sb MJ @@ -2627,7 +2873,7 @@ jU jU RF yK -Nm +aK yK Am MJ @@ -2754,13 +3000,13 @@ Sv Sv yK uE -ll -ll +yK +yK uE kH kH WS -XF +mb Am Bh Bh @@ -2768,7 +3014,7 @@ Bh Bh RF RH -WS +aK qZ Am MJ @@ -2794,20 +3040,20 @@ WS WS DV Nm -Nm +Pb DV WS WS WS WS WS -Nm -Nm WS WS WS WS -XF +WS +WS +xb Am MJ MJ @@ -2815,7 +3061,7 @@ MJ MJ dK XF -WS +aK Ei eX gq @@ -2837,7 +3083,7 @@ Ur MM Ur lX -WS +aK nI zM zk @@ -2848,13 +3094,13 @@ WS Hz qN ri -ll -ll -pL -qN -WI -WS -mK +gT +gJ +IQ +gJ +gJ +aK +XF Am MJ MJ @@ -2862,7 +3108,7 @@ kh Ir aX XF -WS +aK Hz qN WI @@ -2884,7 +3130,7 @@ Ur Ur Ur Ur -Nm +mK Ur Ur yK @@ -2895,12 +3141,12 @@ WS MU yK oC +gx +gq +Dg MJ MJ -MU -yK -oC -WS +mK aq eX gq @@ -2909,7 +3155,7 @@ gq ro hA XF -WS +aK MU yK oC @@ -2931,7 +3177,7 @@ wF Ok pk wF -WS +aK pk wF pk @@ -2945,9 +3191,9 @@ Ms ll ll Vt -zk -ls -WS +gq +gq +aK KJ WC ll @@ -2990,14 +3236,14 @@ WS WS WS Nm -Nm +Pb WS WS WS WS WS Nm -Nm +Pb WS WS WS @@ -3008,7 +3254,7 @@ WS WS WS Nm -Nm +Pb gS gS jL @@ -3495,11 +3741,11 @@ fx PC PC Zk -Pb +Ur fM PC IY -Pb +Ur fM PC PC @@ -3648,14 +3894,14 @@ WS WS WS Nm -Nm +Pb WS WS WS WS WS Nm -Nm +Pb WS WS WS @@ -3666,7 +3912,7 @@ WS WS WS Uq -Nm +Pb gS gS jL @@ -3683,7 +3929,7 @@ Or lX Gd Or -WS +aK Gd Or Gd @@ -3697,9 +3943,9 @@ ri mo mo pL -qN -WI -WS +FN +FN +aK dm ps mo @@ -3730,7 +3976,7 @@ Ur Ur Ur Ur -Nm +mK Ur Ur yK @@ -3741,13 +3987,13 @@ WS MU yK oC +Ut +FN +xx MJ MJ -MU -yK -oC -WS -XF +mK +aq nn FN zY @@ -3755,7 +4001,7 @@ gl zY Ku UJ -WS +aK MU yK oC @@ -3777,7 +4023,7 @@ Ur Sc Ur Ok -WS +aK tv UV jV @@ -3788,12 +4034,12 @@ WS ds zk Ms -mo -mo -Vt -zk -ls -WS +HJ +fD +ja +fD +fD +aK XF BC MJ @@ -3802,7 +4048,7 @@ MJ MJ ev XF -WS +aK ds zk ls @@ -3828,15 +4074,15 @@ WS WS DV Nm -Nm +Pb DV WS WS WS WS WS -Nm -Nm +WS +WS WS WS WS @@ -3849,7 +4095,7 @@ nT nT ev XF -WS +aK Ei nn xX @@ -3882,8 +4128,8 @@ XF XF XF Ul -mo -mo +yK +yK Sm UJ UJ @@ -3896,7 +4142,7 @@ MJ MJ ev XF -WS +aK qZ BC MJ @@ -4012,9 +4258,9 @@ Xh Xh XF yK -Nm -yK aK +yK +PB Ry MJ MJ @@ -4028,7 +4274,7 @@ MJ MJ kX yK -Nm +aK yK Ry Fw @@ -4037,7 +4283,7 @@ nT nT kX yK -Nm +aK yK Ry MJ @@ -4059,9 +4305,9 @@ Xh Xh Lj yK -Nm +mK yK -aK +PB Ry MJ MJ @@ -4075,7 +4321,7 @@ oo oo kX yK -Nm +mK yK Ry jU @@ -4084,7 +4330,7 @@ MJ MJ ev yK -Nm +mK yK Ry MJ @@ -4106,9 +4352,9 @@ Lj Xh yK yK -Nm -yK aK +yK +PB Ry oo oo @@ -4122,16 +4368,16 @@ kh kh ev yK -Nm +aK yK -Ry -jU -jU -MJ -MJ -ev +od +co +co +fD +fD +dj yK -Nm +aK yK Ry MJ @@ -4171,12 +4417,12 @@ Nc WS WS WS -uK -MJ -jU -MJ -MJ -Nc +WS +fJ +ad +WS +fJ +ad WS WS WS @@ -4217,14 +4463,14 @@ kW eh RH WS -kH -HJ -fD -fD -fD -co -eh -RH +TP +nw +Au +ad +ad +Au +Aq +cu WS qZ HJ @@ -4264,14 +4510,14 @@ yK Uc qZ WS -kH -kH -yK -yK -XF -XF -nl -RH +TP +Dc +UF +ad +ad +JM +XB +cu WS Ei Mg