Commit Graph

1146 Commits

Author SHA1 Message Date
Timothy Teakettle 6926ea74ab Update preferences.dm 2021-05-10 13:58:53 +01:00
Timothy Teakettle d479f80f9b linters are literally stupid 2021-05-08 21:19:07 +01:00
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
timothyteakettle 80599201cf better fix 2021-05-06 22:39:07 +01:00
Timothy Teakettle a269e8bf03 migration fix 2021-05-06 01:51:17 +01:00
Timothy Teakettle bee9d9c047 support for the ridiculous thing i just did 2021-05-05 22:29:21 +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 1664459b14 squash bugs 2021-05-05 15:26:56 +01:00
timothyteakettle b2d8c980e4 task failed sucessfully 2021-05-05 00:54:44 +01:00
timothyteakettle f816bba62a bugfixes 2021-05-05 00:51:52 +01:00
timothyteakettle fac2b259ac big changes 2 2021-05-03 22:43:45 +01:00
timothyteakettle f4bb5255ab Revert "big changes"
This reverts commit 7ac50b7ba2.
2021-05-03 22:43:32 +01:00
timothyteakettle 7ac50b7ba2 big changes 2021-05-03 22:43:22 +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 2daed9250f some bugfixes 2021-05-02 18:30:35 +01:00
Timothy Teakettle 7efadade15 href fix 2021-05-01 20:55:13 +01:00
Timothy Teakettle 8aed1b4236 more color code 2021-05-01 20:37:22 +01:00
Timothy Teakettle ddc3e3b3b2 Update preferences.dm 2021-05-15 21:24:20 +01:00
Timothy Teakettle ac504d679b digi humans 2021-04-30 14:07:44 +01:00
Timothy Teakettle cb98cbd19f colour backend 2021-04-28 22:33:05 +01:00
timothyteakettle 79b73a53a0 working buttons probably 2021-04-28 16:53:12 +01:00
Timothy Teakettle 06e003f49b functionality 2021-04-26 21:58:12 +01:00
silicons 03fa382f36 Update autobunker.dm 2021-04-26 13:57:34 -07:00
Timothy Teakettle ca3ef3b0f3 X button 2021-04-26 18:02:47 +01:00
Timothy Teakettle a6a3f99539 rp marking ui 2021-04-25 20:57:02 +01:00
Timothy Teakettle ec41b301c7 a 2021-04-24 18:55:07 +01:00
Timothy Teakettle 869124bb50 markings 2021-04-24 15:56:57 +01:00
Timothy Teakettle e89b05cfdd oh dear 2021-04-23 21:13:32 +01:00
SandPoot 5bb6078def upload files 2021-04-22 20:39:21 -03:00
silicons 8510542260 Update autobunker.dm 2021-04-20 04:55:00 -07:00
silicons ee4f019459 Merge pull request #14506 from timothyteakettle/loadout-tab-defines
fixes character previews but does it using defines (thanks zero)
2021-03-27 01:34:16 -06:00
Timothy Teakettle fa541671d6 yes 2021-03-23 21:44:19 +00:00
silicons 77178c7664 Fix 2021-03-20 12:14:38 -07:00
silicons d9a2316825 fix 2021-03-20 12:13:28 -07:00
silicons d7829db9ca let's make this more clear 2021-03-18 21:55:21 -07:00
silicons bff668b743 why 2021-03-18 21:53:53 -07:00