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

Zone de commandement général - 2 - Mapping CIC Rework / Part 2 #4251

Closed
wants to merge 167 commits into from
Closed
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
38c86ae
O.T.C
LC4492 Apr 1, 2023
11f2dc4
Merge branch 'cmss13-devs:master' into master
LC4492 Apr 1, 2023
9496a5a
Merge branch 'cmss13-devs:master' into master
LC4492 Apr 12, 2023
1397359
Merge branch 'cmss13-devs:master' into master
LC4492 Apr 14, 2023
47b9cb1
Merge branch 'cmss13-devs:master' into master
LC4492 Apr 19, 2023
e69e8c2
Merge branch 'cmss13-devs:master' into master
LC4492 Apr 19, 2023
f6b48cd
Merge branch 'cmss13-devs:master' into master
LC4492 Apr 19, 2023
22631dc
Merge branch 'cmss13-devs:master' into master
LC4492 Apr 21, 2023
d387a3b
Merge branch 'cmss13-devs:master' into master
LC4492 May 9, 2023
d470991
Merge branch 'cmss13-devs:master' into master
LC4492 May 28, 2023
50a8706
Merge branch 'cmss13-devs:master' into master
LC4492 Jun 10, 2023
8fd10a0
Merge branch 'cmss13-devs:master' into master
LC4492 Jun 18, 2023
5359584
Merge branch 'cmss13-devs:master' into master
LC4492 Jul 15, 2023
3a591da
OT-Repair1
LC4492 Jul 15, 2023
51a1088
CIC-2
LC4492 Jul 15, 2023
f1fabfb
CIC-2B
LC4492 Jul 15, 2023
ef1efb2
CIC-3
LC4492 Jul 15, 2023
39b9449
CIC-3B
LC4492 Jul 15, 2023
1926755
OT-Repair2
LC4492 Jul 16, 2023
c926f9f
CIC-4
LC4492 Jul 16, 2023
379e5b8
CIC-4B
LC4492 Jul 16, 2023
c9a1ab4
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 16, 2023
1314dd6
CIC-5
LC4492 Jul 16, 2023
214bac4
CIC-5B
LC4492 Jul 16, 2023
32659f7
CIC-6
LC4492 Jul 16, 2023
24b4ee6
CIC-6B
LC4492 Jul 16, 2023
8eb737d
Merge branch 'cmss13-devs:master' into master
LC4492 Jul 16, 2023
fd20241
Merge branch 'cmss13-devs:master' into master
LC4492 Jul 17, 2023
9c60f18
OTRepair1
LC4492 Jul 17, 2023
a8352c0
CIC-7
LC4492 Jul 17, 2023
460b6f3
CIC-7B
LC4492 Jul 17, 2023
1161e83
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 17, 2023
5bcfcd2
CIC-8
LC4492 Jul 17, 2023
91325a8
CIC-8B
LC4492 Jul 17, 2023
2d8e8ae
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 18, 2023
680f513
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 18, 2023
b0309d1
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 18, 2023
4df9978
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 18, 2023
d42ce5b
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 18, 2023
1c1680a
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 18, 2023
99c08d3
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 18, 2023
54665b0
Merge branch 'cmss13-devs:master' into master
LC4492 Jul 19, 2023
80e2d35
OTRepair1
LC4492 Jul 19, 2023
01feba7
Merge branch 'master' of https://github.com/LC4492/CM-Space-Station-13
LC4492 Jul 19, 2023
40a2322
CIC-9
LC4492 Jul 19, 2023
5352728
CIC-9B
LC4492 Jul 19, 2023
8b2ef75
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 19, 2023
3bff940
OTRepair3
LC4492 Jul 19, 2023
dfd4e90
CIC-10
LC4492 Jul 19, 2023
c6e88ba
CIC-10B
LC4492 Jul 19, 2023
bf92794
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 20, 2023
8ad9197
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 20, 2023
8d5c416
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 21, 2023
14392b9
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 22, 2023
f49df20
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 24, 2023
a57121c
Merge branch 'cmss13-devs:master' into master
LC4492 Jul 24, 2023
4dd090a
Merge branch 'cmss13-devs:master' into master
LC4492 Jul 28, 2023
b862a6a
CIC-11
LC4492 Jul 28, 2023
1a4b50f
CIC-11B
LC4492 Jul 28, 2023
8c47d3d
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 28, 2023
0f6b2a5
Merge branch 'master' into Command-Area-Remake
LC4492 Jul 29, 2023
cb60477
CIC-12
LC4492 Jul 29, 2023
4a7c568
CIC-12B
LC4492 Jul 29, 2023
bc5a8ab
Merge branch 'cmss13-devs:master' into master
LC4492 Aug 2, 2023
59fb7b9
Merge branch 'cmss13-devs:master' into master
LC4492 Aug 4, 2023
dae5d3f
Merge branch 'cmss13-devs:master' into master
LC4492 Aug 10, 2023
a1ea8c9
Merge branch 'cmss13-devs:master' into master
LC4492 Aug 17, 2023
8ae3484
Merge branch 'cmss13-devs:master' into master
LC4492 Aug 18, 2023
4c2fcf5
Merge branch 'cmss13-devs:master' into master
LC4492 Aug 18, 2023
65f8419
C.N.14
LC4492 Aug 19, 2023
a6852f9
C.N.14B
LC4492 Aug 19, 2023
1a0305a
Merge branch 'cmss13-devs:master' into master
LC4492 Aug 19, 2023
f83a0a4
Map_Repair1
LC4492 Aug 19, 2023
1e3faee
CIC-13
LC4492 Aug 24, 2023
9f128c9
CIC-13B
LC4492 Aug 24, 2023
43c0b74
CIC-14
LC4492 Aug 24, 2023
6e0df77
Merge branch 'master' of https://github.com/LC4492/CM-Space-Station-13
LC4492 Aug 24, 2023
99af8c9
CIC-15
LC4492 Aug 24, 2023
fa78cc3
CIC-15B
LC4492 Aug 24, 2023
d871f34
SmallThings_1
LC4492 Aug 24, 2023
a3680d1
Merge branch 'master' into Command-Area-Remake
LC4492 Aug 24, 2023
d18562b
CIC-16
LC4492 Aug 24, 2023
b8392fa
CIC-16B
LC4492 Aug 24, 2023
442655e
Merge branch 'master' into Command-Area-Remake
LC4492 Aug 25, 2023
6dcd144
CIC-17
LC4492 Aug 25, 2023
95b357d
Merge branch 'Command-Area-Remake' of https://github.com/LC4492/CM-Sp…
LC4492 Aug 25, 2023
872b6d9
CIC-17B
LC4492 Aug 25, 2023
7b365ef
Merge branch 'master' into Command-Area-Remake
LC4492 Aug 25, 2023
02d21a0
Delete colonialmarines.dme
LC4492 Aug 25, 2023
1bd2152
C_Repair1
LC4492 Aug 25, 2023
a395656
Merge branch 'cmss13-devs:master' into master
LC4492 Aug 25, 2023
fbd1dd0
C_Repair2
LC4492 Aug 25, 2023
87a6585
Merge branch 'master' into Command-Area-Remake
LC4492 Aug 26, 2023
e773190
Merge branch 'cmss13-devs:master' into master
LC4492 Aug 26, 2023
a6f1563
CIC-18
LC4492 Aug 26, 2023
b1a99b1
CIC-18B
LC4492 Aug 26, 2023
65d5bc7
CIC-18C
LC4492 Aug 26, 2023
1a8c06e
Merge branch 'master' into Command-Area-Remake
LC4492 Aug 27, 2023
0bac509
Merge branch 'master' of https://github.com/LC4492/CM-Space-Station-13
LC4492 Aug 27, 2023
90f02e0
Merge branch 'master' into Command-Area-Remake
LC4492 Aug 27, 2023
e3b9db6
CIC-19
LC4492 Aug 27, 2023
1d0f8cb
CIC-19B
LC4492 Aug 27, 2023
4b83c66
CIC-19C
LC4492 Aug 27, 2023
34e92e0
Merge branch 'cmss13-devs:master' into master
LC4492 Sep 6, 2023
b75cdf3
Merge branch 'cmss13-devs:master' into master
LC4492 Sep 17, 2023
1db6a51
Merge branch 'master' into Command-Area-Remake
LC4492 Sep 17, 2023
26548ef
CIC-19
LC4492 Sep 17, 2023
308393e
CIC-20
LC4492 Sep 17, 2023
a5c46cf
CIC-20B
LC4492 Sep 17, 2023
7f6ddca
CIC-21
LC4492 Sep 18, 2023
e44ba5a
CIC-21B
LC4492 Sep 18, 2023
a3512d1
CIC-22
LC4492 Sep 19, 2023
f070089
CIC-22B
LC4492 Sep 19, 2023
dda0901
Merge branch 'master' into Command-Area-Remake
LC4492 Sep 19, 2023
53e57a7
Merge branch 'master' into Command-Area-Remake
LC4492 Sep 20, 2023
aa59e34
Merge branch 'master' into Command-Area-Remake
LC4492 Sep 20, 2023
a0af0b9
fixes tablet
morrowwolf Sep 26, 2023
84edde9
Merge branch 'master' into Command-Area-Remake
LC4492 Sep 26, 2023
980ce69
CIC-23
LC4492 Sep 26, 2023
86dd2c8
CIC-23B
LC4492 Sep 26, 2023
8b552da
CIC-23C
LC4492 Sep 26, 2023
c0b34ad
CIC-23D
LC4492 Sep 26, 2023
2e58ac4
Merge branch 'cmss13-devs:master' into master
LC4492 Sep 29, 2023
4e55f0a
Merge branch 'cmss13-devs:master' into master
LC4492 Oct 5, 2023
10a1337
Merge branch 'cmss13-devs:master' into master
LC4492 Oct 11, 2023
ccda3f7
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 12, 2023
f9fd78c
CIC-23E
LC4492 Oct 12, 2023
2f3069b
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 12, 2023
8caef01
CIC-24
LC4492 Oct 12, 2023
d05a23c
CIC-24B
LC4492 Oct 12, 2023
c9533fc
CIC-24C
LC4492 Oct 12, 2023
fa8d54e
CIC-24C
LC4492 Oct 12, 2023
ffcc573
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 15, 2023
5ede15a
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 15, 2023
890b0de
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 15, 2023
eb25627
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 15, 2023
b5043c0
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 15, 2023
0103d21
Merge branch 'master' of https://github.com/LC4492/CM-Space-Station-13
LC4492 Oct 17, 2023
fce7f08
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 17, 2023
18175b5
Merge branch 'Command-Area-Remake' of https://github.com/LC4492/CM-Sp…
LC4492 Oct 17, 2023
6e017a4
CIC-25
LC4492 Oct 17, 2023
4cfcb0d
CIC-25B
LC4492 Oct 17, 2023
f953a36
CIC-25C
LC4492 Oct 17, 2023
be4098c
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 17, 2023
4f32bd1
Merge branch 'master' of https://github.com/LC4492/CM-Space-Station-13
LC4492 Oct 21, 2023
b5db06b
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 21, 2023
cb834f7
CIC-26
LC4492 Oct 21, 2023
0cf8313
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 21, 2023
0f022d4
CIC-25B-P
LC4492 Oct 21, 2023
053cd41
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 22, 2023
2cb7365
Merge branch 'cmss13-devs:master' into master
LC4492 Oct 22, 2023
b88f827
Merge branch 'cmss13-devs:master' into master
LC4492 Oct 23, 2023
27cdd26
Merge branch 'Command-Area-Remake' of https://github.com/LC4492/CM-Sp…
LC4492 Oct 23, 2023
fccdfef
Revert "CIC-25B-P"
LC4492 Oct 23, 2023
47c11d0
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 23, 2023
ad394ea
CIC-26
LC4492 Oct 23, 2023
2712d62
CIC-26B
LC4492 Oct 23, 2023
292df3f
CIC-26C
LC4492 Oct 23, 2023
a6b0944
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 24, 2023
dff4545
Merge branch 'cmss13-devs:master' into master
LC4492 Oct 27, 2023
2bf7062
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 27, 2023
aae9e70
CIC-27
LC4492 Oct 27, 2023
4340381
Merge branch 'Command-Area-Remake' of https://github.com/LC4492/CM-Sp…
LC4492 Oct 27, 2023
bf265d2
CIC-27B
LC4492 Oct 29, 2023
6343cc3
Merge branch 'master' into Command-Area-Remake
LC4492 Oct 29, 2023
4c5e56d
CIC-27C
LC4492 Oct 29, 2023
d2275dc
Merge branch 'Command-Area-Remake' of https://github.com/LC4492/CM-Sp…
LC4492 Oct 29, 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
Loading