Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GenericMap: SyndicateCentComm #244

Merged
merged 27 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
14f3be2
scentcomm
konushi Sep 25, 2023
281be99
удалил косячный шлюз
konushi Sep 25, 2023
c5cfafe
как она там оказалась
konushi Sep 25, 2023
d99a56d
фикс хелперов
konushi Sep 25, 2023
463cea6
фикс доков
konushi Sep 25, 2023
785b7b4
зоны, лого, немного отработка по карте
dj-34 Sep 25, 2023
be149d7
кресла, декали, ровер, ксерокс
dj-34 Sep 25, 2023
6bf766a
иконки лутдропа, небольшие дополнения
dj-34 Sep 25, 2023
c725e26
исправления накаканого, ящик меда
dj-34 Sep 26, 2023
51a3402
забыл поставить ящички
dj-34 Sep 26, 2023
72524ff
шаттлы, почти финал (осталась чистка и тесты)
dj-34 Sep 27, 2023
8efa619
чистка
dj-34 Sep 27, 2023
4382c74
Merge remote-tracking branch 'upstream/master' into GenericMap-SCentComm
konushi Sep 27, 2023
24d4d35
шкафы
konushi Sep 27, 2023
0f68240
почему не убралось то
konushi Sep 27, 2023
588cc9c
уровень доверия СЦК к своим = 0
konushi Sep 27, 2023
b59be64
спрятал канистру и доволен
konushi Sep 27, 2023
086a3eb
need more bullets
dj-34 Sep 27, 2023
b0b87f5
Merge branch 'GenericMap-SCentComm' of https://github.com/konushi/Par…
dj-34 Sep 27, 2023
a7f8160
починка иконки
dj-34 Sep 27, 2023
f414c33
восстановил дм файл
dj-34 Sep 27, 2023
e0ddbdf
поменял позицию синдимеда
dj-34 Sep 27, 2023
88c86c2
тетрис
dj-34 Sep 27, 2023
b1de933
фиксы по реквесту
dj-34 Sep 28, 2023
3c00dd0
удаляем бесполезный, нерабочий хлам (у оффов будет фикс)
dj-34 Sep 28, 2023
5f5ba4d
Merge branch 'master' into GenericMap-SCentComm
dj-34 Sep 28, 2023
648fc00
фикс зоны и диров
dj-34 Sep 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -516,9 +516,7 @@
/area/station/maintenance/disposal)
"adB" = (
/obj/docking_port/stationary{
dheight = 9;
dir = 2;
dwidth = 5;
dwidth = 8;
height = 22;
id = "syndicate_nw";
name = "northwest of station";
Expand Down Expand Up @@ -6317,8 +6315,8 @@
dir = 8;
dwidth = 3;
height = 5;
id = "sit_arrivals";
name = "Cyberiad Arrivals";
id = "sst_home";
name = "Near Cyberiad Arrivals";
width = 11
},
/turf/space,
Expand Down Expand Up @@ -7870,8 +7868,8 @@
dir = 4;
dwidth = 7;
height = 5;
id = "sst_home";
name = "Near Cyberiad Arrivals";
id = "sit_arrivals";
name = "Cyberiad North-West Solars";
width = 11
},
/turf/space,
Expand Down Expand Up @@ -116507,7 +116505,7 @@ aaa
aaa
aaa
aaa
aCB
aaa
aaa
aaa
aaa
Expand Down Expand Up @@ -117278,7 +117276,7 @@ aaa
aaa
aaa
aaa
aaa
ays
aaa
aaa
aaa
Expand Down Expand Up @@ -121626,7 +121624,7 @@ aaa
aaa
aaa
aaa
aaa
aab
aab
aaa
aaa
Expand Down Expand Up @@ -122157,7 +122155,7 @@ aaa
aaa
aaa
aaa
aaa
aCB
aaa
aaa
aaa
Expand Down Expand Up @@ -122928,7 +122926,7 @@ aaa
aaa
aaa
aaa
ays
aaa
aaa
aaa
aaa
Expand Down Expand Up @@ -123184,10 +123182,10 @@ aaa
aaa
aaa
aaa
aab
aab
aab
aab
aaa
aaa
aaa
aaa
aaa
aGn
bat
Expand Down
38 changes: 18 additions & 20 deletions _maps/map_files220/delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,12 @@
/area/station/maintenance/auxsolarstarboard)
"acJ" = (
/obj/docking_port/stationary{
dheight = 9;
dir = 2;
dwidth = 5;
height = 22;
id = "syndicate_nw";
name = "northwest of station";
width = 18
dir = 8;
dwidth = 3;
height = 5;
id = "sst_home";
name = "Near Kerberos Arrivals";
width = 11
},
/turf/space,
/area/space)
Expand Down Expand Up @@ -57305,12 +57304,11 @@
/area/station/science/research)
"dZi" = (
/obj/docking_port/stationary{
dir = 4;
dwidth = 7;
height = 5;
id = "sst_home";
name = "Near Kerberos Arrivals";
width = 11
dwidth = 8;
height = 22;
id = "syndicate_nw";
name = "northwest of station";
width = 18
},
/turf/space,
/area/space)
Expand Down Expand Up @@ -57346,8 +57344,8 @@
/area/station/public/sleep)
"dZG" = (
/obj/docking_port/stationary{
dir = 8;
dwidth = 3;
dir = 4;
dwidth = 7;
height = 5;
id = "sit_arrivals";
name = "Arrivals Maintenance";
Expand Down Expand Up @@ -107963,7 +107961,7 @@ aaa
aaa
aaa
aaa
acJ
aaa
aaa
aaa
aaa
Expand Down Expand Up @@ -109813,7 +109811,7 @@ aaa
aaa
aaa
aaa
aaa
dZi
aaa
aaa
aaa
Expand Down Expand Up @@ -133919,8 +133917,8 @@ aaa
aaa
aaa
aaa
acJ
aaa
dZi
aaa
aaa
aaa
Expand Down Expand Up @@ -148339,7 +148337,7 @@ aaa
aaa
aaa
aaa
aaa
dZG
aaa
aaa
aaa
Expand Down Expand Up @@ -150922,7 +150920,7 @@ aaa
aaa
aaa
aaa
dZG
aaa
aaa
aaa
aaa
Expand Down
Loading