mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 00:21:11 +01:00
Merge branch 'master' into final_shuttle_touches_and_stuff
This commit is contained in:
alberyk
@@ -2,7 +2,7 @@
|
||||
name = "heavy-duty cell charger"
|
||||
desc = "A much more powerful version of the standard recharger that is specially designed for charging power cells."
|
||||
icon = 'icons/obj/power.dmi'
|
||||
icon_state = "ccharger0"
|
||||
icon_state = "ccharger"
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
idle_power_usage = 5
|
||||
@@ -25,6 +25,8 @@
|
||||
cut_overlays()
|
||||
add_overlay("ccharger-o[newlevel]")
|
||||
chargelevel = newlevel
|
||||
add_overlay(charging.icon_state)
|
||||
add_overlay("cell-o2")
|
||||
add_overlay("ccharger-on")
|
||||
else
|
||||
cut_overlays()
|
||||
|
||||
@@ -172,21 +172,20 @@
|
||||
|
||||
for(var/datum/exoplanet_theme/T as anything in themes)
|
||||
T.before_map_generation(src)
|
||||
for(var/zlevel in map_z)
|
||||
for(var/map_type in map_generators)
|
||||
if(ispath(map_type, /datum/random_map/noise/exoplanet))
|
||||
var/datum/random_map/noise/exoplanet/RM = new map_type(null,1,1,zlevel,maxx,maxy,0,1,1,planetary_area, plant_colors)
|
||||
get_biostuff(RM)
|
||||
else
|
||||
new map_type(null,1,1,zlevel,maxx,maxy,0,1,1,planetary_area)
|
||||
|
||||
for (var/zlevel in map_z)
|
||||
var/list/edges
|
||||
edges += block(locate(1, 1, zlevel), locate(TRANSITIONEDGE, maxy, zlevel))
|
||||
edges |= block(locate(maxx-TRANSITIONEDGE+1, 1, zlevel),locate(maxx, maxy, zlevel))
|
||||
edges |= block(locate(maxx-TRANSITIONEDGE, 1, zlevel),locate(maxx, maxy, zlevel))
|
||||
edges |= block(locate(1, 1, zlevel), locate(maxx, TRANSITIONEDGE, zlevel))
|
||||
edges |= block(locate(1, maxy-TRANSITIONEDGE+1, zlevel),locate(maxx, maxy, zlevel))
|
||||
for(var/turf/T in edges)
|
||||
T.ChangeTurf(/turf/simulated/planet_edge)
|
||||
edges |= block(locate(1, maxy-TRANSITIONEDGE, zlevel),locate(maxx, maxy, zlevel))
|
||||
for (var/turf/T in edges)
|
||||
T.ChangeTurf(/turf/unsimulated/planet_edge)
|
||||
var/padding = TRANSITIONEDGE
|
||||
for (var/map_type in map_generators)
|
||||
if (ispath(map_type, /datum/random_map/noise/exoplanet))
|
||||
new map_type(null,padding,padding,zlevel,maxx-padding,maxy-padding,0,1,1,planetary_area, plant_colors)
|
||||
else
|
||||
new map_type(null,1,1,zlevel,maxx,maxy,0,1,1,planetary_area)
|
||||
|
||||
/obj/effect/overmap/visitable/sector/exoplanet/proc/generate_features()
|
||||
spawned_features = seedRuins(map_z, features_budget, possible_features, /area/exoplanet, maxx, maxy)
|
||||
|
||||
@@ -161,9 +161,8 @@
|
||||
icon = 'icons/turf/flooring/misc.dmi'
|
||||
icon_state = "concrete"
|
||||
|
||||
//Special world edge turf
|
||||
|
||||
/turf/simulated/planet_edge
|
||||
//Special world edge turf,
|
||||
/turf/unsimulated/planet_edge
|
||||
name = "world's edge"
|
||||
desc = "Government didn't want you to see this!"
|
||||
density = TRUE
|
||||
@@ -172,23 +171,22 @@
|
||||
icon = null
|
||||
icon_state = null
|
||||
|
||||
/turf/simulated/planet_edge/Initialize()
|
||||
/turf/unsimulated/planet_edge/Initialize()
|
||||
. = ..()
|
||||
var/obj/effect/overmap/visitable/sector/exoplanet/E = map_sectors["[z]"]
|
||||
if(!istype(E))
|
||||
return
|
||||
|
||||
var/nx = x
|
||||
if (x <= TRANSITIONEDGE)
|
||||
nx = x + (E.maxx - 2*TRANSITIONEDGE)
|
||||
else if (x >= (E.maxx - TRANSITIONEDGE + 1))
|
||||
nx = x - (E.maxx - 2*TRANSITIONEDGE)
|
||||
nx = x + (E.maxx - 2*TRANSITIONEDGE) - 1
|
||||
else if (x >= (E.maxx - TRANSITIONEDGE))
|
||||
nx = x - (E.maxx - 2*TRANSITIONEDGE) + 1
|
||||
|
||||
var/ny = y
|
||||
if(y <= TRANSITIONEDGE)
|
||||
ny = y + (E.maxy - 2*TRANSITIONEDGE)
|
||||
else if (y >= (E.maxy - TRANSITIONEDGE + 1))
|
||||
ny = y - (E.maxy - 2*TRANSITIONEDGE)
|
||||
ny = y + (E.maxy - 2*TRANSITIONEDGE) - 1
|
||||
else if (y >= (E.maxy - TRANSITIONEDGE))
|
||||
ny = y - (E.maxy - 2*TRANSITIONEDGE) + 1
|
||||
|
||||
var/turf/NT = locate(nx, ny, z)
|
||||
if(NT)
|
||||
@@ -200,7 +198,7 @@
|
||||
O.name = "distant terrain"
|
||||
O.desc = "You need to come over there to take a better look."
|
||||
|
||||
/turf/simulated/planet_edge/CollidedWith(atom/movable/A)
|
||||
/turf/unsimulated/planet_edge/CollidedWith(atom/movable/A)
|
||||
. = ..()
|
||||
var/obj/effect/overmap/visitable/sector/exoplanet/E = map_sectors["[z]"]
|
||||
if(!istype(E))
|
||||
@@ -210,12 +208,12 @@
|
||||
var/new_x = A.x
|
||||
var/new_y = A.y
|
||||
if(x <= TRANSITIONEDGE)
|
||||
new_x = E.maxx - TRANSITIONEDGE
|
||||
else if (x >= (E.maxx - TRANSITIONEDGE + 1))
|
||||
new_x = E.maxx - TRANSITIONEDGE - 1
|
||||
else if (x >= (E.maxx - TRANSITIONEDGE))
|
||||
new_x = TRANSITIONEDGE + 1
|
||||
else if (y <= TRANSITIONEDGE)
|
||||
new_y = E.maxy - TRANSITIONEDGE
|
||||
else if (y >= (E.maxy - TRANSITIONEDGE + 1))
|
||||
new_y = E.maxy - TRANSITIONEDGE - 1
|
||||
else if (y >= (E.maxy - TRANSITIONEDGE))
|
||||
new_y = TRANSITIONEDGE + 1
|
||||
|
||||
var/turf/T = locate(new_x, new_y, A.z)
|
||||
|
||||
@@ -35,6 +35,20 @@
|
||||
-->
|
||||
<div class="commit sansserif">
|
||||
|
||||
<h2 class="date">18 January 2022</h2>
|
||||
<h3 class="author">MattAtlas updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Added a new planet generation system ported from Bay.</li>
|
||||
<li class="bugfix">Fixed some overmap bugs.</li>
|
||||
<li class="tweak">Diyaabs, shantaks and samaks are now retaliate mobs.</li>
|
||||
<li class="rscadd">Ported a bunch of flavour mobs from Bay.</li>
|
||||
<li class="rscadd">Animals can now have natural armor.</li>
|
||||
</ul>
|
||||
<h3 class="author">Wowzewow updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Fixes sprite issues with cell chargers and APCs.</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">17 January 2022</h2>
|
||||
<h3 class="author">Geeves updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
|
||||
@@ -22414,3 +22414,12 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
|
||||
(fiber, fingerprint, GSR, DNA) rather than combined amount of reports.
|
||||
- bugfix: Gunshot residue now shows all residue on something rather than only the
|
||||
most recent.
|
||||
2022-01-18:
|
||||
MattAtlas:
|
||||
- rscadd: Added a new planet generation system ported from Bay.
|
||||
- bugfix: Fixed some overmap bugs.
|
||||
- tweak: Diyaabs, shantaks and samaks are now retaliate mobs.
|
||||
- rscadd: Ported a bunch of flavour mobs from Bay.
|
||||
- rscadd: Animals can now have natural armor.
|
||||
Wowzewow:
|
||||
- bugfix: Fixes sprite issues with cell chargers and APCs.
|
||||
|
||||
+1
-5
@@ -38,8 +38,4 @@ delete-after: True
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscadd: "Added a new planet generation system ported from Bay."
|
||||
- bugfix: "Fixed some overmap bugs."
|
||||
- tweak: "Diyaabs, shantaks and samaks are now retaliate mobs."
|
||||
- rscadd: "Ported a bunch of flavour mobs from Bay."
|
||||
- rscadd: "Animals can now have natural armor."
|
||||
- bugfix: "Fixed exoplanet generation."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
@@ -42,6 +42,6 @@
|
||||
)
|
||||
|
||||
num_exoplanets = 3
|
||||
planet_size = list(50,50)
|
||||
planet_size = list(65, 65)
|
||||
|
||||
map_shuttles = list(/datum/shuttle/autodock/overmap/runtime)
|
||||
|
||||
+66
-52
@@ -187,6 +187,7 @@
|
||||
"eI" = (/obj/machinery/camera/network/civilian_main{c_tag = "Central Corridor 1"; dir = 1},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_one)
|
||||
"eQ" = (/obj/machinery/atmospherics/binary/pump,/turf/simulated/floor/shuttle,/area/shuttle/runtime)
|
||||
"fq" = (/obj/machinery/computer/shuttle_control/explore/runtime,/turf/simulated/floor/shuttle,/area/shuttle/runtime)
|
||||
"fX" = (/turf/template_noop,/area/space)
|
||||
"gF" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral)
|
||||
"ie" = (/obj/effect/map_effect/wingrille_spawn/reinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/hallway/primary/central_one)
|
||||
"jf" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/wall/r_wall,/area/engineering/gravity_gen)
|
||||
@@ -247,56 +248,69 @@
|
||||
"ZH" = (/obj/structure/fuel_port,/turf/simulated/wall/r_wall,/area/shuttle/runtime)
|
||||
|
||||
(1,1,1) = {"
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacacacacacacacacacadadadadadadadacacacacacacacacacacacacacacacacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaeaeaeaeaeaeaeacababababaaaaaaacaeaeaeaeaeaeaeaeaeaeaeaeaeaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaeafafafafafafafabagagabaaaaaaahahahahaiaiaiaiaiaiaiaiaiaiaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaeafajakakakakafabalamababahahahanaoapaiaqarasatatatatataiaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaeafauavawawaxafyCayazaAvmaBkMaBaCaDkcjfaFaGaHatatatatataiaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaeafaIauaJaKKzafabaMaNabZEahahahaOaPaCaQaRaSaTatatatataUaiaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaeafaVaWaXaYaLafabaZaZabZEZEESahbabbbcaibdbeaHatatbfatataiaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaeafbgbhbibjbkafabababababababahblbbbmaibnboaHatatatatataiaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaeafbpbqafafafbrbrbsbsbsbsbsbrbrbtbuahaiaiaiaibvbvbvbvbvbvaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacbwbxbybzbAbBbCbrbDbEInbFbGbHbIbrFZbKbLbMbNbObPbvbQbRbSbTbvaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaabUHJiebWbXbYbYbYbZcacbpvtTcbcbcccdcecfbYbYbYbYbYcgchcicicicjaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaabUGobVbKbJbBbBckbrclwkmncmRLYPcncocpbBbBbBbBbBckbvuIcicicibvbvbvaaabaaaaYcaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaabUGobVbKbJbBbBbBbrcrbsbrcsbrbsbrcobJbBbBbBbBbBbBctuIcicicucvcwcvaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaabUGobVbKbzcxcxcxcyczcAcAcAcAcAUFcBcCcxcxcxcxcxLycDcEcicicibvbvbvaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaabUGobVbKbJbBbBbBbBbBbBbBbBbBbBbBbKbJbBbBbBbBbBbBbvcFcicicicjPSacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaYcaaaaaaabaaacobbxbKbJbBbBeIbBbBbBbBbBbBbBzPbKbJbBbBbBbBbBbBbvcGcHcIcJbvaeacaaabaaaaaaaaaaaaaaaa
|
||||
cKcKcKcKcKcKcKcKcKaaacGocKcLcMcNcNcKcOcOcOcKcNcNcKcPcQcRcPcPcPcScScSbvbvbvbvbvbvaeacaaabaaaaaaaaaaaaaaaa
|
||||
cKdededededededecKaaacpXcKcTcUcVcVcVcVcVcVcVcVcVcWcPcXcYcZdadadadadadadadbdcdccPaeacaaabaaaaaaaaaaaaaaaa
|
||||
cKdeQeQeQeQeQedecKaaacHBBdHKdededededededededededfcPdgdccZdadadaGrdadadadbdcdhcPaeacaaabaaaaaaaaaaaaaaaa
|
||||
cKdeQeVmVmfqQedecKcKcKdecKTPdededededededededededjUPdcdcdkdldldldldldldldmdcdccPgFacacacacacacacaaaaaaaa
|
||||
cKdeQelVJxyEZHdededededededidededededededededededjUPdcdcdcdcdcdcdcdcdcdcdcdcdccPaeacUfUfUfUfUfacaaaaaaaa
|
||||
cKdeQeeQwLTqaEdededededededidededededededededededjcPdcdcdndododopMdodododpdcdcCtaeacUfUfUfUfUfacaaaaaaaa
|
||||
cKdeQeHnENJWcqdecKcKcKdecKdidededqdqdqdqdqdqdededjdrdcdcdsdudududududududbdcdcCtaeacUfUfUfUfUfacaaaaaaaa
|
||||
cKdeQedHdHdHQedecKaaacaecKdidededqdqdqdqdqdqdededjdrdcdccZdudududududududbdcdcCtaeacUfUfUfUfUfacaaaaaaaa
|
||||
cKdededededededecKaaacaecKdidededededededededededjcPdcdcdkdldldldldldldldmdcdccPaeacWSUfUfUfUfacaaaaaaaa
|
||||
cKcKcKcKcKcKcKcKcKaaacaecKdidededededededededededjUPdcdcdcdcdcdcdcdcdcdcdcdcdccPgFacacacacacacacaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaecKdidededededededededededjUPdcdcdndodododododododpdcdccPaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaecKdddvdedededededededededfcPdgdccZdadadadadadadadbdcdhcPaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaecKdwdxdxdxdxdxdxdxdxdxdxdycPdcdccZdzdAdzdzdBdCdDdbdcdccPaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaecKcKcKcKcKcKcKcKcKcKcKcKcKcPdccPcPcPcPcPcPcPcPcPcPcPcPcPaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacaeaeaeaeaeaeaeaeaeaeaeaeaeaeaedcaeaeaeaeaeaeaeaeaeaeaeaeaeaeacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaacacacacacacacacacacacacacacacacdcacacacacacacacacacacacacacacacaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaacPdcTDxbxbnBRoIYcPaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaababababababababababababcPTDxvRocPTDQVRocPabababababababababababababababaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacPuAuAuAcPYRcPYRcPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacPcPcPcPcPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaYcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacacacacacacacacacadadadadadadadacacacacacacacacacacacacacacacacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaeaeaeaeaeaeaeacababababaaaaaaacaeaeaeaeaeaeaeaeaeaeaeaeaeaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaeafafafafafafafabagagabaaaaaaahahahahaiaiaiaiaiaiaiaiaiaiaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaeafajakakakakafabalamababahahahanaoapaiaqarasatatatatataiaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaeafauavawawaxafyCayazaAvmaBkMaBaCaDkcjfaFaGaHatatatatataiaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaeafaIauaJaKKzafabaMaNabZEahahahaOaPaCaQaRaSaTatatatataUaiaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaeafaVaWaXaYaLafabaZaZabZEZEESahbabbbcaibdbeaHatatbfatataiaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaeafbgbhbibjbkafabababababababahblbbbmaibnboaHatatatatataiaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaeafbpbqafafafbrbrbsbsbsbsbsbrbrbtbuahaiaiaiaibvbvbvbvbvbvaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacbwbxbybzbAbBbCbrbDbEInbFbGbHbIbrFZbKbLbMbNbObPbvbQbRbSbTbvaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaabUHJiebWbXbYbYbYbZcacbpvtTcbcbcccdcecfbYbYbYbYbYcgchcicicicjaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaabUGobVbKbJbBbBckbrclwkmncmRLYPcncocpbBbBbBbBbBckbvuIcicicibvbvbvaaabaaaaYcaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaabUGobVbKbJbBbBbBbrcrbsbrcsbrbsbrcobJbBbBbBbBbBbBctuIcicicucvcwcvaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaabUGobVbKbzcxcxcxcyczcAcAcAcAcAUFcBcCcxcxcxcxcxLycDcEcicicibvbvbvaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaabUGobVbKbJbBbBbBbBbBbBbBbBbBbBbBbKbJbBbBbBbBbBbBbvcFcicicicjPSacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaYcaaaaaaabaaacobbxbKbJbBbBeIbBbBbBbBbBbBbBzPbKbJbBbBbBbBbBbBbvcGcHcIcJbvaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
cKcKcKcKcKcKcKcKcKaaacGocKcLcMcNcNcKcOcOcOcKcNcNcKcPcQcRcPcPcPcScScSbvbvbvbvbvbvaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
cKdededededededecKaaacpXcKcTcUcVcVcVcVcVcVcVcVcVcWcPcXcYcZdadadadadadadadbdcdccPaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
cKdeQeQeQeQeQedecKaaacHBBdHKdededededededededededfcPdgdccZdadadaGrdadadadbdcdhcPaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
cKdeQeVmVmfqQedecKcKcKdecKTPdededededededededededjUPdcdcdkdldldldldldldldmdcdccPgFacacacacacacacaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
cKdeQelVJxyEZHdededededededidededededededededededjUPdcdcdcdcdcdcdcdcdcdcdcdcdccPaeacUfUfUfUfUfacaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
cKdeQeeQwLTqaEdededededededidededededededededededjcPdcdcdndododopMdodododpdcdcCtaeacUfUfUfUfUfacaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
cKdeQeHnENJWcqdecKcKcKdecKdidededqdqdqdqdqdqdededjdrdcdcdsdudududududududbdcdcCtaeacUfUfUfUfUfacaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
cKdeQedHdHdHQedecKaaacaecKdidededqdqdqdqdqdqdededjdrdcdccZdudududududududbdcdcCtaeacUfUfUfUfUfacaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
cKdededededededecKaaacaecKdidededededededededededjcPdcdcdkdldldldldldldldmdcdccPaeacWSUfUfUfUfacaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
cKcKcKcKcKcKcKcKcKaaacaecKdidededededededededededjUPdcdcdcdcdcdcdcdcdcdcdcdcdccPgFacacacacacacacaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaecKdidededededededededededjUPdcdcdndodododododododpdcdccPaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaecKdddvdedededededededededfcPdgdccZdadadadadadadadbdcdhcPaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaecKdwdxdxdxdxdxdxdxdxdxdxdycPdcdccZdzdAdzdzdBdCdDdbdcdccPaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaecKcKcKcKcKcKcKcKcKcKcKcKcKcPdccPcPcPcPcPcPcPcPcPcPcPcPcPaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacaeaeaeaeaeaeaeaeaeaeaeaeaeaeaedcaeaeaeaeaeaeaeaeaeaeaeaeaeaeacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaacacacacacacacacacacacacacacacacdcacacacacacacacacacacacacacacacaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaacPdcTDxbxbnBRoIYcPaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaababababababababababababcPTDxvRocPTDQVRocPabababababababababababababababaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacPuAuAuAcPYRcPYRcPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacPcPcPcPcPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaYcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafXfXfXfXfXfXfXfXfXfXfXfXfX
|
||||
"}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user