Commit Graph

347 Commits

Author SHA1 Message Date
Timothy Teakettle
022003dc7c funny comment 2021-05-08 02:05:20 +01:00
Timothy Teakettle
42d8d83ca2 Update preferences_savefile.dm 2021-05-08 01:52:55 +01:00
Timothy Teakettle
149cdeb9fd Update preferences_savefile.dm 2021-05-08 01:34:43 +01:00
Timothy Teakettle
5e271c239f conflict resolving caused runtimes 2021-05-08 01:31:44 +01:00
Timothy Teakettle
5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
Timothy Teakettle
108ff3d2f4 Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two 2021-05-08 01:27:22 +01:00
timothyteakettle
0fb72497ff color fix 2021-05-07 16:46:40 +01:00
timothyteakettle
bef9473fa1 more migration fixes and general bugfixes 2021-05-07 16:10:20 +01:00
timothyteakettle
3b07164fb4 Update preferences_savefile.dm 2021-05-07 00:56:27 +01:00
timothyteakettle
f5e2d3de2c Update preferences_savefile.dm 2021-05-07 00:44:44 +01:00
timothyteakettle
eab47bb6ae Update preferences_savefile.dm 2021-05-07 00:43:33 +01:00
timothyteakettle
440a6633ea Update preferences_savefile.dm 2021-05-07 00:37:33 +01:00
timothyteakettle
e95e4ed106 Update preferences_savefile.dm 2021-05-06 23:39:41 +01:00
Timothy Teakettle
a269e8bf03 migration fix 2021-05-06 01:51:17 +01:00
Timothy Teakettle
3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
d32770a0fa test 2021-05-02 22:19:41 +01:00
Timothy Teakettle
ac504d679b digi humans 2021-04-30 14:07:44 +01:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
silicons
77178c7664 Fix 2021-03-20 12:14:38 -07:00
silicons
d9a2316825 fix 2021-03-20 12:13:28 -07:00
silicons
bff668b743 why 2021-03-18 21:53:53 -07:00
Timothy Teakettle
9c3f7cbad6 no 2021-03-01 21:05:32 +00:00
Timothy Teakettle
329e8e7d38 Merge branch 'master' into language-tab 2021-03-01 20:49:16 +00:00
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