Commit Graph

487 Commits

Author SHA1 Message Date
Timothy Teakettle
813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
Timothy Teakettle
d80920a500 oops! all 0s! 2020-12-28 17:10:28 +00:00
Timothy Teakettle
b0fdbd3b1d Update preferences.dm 2020-12-28 17:01:55 +00:00
Timothy Teakettle
b03bd6fe8e Update preferences.dm 2020-12-27 22:03:28 +00:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
timothyteakettle
6ecfda1256 Update preferences.dm 2020-12-23 23:14:08 +00:00
silicons
e87cc27803 modifications 2020-12-15 07:21:06 -07:00
silicons
413bd23d0a dnr prevention 2020-12-13 23:07:12 -07:00
silicons
5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00
silicons
24c09edd03 stuff 2020-12-12 11:12:45 -07:00
Putnam3145
f0e51d666c Merge pull request #13617 from timothyteakettle/loadout-json
loadout 2: electric boogaloo
2020-12-11 18:11:56 -08:00
silicons
45a7c68da1 wow 2020-12-11 15:05:00 -07:00
Timothy Teakettle
132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
timothyteakettle
81eaa8a2b9 woops 2020-12-06 23:51:03 +00:00
timothyteakettle
16b98adb9f no more debug 2020-12-06 23:40:00 +00:00
Timothy Teakettle
e413fcb091 more fixes 2020-12-06 22:14:35 +00:00
Timothy Teakettle
53a434cfb1 suggested change 2020-12-06 20:07:50 +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
silicons
b721cf3128 Update preferences.dm 2020-12-03 05:41:56 -07:00
silicons
47c74c3fac sigh 2020-11-27 06:42:55 -07:00
silicons
ead209f507 sigh 2020-11-27 06:31:05 -07:00
silicons
ae756749cc woops 2020-11-27 05:15:40 -07:00
silicons
564766d11d sigh 2020-11-27 00:16:53 -07:00
silicons
5e965d099f COME ON 2020-11-26 23:37:27 -07:00
Timothy Teakettle
285208ece3 Merge branch 'master' into communication-hotkeys 2020-11-22 21:30:43 +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
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
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
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
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
timothyteakettle
e35b3e4a33 color editing 2020-10-26 00:47:40 +00:00
timothyteakettle
926b63ba06 stop using double spaces 2020-10-25 22:54:53 +00:00