Fancy Lifeboats

This commit is contained in:
Chompstation Bot
2021-08-13 15:38:40 +00:00
parent 6b5aad478a
commit cbd1953061
8 changed files with 264 additions and 191 deletions

View File

@@ -2,7 +2,7 @@
* To map these, place down a /obj/effect/fancy_shuttle on the map and lay down /turf/simulated/wall/fancy_shuttle
* everywhere that is included in the sprite. Up to you if you want to make some opacity=FALSE or density=FALSE
* Set a matching fancy_shuttle_tag on your walls and on the /obj/effect/fancy_shuttle. Make sure it's unique.
*
*
* If you want flooring to look like the shuttle flooring, put /obj/effect/floor_decal/fancy_shuttle on all of it.
* You can add your own decals on top of that. Just make sure to put the fancy_shuttle decal lowest.
* Also set the same tag as your /obj/effect/fancy_shuttle on the decals.
@@ -56,7 +56,7 @@ GLOBAL_LIST_EMPTY(fancy_shuttles)
// Reinforced hull steel
/turf/simulated/wall/fancy_shuttle/Initialize(mapload, materialtype, rmaterialtype, girdertype)
. = ..(mapload, MAT_STEELHULL, MAT_STEELHULL, MAT_STEELHULL)
. = ..(mapload, MAT_STEELHULL, MAT_STEELHULL, MAT_STEELHULL)
/turf/simulated/wall/fancy_shuttle/window
opacity = FALSE
@@ -108,14 +108,14 @@ GLOBAL_LIST_EMPTY(fancy_shuttles)
remove_underlay()
var/turf/path = get_base_turf_by_area(src) || /turf/space
var/do_plane = null
var/do_state = initial(path.icon_state)
var/do_icon = initial(path.icon)
if(ispath(path, /turf/space))
do_plane = SPACE_PLANE
do_state = "white"
under_EM = mutable_appearance('icons/turf/space.dmi', "white", plane = PLANE_O_LIGHTING_VISUAL)
under_EM.filters = filter(type = "alpha", icon = icon(src.icon, src.icon_state), flags = MASK_INVERSE)
@@ -128,7 +128,7 @@ GLOBAL_LIST_EMPTY(fancy_shuttles)
/turf/simulated/wall/fancy_shuttle/update_icon()
if(!damage_overlays[1])
generate_overlays()
cut_overlays()
if(fancy_shuttle_tag) // after a shuttle jump it won't be set anymore, but the shuttle jump proc will set our icon and state
var/obj/effect/fancy_shuttle/F = GLOB.fancy_shuttles[fancy_shuttle_tag]
@@ -321,6 +321,26 @@ GLOBAL_LIST_EMPTY(fancy_shuttles)
/obj/effect/fancy_shuttle_floor_preview/lifeboat
icon = 'icons/turf/fancy_shuttles/lifeboat_preview.dmi'
/**
* Lifeboat1 (Tether)
* North facing: W:5, H:7
*/
/obj/effect/fancy_shuttle/lifeboat1
icon = 'icons/turf/fancy_shuttles/lifeboat1_preview.dmi'
split_file = 'icons/turf/fancy_shuttles/lifeboat1.dmi'
/obj/effect/fancy_shuttle_floor_preview/lifeboat1
icon = 'icons/turf/fancy_shuttles/lifeboat1_preview.dmi'
/**
* Lifeboat2 (Tether)
* North facing: W:5, H:12
*/
/obj/effect/fancy_shuttle/lifeboat2
icon = 'icons/turf/fancy_shuttles/lifeboat2_preview.dmi'
split_file = 'icons/turf/fancy_shuttles/lifeboat2.dmi'
/obj/effect/fancy_shuttle_floor_preview/lifeboat2
icon = 'icons/turf/fancy_shuttles/lifeboat2_preview.dmi'
/**
* Pod
* North facing: W:3, H:4

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -11623,6 +11623,7 @@
/turf/simulated/floor/plating,
/area/hydroponics)
"asj" = (
<<<<<<< HEAD
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/machinery/door/firedoor,
@@ -11636,6 +11637,18 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/hydroponics)
||||||| parent of 4a2211ba08... Fancy Lifeboats (#11392)
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/tether)
=======
/turf/space,
/turf/simulated/wall/fancy_shuttle{
fancy_shuttle_tag = "lifeboat1"
},
/area/shuttle/tether)
>>>>>>> 4a2211ba08... Fancy Lifeboats (#11392)
"ask" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -23695,12 +23708,14 @@
/turf/simulated/floor/tiled/monotile,
/area/tether/surfacebase/shuttle_pad)
"aME" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/fancy_shuttle{
fancy_shuttle_tag = "lifeboat1"
},
/area/shuttle/tether)
"aMF" = (
/obj/structure/shuttle/window,
/obj/structure/grille,
/turf/simulated/shuttle/plating/airless,
/turf/simulated/wall/fancy_shuttle/window{
fancy_shuttle_tag = "lifeboat1"
},
/area/shuttle/tether)
"aMG" = (
/obj/structure/railing{
@@ -23901,19 +23916,15 @@
},
/turf/simulated/floor/tiled/monotile,
/area/tether/surfacebase/shuttle_pad)
"aMZ" = (
/obj/structure/closet/firecloset,
/turf/simulated/shuttle/floor/black,
/area/shuttle/tether)
"aNa" = (
/obj/machinery/computer/shuttle_control/tether_backup{
req_one_access = list()
},
/turf/simulated/shuttle/floor/black,
/turf/simulated/floor/tiled,
/area/shuttle/tether)
"aNb" = (
/obj/structure/closet/emcloset,
/turf/simulated/shuttle/floor/black,
/turf/simulated/floor/tiled,
/area/shuttle/tether)
"aNc" = (
/obj/machinery/alarm{
@@ -23993,26 +24004,11 @@
},
/turf/simulated/wall,
/area/tether/surfacebase/shuttle_pad)
"aNk" = (
/obj/structure/bed/chair/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/tether)
"aNl" = (
/turf/simulated/shuttle/floor/black,
/area/shuttle/tether)
"aNm" = (
/obj/structure/bed/chair/shuttle{
dir = 8
},
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1380;
id_tag = "tether_shuttle";
pixel_x = 25;
tag_door = "tether_shuttle_hatch"
},
/turf/simulated/shuttle/floor/black,
/turf/simulated/floor/tiled,
/area/shuttle/tether)
"aNn" = (
/obj/effect/floor_decal/borderfloorblack{
@@ -24145,7 +24141,7 @@
locked = 1;
name = "Shuttle Hatch"
},
/turf/simulated/shuttle/floor/black,
/turf/simulated/floor/tiled,
/area/shuttle/tether)
"aNA" = (
/obj/machinery/power/apc{
@@ -24239,20 +24235,8 @@
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"aNJ" = (
/obj/structure/bed/chair/shuttle{
dir = 1
},
/obj/machinery/light{
dir = 8
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/tether)
"aNK" = (
/obj/structure/bed/chair/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor/black,
/turf/simulated/floor/tiled,
/area/shuttle/tether)
"aNL" = (
/obj/structure/window/basic/full,
@@ -24286,11 +24270,10 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/lobby)
"aNP" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
/obj/structure/bed/chair/shuttle{
dir = 4
},
/turf/simulated/shuttle/plating/airless,
/turf/simulated/floor/tiled,
/area/shuttle/tether)
"aNQ" = (
/obj/machinery/firealarm{
@@ -39015,6 +38998,59 @@
},
/turf/simulated/floor/tiled,
/area/rnd/research/researchdivision)
<<<<<<< HEAD
||||||| parent of 4a2211ba08... Fancy Lifeboats (#11392)
"eLp" = (
/obj/structure/disposalpipe/segment{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/portable_atmospherics/hydroponics,
/turf/simulated/floor/grass,
/area/hydroponics)
"eMY" = (
/obj/structure/sink{
pixel_y = 20
},
/obj/structure/mirror{
pixel_y = 38
},
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/barrestroom)
=======
"eLp" = (
/obj/structure/disposalpipe/segment{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/portable_atmospherics/hydroponics,
/turf/simulated/floor/grass,
/area/hydroponics)
"eLD" = (
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1380;
id_tag = "tether_shuttle";
pixel_x = 23;
tag_door = "tether_shuttle_hatch"
},
/turf/simulated/floor/tiled,
/area/shuttle/tether)
"eMY" = (
/obj/structure/sink{
pixel_y = 20
},
/obj/structure/mirror{
pixel_y = 38
},
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/barrestroom)
>>>>>>> 4a2211ba08... Fancy Lifeboats (#11392)
"eQN" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -40762,6 +40798,18 @@
/obj/item/clothing/head/helmet/space/void/security/prototype,
/turf/simulated/floor/wood,
/area/tether/surfacebase/security/hos)
"lRa" = (
/obj/effect/fancy_shuttle/lifeboat1{
dir = 1;
fancy_shuttle_tag = "lifeboat1"
},
/obj/effect/fancy_shuttle_floor_preview/lifeboat1{
dir = 1
},
/turf/simulated/wall/fancy_shuttle{
fancy_shuttle_tag = "lifeboat1"
},
/area/shuttle/tether)
"lSv" = (
/obj/structure/cable/green{
d1 = 1;
@@ -43006,7 +43054,7 @@
landmark_tag = "tether_backup_low";
name = "Surface Hangar"
},
/turf/simulated/shuttle/floor/black,
/turf/simulated/floor/tiled,
/area/shuttle/tether)
"uWw" = (
/obj/machinery/door/firedoor/glass,
@@ -313680,7 +313728,7 @@ aME
aNz
aME
aME
aME
lRa
aNY
aKj
aOj
@@ -313817,10 +313865,10 @@ aAN
aJn
aKU
aMF
aMZ
aNk
aNb
aNP
uSA
aNJ
aNP
aNP
<<<<<<< HEAD
<<<<<<< HEAD
@@ -313972,9 +314020,8 @@ aJn
aKU
aMF
aNa
aNl
aNl
aNK
<<<<<<< HEAD
aNP
<<<<<<< HEAD
<<<<<<< HEAD
@@ -313989,6 +314036,15 @@ baI
=======
bbJ
>>>>>>> 544f25a31d... Merge pull request #10379 from TheFurryFeline/TFF-Move_Syringe_Gun
||||||| parent of 4a2211ba08... Fancy Lifeboats (#11392)
aNP
asj
=======
aNK
aNK
aNK
asj
>>>>>>> 4a2211ba08... Fancy Lifeboats (#11392)
aKU
abg
aOk
@@ -314127,6 +314183,7 @@ aKU
aMF
aNb
aNm
<<<<<<< HEAD
aNl
aNK
aNP
@@ -314143,6 +314200,17 @@ baI
=======
bbJ
>>>>>>> 544f25a31d... Merge pull request #10379 from TheFurryFeline/TFF-Move_Syringe_Gun
||||||| parent of 4a2211ba08... Fancy Lifeboats (#11392)
aNl
aNK
aNP
asj
=======
eLD
aNm
aNm
asj
>>>>>>> 4a2211ba08... Fancy Lifeboats (#11392)
aKU
abg
aOk

View File

@@ -19328,6 +19328,11 @@
/obj/machinery/vending/coffee,
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/foyer)
"fyi" = (
/turf/simulated/wall/fancy_shuttle/window{
fancy_shuttle_tag = "lifeboat2"
},
/area/shuttle/large_escape_pod1)
"fyF" = (
/obj/machinery/power/apc{
cell_type = /obj/item/weapon/cell/super;
@@ -21777,13 +21782,14 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar)
"hGr" = (
/obj/structure/shuttle/engine/heater{
dir = 8
/obj/machinery/light{
dir = 1
},
/obj/structure/window/reinforced{
dir = 4
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/turf/simulated/floor/airless,
/obj/structure/bed/chair/shuttle,
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"hGI" = (
/obj/machinery/atmospherics/binary/pump/fuel{
@@ -21801,23 +21807,13 @@
},
/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/cargo)
"hHc" = (
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/closet/walllocker/emerglocker/north,
/obj/structure/bed/chair/shuttle,
/turf/simulated/floor/tiled/eris/white/gray_perforated,
/area/shuttle/large_escape_pod1)
"hHo" = (
/obj/machinery/vending/wallmed1{
layer = 3.3;
name = "Emergency NanoMed";
pixel_x = 28
},
/obj/structure/closet/walllocker/emerglocker/north,
/obj/structure/bed/chair/shuttle,
/turf/simulated/floor/tiled/eris/white/gray_perforated,
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"hHJ" = (
/obj/structure/cable/yellow{
@@ -22033,6 +22029,16 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"hPw" = (
/obj/machinery/light,
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/obj/structure/bed/chair/shuttle{
dir = 1
},
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"hPQ" = (
/obj/effect/floor_decal/industrial/warning/corner,
/obj/structure/cable/green{
@@ -22232,12 +22238,6 @@
},
/turf/simulated/floor,
/area/maintenance/substation/exploration)
"hWs" = (
/obj/structure/window/reinforced{
dir = 8
},
/turf/simulated/floor/tiled/eris/white/gray_perforated,
/area/shuttle/large_escape_pod1)
"hXK" = (
/obj/structure/cable/green{
d1 = 4;
@@ -22336,19 +22336,6 @@
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_two)
"hZW" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced{
dir = 4
},
/obj/machinery/door/blast/regular{
density = 0;
icon_state = "pdoor0";
id = "medivac blast";
name = "Shuttle Blast Doors";
opacity = 0
},
/obj/effect/shuttle_landmark{
base_area = /area/hallway/secondary/escape/medical_escape_pod_hallway;
base_turf = /turf/simulated/floor/plating;
@@ -22356,7 +22343,9 @@
landmark_tag = "escapepod1_station";
name = "Tether Station"
},
/turf/simulated/floor/plating/eris/under,
/turf/simulated/wall/fancy_shuttle/window{
fancy_shuttle_tag = "lifeboat2"
},
/area/shuttle/large_escape_pod1)
"iaf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -23189,16 +23178,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_two)
"iOG" = (
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/closet/walllocker/emerglocker/south,
/obj/structure/bed/chair/shuttle{
dir = 1
},
/turf/simulated/floor/tiled/eris/white/gray_perforated,
/area/shuttle/large_escape_pod1)
"iOW" = (
/obj/structure/extinguisher_cabinet{
dir = 8;
@@ -24070,11 +24049,16 @@
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_two)
"jRT" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_r"
/obj/effect/fancy_shuttle/lifeboat2{
dir = 4;
fancy_shuttle_tag = "lifeboat2"
},
/obj/effect/fancy_shuttle_floor_preview/lifeboat2{
dir = 4
},
/turf/simulated/wall/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1)
"jSj" = (
/obj/structure/cable/yellow{
@@ -24118,9 +24102,12 @@
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
"jSR" = (
/obj/machinery/door/airlock/glass_external,
/obj/effect/map_helper/airlock/door/simple,
/turf/simulated/floor/tiled/eris/white/gray_platform,
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/obj/machinery/door/airlock/glass_external,
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"jTP" = (
/obj/effect/floor_decal/borderfloor{
@@ -30582,22 +30569,17 @@
/obj/random/maintenance/cargo,
/turf/simulated/floor,
/area/maintenance/cargo)
"qaY" = (
/obj/structure/bed/chair/shuttle{
dir = 1
},
/obj/machinery/light,
/turf/simulated/floor/tiled/eris/white/gray_perforated,
/area/shuttle/large_escape_pod1)
"qbk" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{
frequency = 1380;
id_tag = "large_escape_pod_1";
pixel_x = -28;
pixel_y = -28
pixel_y = -24
},
/turf/simulated/floor/tiled/eris/white/gray_platform,
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"qbm" = (
/obj/structure/cable/cyan{
@@ -30626,10 +30608,18 @@
/area/quartermaster/belterdock/refinery)
"qcz" = (
/obj/structure/bed/chair/shuttle,
/turf/simulated/floor/tiled/eris/white/gray_perforated,
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"qdq" = (
/turf/simulated/floor/tiled/eris/white/gray_perforated,
/obj/machinery/vending/wallmed1{
layer = 3.3;
name = "Emergency NanoMed";
pixel_y = 30
},
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"qdy" = (
/obj/structure/cable/green{
@@ -30893,15 +30883,10 @@
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"qqe" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/eris/white/gray_platform,
/area/shuttle/large_escape_pod1)
"qqq" = (
/obj/machinery/light,
/obj/structure/bed/chair/shuttle{
dir = 1
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/turf/simulated/floor/tiled/eris/white/gray_perforated,
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"qqY" = (
/obj/machinery/alarm{
@@ -31033,14 +31018,13 @@
/turf/simulated/floor/tiled/eris/white,
/area/shuttle/medivac/general)
"qum" = (
/obj/machinery/status_display{
layer = 4;
pixel_y = -32
},
/obj/structure/bed/chair/shuttle{
dir = 1
},
/turf/simulated/floor/tiled/eris/white/gray_perforated,
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"qve" = (
/obj/structure/disposalpipe/segment{
@@ -31060,7 +31044,10 @@
/obj/structure/bed/chair/shuttle{
dir = 1
},
/turf/simulated/floor/tiled/eris/white/gray_perforated,
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"qvC" = (
/obj/structure/disposalpipe/segment{
@@ -31075,9 +31062,6 @@
/obj/item/device/radio/beacon,
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
"qvR" = (
/turf/simulated/wall/rshull,
/area/shuttle/large_escape_pod1)
"qvS" = (
/obj/machinery/power/terminal{
dir = 1;
@@ -36350,6 +36334,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/tether/exploration/pathfinder_office)
"wPp" = (
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/obj/machinery/status_display{
pixel_y = 32
},
/turf/simulated/floor/tiled,
/area/shuttle/large_escape_pod1)
"wPV" = (
/obj/structure/bed/chair/comfy/brown{
dir = 4
@@ -36432,13 +36425,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
"wTw" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
},
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1)
"wUa" = (
/obj/machinery/door/blast/shutters{
dir = 2;
@@ -37084,10 +37070,9 @@
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
"xIm" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
/turf/simulated/wall/fancy_shuttle{
fancy_shuttle_tag = "lifeboat2"
},
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1)
"xIp" = (
/turf/simulated/floor/plating,
@@ -50674,7 +50659,7 @@ aac
aam
aaa
aaa
wTw
xIm
xIm
xIm
xIm
@@ -50916,11 +50901,11 @@ aac
aam
aaa
aaa
qvR
xIm
hGr
hGr
hGr
qvR
qqe
hPw
xIm
fLT
wMe
rQq
@@ -51170,11 +51155,11 @@ aac
aaa
aaa
aaa
qvR
hHc
hWs
iOG
qvR
xIm
hHo
qqe
qvg
xIm
fLT
cOV
rQq
@@ -51312,11 +51297,11 @@ aac
aaa
aaa
aaa
qvR
fyi
qcz
qdq
qqe
qum
qvR
fyi
fLT
wMe
rQq
@@ -51454,11 +51439,11 @@ aac
aaa
aaa
aaa
qvR
fyi
qcz
qdq
qaY
qvR
qqe
qum
fyi
fLT
qCV
qOx
@@ -51596,9 +51581,9 @@ aac
aaa
aaa
aaa
qvR
qdq
xIm
qdq
qqe
qbk
jSR
tZN
@@ -51738,9 +51723,9 @@ aac
aam
aaa
aaa
qvR
qdq
qdq
xIm
wPp
qqe
qqe
jSR
auX
@@ -51880,11 +51865,11 @@ aac
aam
aaa
aaa
qvR
fyi
qcz
qdq
qqq
qvR
qqe
qum
fyi
fLT
klW
rQq
@@ -52022,11 +52007,11 @@ aam
aam
aaa
aaa
qvR
fyi
qcz
qdq
qqe
qum
qvR
fyi
qBP
kiB
etg
@@ -52164,11 +52149,11 @@ aaa
aaa
aaa
aaa
qvR
xIm
hHo
qdq
qqe
qvg
qvR
xIm
qBP
wMe
rQq
@@ -52306,11 +52291,11 @@ aaa
aaa
aaa
aaa
qvR
qvR
qdq
qvR
qvR
xIm
hGr
qqe
hPw
xIm
qBP
wMe
rQq
@@ -52448,11 +52433,11 @@ aaa
aaa
aaa
aaa
aaa
qvR
xIm
fyi
hZW
qvR
aaa
fyi
xIm
fLT
cOV
rQq