mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 15:01:04 +01:00
Fixing Z level cable update and substations (#5937)
Oh boi, this one is a tiny in terms of lines, yet a huge impact. It absolutely solves problem with powernet bug of cables not updating through Z levels properly. Spend lots of time and especially intellectual effort to debug this thing and finally comparing Bay's code and debugging ours showed that lines 359 and 364 should be power_list(T, src, 12) because that stands for marked and we have unmarked cables. Fixes Z level update of cables, now it updates them properly. So the substations work. Fixes #5165 , Fixes #5883 , Fixes #5655 Fixes mapping of cables Increases charge of runtime SMES Adds Z powernet to runtime levels for debug and tests Adds Z level supply pipes and vents for debugging and tests
This commit is contained in:
Mykhailo Bykhovtsev
committed by
Erki
Erki
parent
28c3444c4a
commit
94f215c014
@@ -356,12 +356,12 @@ obj/structure/cable/proc/cableColor(var/colorC)
|
||||
if(d1 == 11 || d2 == 11)
|
||||
T = GetBelow(src)
|
||||
if(T)
|
||||
. += power_list(T, src, 12, 1)
|
||||
. += power_list(T, src, 12, powernetless_only)
|
||||
|
||||
if(d1 == 12 || d2 == 12)
|
||||
T = GetAbove(src)
|
||||
if(T)
|
||||
. += power_list(T, src, 11, 1)
|
||||
. += power_list(T, src, 11, powernetless_only)
|
||||
|
||||
// Handle standard cables in adjacent turfs
|
||||
for(var/cable_dir in list(d1, d2))
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
# admin
|
||||
# backend
|
||||
# security
|
||||
# refactor
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: PoZe
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# 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:
|
||||
- bugfix: "Cables are now updating their Z level connections properly. So removing cables or using substations now works as intended!"
|
||||
@@ -9007,6 +9007,8 @@
|
||||
/area/turret_protected/ai)
|
||||
"apY" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
@@ -10291,6 +10293,7 @@
|
||||
"asn" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable{
|
||||
d1 = 32;
|
||||
icon_state = "11-1"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/green{
|
||||
|
||||
@@ -4415,6 +4415,8 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
@@ -21360,6 +21362,8 @@
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/supply,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers,
|
||||
/obj/structure/cable{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
@@ -21387,6 +21391,7 @@
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/supply,
|
||||
/obj/structure/cable{
|
||||
d1 = 32;
|
||||
d2 = 2;
|
||||
icon_state = "11-2"
|
||||
},
|
||||
@@ -47858,13 +47863,6 @@
|
||||
icon_state = "up-supply";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/structure/disposalpipe/up,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medbay)
|
||||
@@ -53905,26 +53903,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/maintcentral)
|
||||
"bNg" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/supply{
|
||||
icon_state = "up-supply";
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
|
||||
icon_state = "up-scrubbers";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
roof_type = null
|
||||
},
|
||||
/area/maintenance/maintcentral)
|
||||
"bNh" = (
|
||||
/obj/structure/closet,
|
||||
/obj/item/clothing/head/ushanka,
|
||||
@@ -61384,6 +61362,8 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
@@ -65608,6 +65588,28 @@
|
||||
/obj/item/stack/cable_coil,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/engineering)
|
||||
"mGm" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/supply{
|
||||
icon_state = "up-supply";
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
|
||||
icon_state = "up-scrubbers";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
roof_type = null
|
||||
},
|
||||
/area/maintenance/maintcentral)
|
||||
"mUs" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
@@ -65671,11 +65673,6 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medbay)
|
||||
"nQp" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
},
|
||||
@@ -65781,12 +65778,12 @@
|
||||
"rdt" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medbay)
|
||||
"rhw" = (
|
||||
@@ -65969,6 +65966,19 @@
|
||||
temperature = 278
|
||||
},
|
||||
/area/medical/temp_morgue)
|
||||
"xhG" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medbay)
|
||||
"xPe" = (
|
||||
/obj/structure/table/rack,
|
||||
/obj/random/loot,
|
||||
@@ -108032,7 +108042,7 @@ buC
|
||||
bBo
|
||||
sby
|
||||
bCj
|
||||
bDg
|
||||
xhG
|
||||
bDg
|
||||
gsM
|
||||
bEP
|
||||
@@ -110873,7 +110883,7 @@ bam
|
||||
bam
|
||||
bam
|
||||
bam
|
||||
aaa
|
||||
bam
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
@@ -111129,6 +111139,7 @@ aSL
|
||||
bam
|
||||
bMu
|
||||
aSL
|
||||
aSL
|
||||
bam
|
||||
aaa
|
||||
aaa
|
||||
@@ -111138,7 +111149,6 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
@@ -111385,6 +111395,7 @@ bKt
|
||||
bBt
|
||||
bLU
|
||||
bBt
|
||||
bBt
|
||||
bNf
|
||||
bam
|
||||
aaa
|
||||
@@ -111395,7 +111406,6 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
@@ -111642,7 +111652,8 @@ bam
|
||||
bam
|
||||
bam
|
||||
bMv
|
||||
bNg
|
||||
aSL
|
||||
mGm
|
||||
bam
|
||||
aaa
|
||||
aaa
|
||||
@@ -111651,7 +111662,6 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
@@ -111901,7 +111911,7 @@ bam
|
||||
bam
|
||||
bam
|
||||
bam
|
||||
aaa
|
||||
bam
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/supply,
|
||||
/obj/structure/cable{
|
||||
d1 = 32;
|
||||
d2 = 2;
|
||||
icon_state = "11-2"
|
||||
},
|
||||
@@ -34,6 +35,8 @@
|
||||
/area/maintenance/research_port)
|
||||
"ah" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
@@ -1184,66 +1187,29 @@
|
||||
},
|
||||
/area/maintenance/maintcentral)
|
||||
"cg" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
|
||||
icon_state = "up-scrubbers";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/supply{
|
||||
icon_state = "up-supply";
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/alarm{
|
||||
dir = 4;
|
||||
icon_state = "alarm0";
|
||||
pixel_x = -22;
|
||||
pixel_y = 0
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
roof_type = null
|
||||
},
|
||||
/area/maintenance/maintcentral)
|
||||
"ch" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 1
|
||||
/turf/simulated/floor/plating{
|
||||
roof_type = null
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
icon_state = "map-supply";
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/maintcentral)
|
||||
"ci" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/supply{
|
||||
icon_state = "down-supply";
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
|
||||
icon_state = "down-scrubbers";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "11-8"
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
roof_type = null
|
||||
},
|
||||
/obj/structure/lattice,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/maintcentral)
|
||||
"cj" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
@@ -3799,8 +3765,9 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 8;
|
||||
icon_state = "11-8"
|
||||
d1 = 32;
|
||||
d2 = 1;
|
||||
icon_state = "11-1"
|
||||
},
|
||||
/obj/structure/disposalpipe/down{
|
||||
icon_state = "pipe-d";
|
||||
@@ -6796,10 +6763,6 @@
|
||||
icon_state = "down-supply";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 8;
|
||||
icon_state = "11-8"
|
||||
},
|
||||
/obj/structure/disposalpipe/down{
|
||||
icon_state = "pipe-d";
|
||||
dir = 8
|
||||
@@ -6808,6 +6771,11 @@
|
||||
/obj/structure/sign/drop{
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/medbay)
|
||||
"mb" = (
|
||||
@@ -7119,6 +7087,34 @@
|
||||
/obj/machinery/door/window/eastright,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/maintenance/interstitial_main)
|
||||
"re" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
|
||||
icon_state = "up-scrubbers";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/supply{
|
||||
icon_state = "up-supply";
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/alarm{
|
||||
dir = 4;
|
||||
icon_state = "alarm0";
|
||||
pixel_x = -22;
|
||||
pixel_y = 0
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
roof_type = null
|
||||
},
|
||||
/area/maintenance/maintcentral)
|
||||
"rA" = (
|
||||
/obj/structure/table/rack,
|
||||
/obj/item/weapon/storage/toolbox/mechanical,
|
||||
@@ -7239,6 +7235,26 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/airless,
|
||||
/area/maintenance/interstitial_construction_site)
|
||||
"yb" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
icon_state = "map-supply";
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/maintcentral)
|
||||
"yI" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
@@ -8237,9 +8253,20 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8";
|
||||
pixel_x = 0
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/interstitial_cargo)
|
||||
"Lw" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
roof_type = null
|
||||
},
|
||||
@@ -8258,6 +8285,8 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
@@ -8273,18 +8302,11 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light/small/emergency,
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/interstitial_cargo)
|
||||
"Lz" = (
|
||||
@@ -8292,10 +8314,6 @@
|
||||
icon_state = "pipe-d";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 8;
|
||||
icon_state = "11-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/supply{
|
||||
icon_state = "down-supply";
|
||||
dir = 8
|
||||
@@ -8305,8 +8323,29 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable{
|
||||
d1 = 32;
|
||||
icon_state = "11-1"
|
||||
},
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/interstitial_cargo)
|
||||
"MS" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/supply{
|
||||
icon_state = "down-supply";
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
|
||||
icon_state = "down-scrubbers";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 32;
|
||||
d2 = 1;
|
||||
icon_state = "11-1"
|
||||
},
|
||||
/obj/structure/lattice,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/maintcentral)
|
||||
"NQ" = (
|
||||
/obj/structure/table/rack,
|
||||
/obj/item/weapon/pickaxe,
|
||||
@@ -8346,6 +8385,15 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/airless,
|
||||
/area/maintenance/interstitial_construction_site)
|
||||
"Sf" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 32;
|
||||
d2 = 1;
|
||||
icon_state = "11-1"
|
||||
},
|
||||
/obj/structure/lattice/catwalk,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/medbay)
|
||||
"Sg" = (
|
||||
/obj/structure/table/rack,
|
||||
/obj/item/weapon/shovel,
|
||||
@@ -50275,7 +50323,7 @@ aa
|
||||
jK
|
||||
vD
|
||||
jK
|
||||
aa
|
||||
jK
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
@@ -50531,6 +50579,7 @@ aa
|
||||
aa
|
||||
jK
|
||||
ma
|
||||
Sf
|
||||
jK
|
||||
aa
|
||||
aa
|
||||
@@ -50639,7 +50688,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
(165,1,1) = {"
|
||||
aa
|
||||
@@ -50789,7 +50837,7 @@ aa
|
||||
jK
|
||||
jK
|
||||
jK
|
||||
aa
|
||||
jK
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
@@ -53372,7 +53420,7 @@ bc
|
||||
bc
|
||||
bc
|
||||
bc
|
||||
aa
|
||||
bc
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
@@ -53628,6 +53676,7 @@ aa
|
||||
bc
|
||||
cd
|
||||
cg
|
||||
re
|
||||
bc
|
||||
bc
|
||||
bc
|
||||
@@ -53723,7 +53772,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
(177,1,1) = {"
|
||||
aa
|
||||
@@ -53885,6 +53933,7 @@ aa
|
||||
bc
|
||||
ce
|
||||
ch
|
||||
yb
|
||||
cj
|
||||
ck
|
||||
bc
|
||||
@@ -53980,7 +54029,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
(178,1,1) = {"
|
||||
aa
|
||||
@@ -54142,6 +54190,7 @@ aa
|
||||
bc
|
||||
cf
|
||||
ci
|
||||
MS
|
||||
bc
|
||||
Kd
|
||||
bc
|
||||
@@ -54237,7 +54286,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
(179,1,1) = {"
|
||||
aa
|
||||
@@ -54400,6 +54448,7 @@ bc
|
||||
bc
|
||||
bc
|
||||
bc
|
||||
bc
|
||||
Kd
|
||||
bc
|
||||
aa
|
||||
@@ -54494,7 +54543,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
(180,1,1) = {"
|
||||
aa
|
||||
@@ -54657,6 +54705,7 @@ bM
|
||||
bM
|
||||
bM
|
||||
bM
|
||||
bM
|
||||
cc
|
||||
bc
|
||||
aa
|
||||
@@ -54751,7 +54800,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
(181,1,1) = {"
|
||||
aa
|
||||
@@ -54916,7 +54964,7 @@ bc
|
||||
bc
|
||||
bc
|
||||
bc
|
||||
aa
|
||||
bc
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
|
||||
@@ -1858,6 +1858,8 @@
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/lattice/catwalk,
|
||||
@@ -7267,6 +7269,7 @@
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/supply,
|
||||
/obj/structure/cable{
|
||||
d1 = 32;
|
||||
d2 = 2;
|
||||
icon_state = "11-2"
|
||||
},
|
||||
@@ -15803,14 +15806,14 @@
|
||||
"Dq" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/bridge/levela)
|
||||
"Dr" = (
|
||||
@@ -15865,18 +15868,15 @@
|
||||
icon_state = "down-scrubbers";
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "11-4"
|
||||
},
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 32;
|
||||
d2 = 1;
|
||||
icon_state = "11-1"
|
||||
},
|
||||
/turf/simulated/open,
|
||||
/area/bridge/levela)
|
||||
"Dw" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 9;
|
||||
pixel_y = 0
|
||||
@@ -18280,6 +18280,17 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/loading)
|
||||
"II" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/arrivals)
|
||||
"IJ" = (
|
||||
/turf/simulated/floor/asteroid/ash,
|
||||
/area/shuttle/legion/station)
|
||||
@@ -18316,14 +18327,14 @@
|
||||
icon_state = "alarm0";
|
||||
pixel_x = -22
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/arrivals)
|
||||
"IZ" = (
|
||||
/obj/structure/cable{
|
||||
d2 = 4;
|
||||
dir = 2;
|
||||
icon_state = "11-4"
|
||||
},
|
||||
/obj/structure/disposalpipe/down{
|
||||
icon_state = "pipe-d";
|
||||
dir = 4
|
||||
@@ -18337,15 +18348,14 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable{
|
||||
d1 = 32;
|
||||
icon_state = "11-1"
|
||||
},
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/arrivals)
|
||||
"Ja" = (
|
||||
/obj/machinery/light/small/emergency,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 8;
|
||||
icon_state = "pipe-c"
|
||||
@@ -19498,6 +19508,8 @@
|
||||
/area/hallway/secondary/entry/fore)
|
||||
"NJ" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
@@ -19654,6 +19666,14 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/freezer,
|
||||
/area/crew_quarters/toilet)
|
||||
"Qc" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/bridge/levela)
|
||||
"QL" = (
|
||||
/obj/structure/table/rack{
|
||||
dir = 8;
|
||||
@@ -51959,7 +51979,7 @@ sU
|
||||
Bd
|
||||
XN
|
||||
Df
|
||||
HM
|
||||
II
|
||||
Ja
|
||||
sU
|
||||
ag
|
||||
@@ -65804,7 +65824,7 @@ rV
|
||||
rV
|
||||
rV
|
||||
rV
|
||||
sN
|
||||
Qc
|
||||
Dv
|
||||
rV
|
||||
DA
|
||||
|
||||
@@ -309,6 +309,7 @@
|
||||
},
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable/blue{
|
||||
d1 = 32;
|
||||
dir = 2;
|
||||
icon_state = "11-1"
|
||||
},
|
||||
@@ -2100,6 +2101,7 @@
|
||||
/area/maintenance/solarmaint)
|
||||
"eo" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 32;
|
||||
d2 = 2;
|
||||
icon_state = "11-2"
|
||||
},
|
||||
|
||||
+106
-17
@@ -114,7 +114,7 @@
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/power/smes/buildable{
|
||||
charge = 1000000;
|
||||
charge = 1e+006;
|
||||
input_attempt = 1;
|
||||
output_attempt = 1
|
||||
},
|
||||
@@ -757,6 +757,11 @@
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/central_one)
|
||||
"bX" = (
|
||||
@@ -1145,13 +1150,18 @@
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/corner,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
icon_state = "intact-supply";
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
"cU" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
icon_state = "intact-supply";
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
"cV" = (
|
||||
@@ -1361,6 +1371,15 @@
|
||||
/obj/structure/table/standard,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/primary)
|
||||
"ie" = (
|
||||
/obj/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;
|
||||
@@ -1369,6 +1388,76 @@
|
||||
},
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/engineering/gravity_gen)
|
||||
"ob" = (
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/maintcentral)
|
||||
"pX" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "12-0"
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/supply,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/maintcentral)
|
||||
"Bd" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/construction)
|
||||
"Go" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/maintcentral)
|
||||
"HB" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/maintcentral)
|
||||
"HJ" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/maintcentral)
|
||||
"HK" = (
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
"TP" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
|
||||
(1,1,1) = {"
|
||||
aa
|
||||
@@ -1985,15 +2074,15 @@ ae
|
||||
ae
|
||||
ae
|
||||
bw
|
||||
ae
|
||||
ae
|
||||
ae
|
||||
ae
|
||||
ae
|
||||
bw
|
||||
ae
|
||||
ae
|
||||
ae
|
||||
HJ
|
||||
Go
|
||||
Go
|
||||
Go
|
||||
Go
|
||||
ob
|
||||
Go
|
||||
pX
|
||||
HB
|
||||
ae
|
||||
ae
|
||||
ae
|
||||
@@ -2039,7 +2128,7 @@ af
|
||||
af
|
||||
af
|
||||
bx
|
||||
bV
|
||||
ie
|
||||
bV
|
||||
bV
|
||||
bV
|
||||
@@ -2047,7 +2136,7 @@ bV
|
||||
bx
|
||||
cK
|
||||
cK
|
||||
cK
|
||||
Bd
|
||||
cK
|
||||
cK
|
||||
cK
|
||||
@@ -2101,8 +2190,8 @@ bK
|
||||
bK
|
||||
cL
|
||||
cT
|
||||
dd
|
||||
di
|
||||
HK
|
||||
TP
|
||||
di
|
||||
di
|
||||
di
|
||||
|
||||
+1728
-1630
File diff suppressed because it is too large
Load Diff
+125
-37
@@ -17,26 +17,34 @@
|
||||
/area/template_noop)
|
||||
"e" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"f" = (
|
||||
/obj/machinery/alarm{
|
||||
frequency = 1439;
|
||||
locked = 0;
|
||||
pixel_y = 23
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
dir = 8;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/corner,
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2";
|
||||
d2 = 2
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"g" = (
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"h" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"i" = (
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
@@ -44,15 +52,20 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"j" = (
|
||||
/turf/simulated/open,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"k" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/turf/simulated/open,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"l" = (
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
@@ -61,44 +74,49 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"m" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"n" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"o" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/lattice/catwalk,
|
||||
/turf/simulated/open,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"p" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/lattice/catwalk,
|
||||
/turf/simulated/open,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"q" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/corner,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"r" = (
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"s" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 8
|
||||
@@ -107,7 +125,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"t" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
@@ -116,19 +134,19 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"u" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"v" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"w" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 4
|
||||
@@ -137,13 +155,83 @@
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"x" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction)
|
||||
/area/construction/hallway)
|
||||
"B" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/airless,
|
||||
/area/construction/hallway)
|
||||
"H" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/construction/hallway)
|
||||
"J" = (
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction/hallway)
|
||||
"N" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 32;
|
||||
d2 = 2;
|
||||
icon_state = "11-2"
|
||||
},
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/supply,
|
||||
/turf/simulated/open,
|
||||
/area/construction/hallway)
|
||||
"P" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction/hallway)
|
||||
"T" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction/hallway)
|
||||
"X" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/construction/hallway)
|
||||
|
||||
(1,1,1) = {"
|
||||
a
|
||||
@@ -714,10 +802,10 @@ d
|
||||
d
|
||||
d
|
||||
d
|
||||
d
|
||||
d
|
||||
d
|
||||
d
|
||||
e
|
||||
e
|
||||
e
|
||||
e
|
||||
d
|
||||
d
|
||||
d
|
||||
@@ -768,10 +856,10 @@ d
|
||||
d
|
||||
d
|
||||
d
|
||||
d
|
||||
d
|
||||
d
|
||||
d
|
||||
e
|
||||
N
|
||||
B
|
||||
e
|
||||
d
|
||||
d
|
||||
d
|
||||
@@ -824,7 +912,7 @@ e
|
||||
e
|
||||
e
|
||||
e
|
||||
e
|
||||
H
|
||||
e
|
||||
e
|
||||
e
|
||||
@@ -878,14 +966,14 @@ e
|
||||
f
|
||||
i
|
||||
m
|
||||
m
|
||||
m
|
||||
m
|
||||
m
|
||||
m
|
||||
m
|
||||
m
|
||||
i
|
||||
T
|
||||
X
|
||||
P
|
||||
P
|
||||
P
|
||||
P
|
||||
P
|
||||
J
|
||||
u
|
||||
e
|
||||
d
|
||||
|
||||
Reference in New Issue
Block a user