Commit Graph

321 Commits

Author SHA1 Message Date
SmArtKar
b2b7b4ca9a Fucking finally 2021-02-18 14:17:43 +03:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
2021-02-17 01:30:13 -07:00
Timothy Teakettle
d858c420aa Update preferences_savefile.dm 2021-02-10 23:18:53 +00:00
TyrianTyrell
d1b7b191d2 Update preferences_savefile.dm 2021-02-04 15:14:20 -05:00
SmArtKar
b0c63ea547 Fuck you and your persistence system 2021-02-03 16:43:05 +03:00
TyrianTyrell
c8f797d69c Update preferences_savefile.dm 2021-02-01 05:45:14 -05:00
Timothy Teakettle
dc44102d8b fix 2021-01-01 22:39:16 +00:00
Timothy Teakettle
74928c0451 data issue 2020-12-28 22:21:44 +00:00
Timothy Teakettle
50fd36efa5 oops! all runtime! 2020-12-28 17:04:48 +00:00
Timothy Teakettle
67741b7561 Update preferences_savefile.dm 2020-12-27 20:09:32 +00:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
timothyteakettle
16b98adb9f no more debug 2020-12-06 23:40:00 +00:00
timothyteakettle
a84f1648f4 Update preferences_savefile.dm 2020-12-06 22:57:57 +00:00
Timothy Teakettle
e413fcb091 more fixes 2020-12-06 22:14:35 +00:00
timothyteakettle
61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-12-06 17:26:04 +00:00
timothyteakettle
0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
timothyteakettle
5566c00a69 fixes 2020-12-06 17:24:12 +00:00
timothyteakettle
a478da678e bugfixes 2020-12-06 15:50:33 +00:00
timothyteakettle
cbbcc0c386 fix the migration 2020-12-06 00:16:56 +00:00
silicons
564766d11d sigh 2020-11-27 00:16:53 -07:00
silicons
5e965d099f COME ON 2020-11-26 23:37:27 -07:00
timothyteakettle
8a2e996817 migration runtimes 2020-11-24 01:55:36 +00:00
Timothy Teakettle
5075aec151 webedit adds spaces for some reason 2020-11-22 21:43:15 +00:00
Timothy Teakettle
a976d42305 Revert "webedit adds spaces for some reason"
This reverts commit 8d41c15b75.
2020-11-22 21:42:36 +00:00
Timothy Teakettle
8d41c15b75 webedit adds spaces for some reason 2020-11-22 21:42:14 +00:00
Timothy Teakettle
285208ece3 Merge branch 'master' into communication-hotkeys 2020-11-22 21:30:43 +00:00
Timothy Teakettle
5de801ac40 communication hotkeys 2020-11-22 21:08:58 +00:00
Timothy Teakettle
9cfecfa507 Update preferences_savefile.dm 2020-11-10 23:07:01 +00:00
Timothy Teakettle
7a82f53e75 attempte fixes 2020-11-08 16:45:32 +00:00
Timothy Teakettle
022f996cfa better fix 2020-11-05 17:28:32 +00:00
timothyteakettle
f34882cf60 Update preferences_savefile.dm 2020-11-01 23:27:34 +00:00
timothyteakettle
ede19dd47d Update preferences_savefile.dm 2020-11-01 23:25:09 +00:00
Timothy Teakettle
f4f322dd0e better fix 2020-10-30 19:39:43 +00:00
timothyteakettle
cf49e78d45 Merge remote-tracking branch 'upstream/master' into i-hate-mcolor 2020-10-27 22:12:55 +00:00
timothyteakettle
a987420d22 fix for mam markings 2020-10-27 21:40:07 +00:00
timothyteakettle
4a3afae9d1 WHAT IF WE FIXED EVERYTHING IN ONE COMMIT 2020-10-21 23:59:15 +01:00
Timothy Teakettle
06bbddd248 Update preferences_savefile.dm 2020-10-21 18:20:14 +01:00
Timothy Teakettle
e6895bec04 better loadout 2020-10-20 21:02:17 +01:00
Timothy Teakettle
36040e0689 Revert "better taurs"
This reverts commit c649dbe6c6.
2020-10-20 20:05:16 +01:00
Timothy Teakettle
f5cc216a4c travis segfaulted 2020-10-18 21:51:58 +01:00
Timothy Teakettle
c53eeff33f travis segfaulted 2020-10-18 21:51:36 +01:00
Timothy Teakettle
f965b78960 remove debug messages 2020-10-18 21:36:51 +01:00
Timothy Teakettle
8e2345d2f7 FUCK 2020-10-18 21:36:17 +01:00
Timothy Teakettle
2ac3bbbaf3 fix 2020-10-18 21:09:20 +01:00
Timothy Teakettle
bb46fa319c fix 2020-10-18 18:34:07 +01:00
Timothy Teakettle
bfb3546ccc save/load 2020-10-18 18:16:29 +01:00
Timothy Teakettle
40efc4b8c8 cleanup and migration fix 2020-10-18 18:05:59 +01:00
Timothy Teakettle
87387f45d1 fixes 2020-10-17 23:32:08 +01:00
Timothy Teakettle
5e780064c1 fixes and a toggle 2020-10-17 19:47:46 +01:00
silicons
44dc292101 Update preferences_savefile.dm (#13557) 2020-10-17 13:58:33 +02:00