Commit Graph

85 Commits

Author SHA1 Message Date
LetterN
27d9238f3a mapfix 2021-03-15 21:59:06 +08:00
LetterN
a478555dbd mapfix 2021-03-15 21:02:50 +08:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
MrJWhit
d8f76a023b Tada 2021-01-23 03:44:55 -05:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
Blue Wildrose
2ab6a5cf96 Adds Colormates to every map except Snaxi 2021-01-12 06:26:13 -07:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
MrJWhit
98520dc519 Update CogStation.dmm 2021-01-05 19:38:30 -05:00
MrJWhit
ab856c75bb Update CogStation.dmm 2021-01-05 19:25:44 -05:00
MrJWhit
1a49d9738a Update CogStation.dmm 2021-01-05 00:54:34 -05:00
MrJWhit
27b5c3957f Snip snip 2021-01-04 01:26:14 -05:00
EmeraldSundisk
3e813c1ecc Add files via upload 2021-01-03 00:16:02 -08:00
Letter N
64f9605b51 map conflict any% 2021-01-02 19:56:04 +08:00
EmeraldSundisk
5961d09298 Update CogStation.dmm 2021-01-01 23:08:21 -08:00
EmeraldSundisk
ab260dcdec Add files via upload 2020-12-29 12:30:09 -08:00
EmeraldSundisk
6c5c342bb8 Update CogStation.dmm 2020-12-29 12:20:25 -08:00
MrJWhit
c34656c5e8 The rest of the stuff 2020-12-15 13:51:04 -05:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
EmeraldSundisk
330da48518 Add files via upload 2020-11-14 15:38:33 -08:00
EmeraldSundisk
00398cb45a Add files via upload 2020-11-14 15:14:53 -08:00
EmeraldSundisk
993ac9b52d Add files via upload 2020-11-14 13:32:34 -08:00
EmeraldSundisk
81c9bfecdc Update CogStation.dmm 2020-11-14 10:37:05 -08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Detective Google
c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Tupinambis
fe7a21ebc7 Coggers Fixes + Mass Driver Things 2020-09-07 22:33:54 -05:00
EmeraldSundisk
01c3f70235 Add files via upload 2020-08-24 18:58:13 -07:00
EmeraldSundisk
70c1dc0238 Update CogStation.dmm 2020-08-24 18:21:18 -07:00
silicons
4a52580c89 Merge pull request #13205 from EmeraldSundisk/cogfeex
Small fixes for CogStation.
2020-08-22 15:20:50 -07:00
EmeraldSundisk
c521d2502e Add files via upload 2020-08-18 18:27:06 -07:00
EmeraldSundisk
5e9af664ec Update CogStation.dmm 2020-08-17 20:39:54 -07:00
EmeraldSundisk
0763436a1c Update CogStation.dmm 2020-08-13 23:06:09 -07:00
silicons
16306ad38b e 2020-08-10 18:14:34 -07:00
Artur
732a1ca438 Fixes linter and conflict shit 2020-07-13 16:35:12 +03:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
EmeraldSundisk
bf97828e5e Add files via upload 2020-07-09 21:06:27 -07:00
EmeraldSundisk
4f17e7ab1d Update CogStation.dmm 2020-07-09 18:34:29 -07:00
EmeraldSundisk
b22f73e27f Update CogStation.dmm 2020-07-09 18:17:42 -07:00
EmeraldSundisk
e0428e946e Update CogStation.dmm 2020-07-09 12:46:29 -07:00
Artur
2158278a6f Fixes cog 2020-07-07 18:44:54 +03:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
EmeraldSundisk
672f86a318 Add files via upload 2020-07-05 09:39:53 -07:00
EmeraldSundisk
75b2a7dad5 Update CogStation.dmm 2020-07-05 09:18:26 -07:00
EmeraldSundisk
d9f269280b Update CogStation.dmm 2020-07-04 23:45:08 -07:00
EmeraldSundisk
45a14f16d4 Revert "?"
This reverts commit c6b5bac0d8.
2020-07-04 21:39:23 -07:00
EmeraldSundisk
c6b5bac0d8 ? 2020-07-04 21:33:29 -07:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00