Commit Graph

982 Commits

Author SHA1 Message Date
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
silicons
c7396632db Merge pull request #13582 from timothyteakettle/i-hate-mcolor
adds advanced colouring mode: allows you to individually colour mutant parts
2020-11-22 13:33:28 -07:00
timothyteakettle
60077f028e port 2020-11-17 01:41:19 +00:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
Timothy Teakettle
9cfecfa507 Update preferences_savefile.dm 2020-11-10 23:07:01 +00:00
LetterJay
10c90e06c1 Merge pull request #13661 from timothyteakettle/age-verification
adds in-game age verification as an alternative to access requests
2020-11-08 11:07:05 -06:00
Timothy Teakettle
185939a09f stable version 2020-11-08 16:49:49 +00:00
Timothy Teakettle
7a82f53e75 attempte fixes 2020-11-08 16:45:32 +00:00
Timothy Teakettle
d358a170fa fixes 2020-11-08 14:32:10 +00:00
Timothy Teakettle
48ecffa8f4 Revert "Revert "fixes""
This reverts commit 2fb9dc88e7.
2020-11-08 12:48:00 +00:00
Timothy Teakettle
2fb9dc88e7 Revert "fixes"
This reverts commit a7e0bafde3.
2020-11-08 02:23:55 +00:00
Timothy Teakettle
a7e0bafde3 fixes 2020-11-08 01:46:43 +00:00
Timothy Teakettle
82e561675c yes 2020-11-06 21:47:22 +00:00
Timothy Teakettle
e2ca7164b9 age verification 2020-11-06 21:00:14 +00:00
Timothy Teakettle
022f996cfa better fix 2020-11-05 17:28:32 +00:00
timothyteakettle
8126eb5a12 fixes a lot of things 2020-11-02 23:07:27 +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
22823f629d an actual fix 2020-11-01 20:40:08 +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
a9f2b86da9 tonne of fixes 2020-10-27 21:32:08 +00:00
timothyteakettle
2275dde281 prior fix didnt work this does 2020-10-27 00:15:58 +00:00
timothyteakettle
79e81a455a old fix 2020-10-26 23:52:20 +00:00
Timothy Teakettle
f468e4940a typo 2020-10-26 20:33:46 +00:00
Timothy Teakettle
4e6146898c fixes/config edits 2020-10-26 20:27:58 +00:00
Timothy Teakettle
2b00f2bb2f config values 2020-10-26 20:27:02 +00:00
Timothy Teakettle
38313fa362 i hate dwarves 2020-10-26 17:50:21 +00:00
Timothy Teakettle
cfefe99d35 okay so what if its not quirks 2020-10-26 17:45:43 +00:00
Timothy Teakettle
f778ec0199 yeah lets maybe render stuff 2020-10-22 01:33:53 +01:00
timothyteakettle
a9a4d00171 second qol 2020-10-22 00:08:33 +01: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
ab35f8cf66 include literally everything 2020-10-21 15:47:42 +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
timothyteakettle
04e1d9fc39 more fixes 2020-10-17 03:42:14 +01:00
timothyteakettle
d5a1834788 more fixes 2020-10-17 01:40:02 +01:00
timothyteakettle
4f5465c39e fixes 2020-10-17 01:00:04 +01:00