Commit Graph

846 Commits

Author SHA1 Message Date
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons
b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00
silicons
428bb936aa Merge pull request #13037 from timothyteakettle/freedom-in-customisation
turns 304 lines of snowflake code into 24 lines
2020-08-16 18:35:05 -07:00
timothyteakettle
8b4fb136b2 ok fuck it 2020-08-14 02:37:08 +01:00
timothyteakettle
a9caceb001 insect fluff! 2020-08-14 02:27:54 +01:00
Timothy Teakettle
e5d48e307a woops 2020-08-12 17:04:37 +01:00
Timothy Teakettle
82298fd56c yes 2020-08-12 17:03:23 +01:00
timothyteakettle
1f240b883f holy shit 2020-08-11 03:37:04 +01:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Putnam
02c990ab27 Toggle's no longer relevant. 2020-08-08 02:18:58 -07:00
silicons
aa5b99a9d4 make it end 2020-08-07 00:03:59 -07:00
silicons
4dd51f3d9c fix 2020-08-06 23:48:05 -07:00
silicons
72d0f2a4a3 AAAAAAAA 2020-08-06 23:43:14 -07:00
silicons
65839060c9 Fixes 2020-08-06 23:39:57 -07:00
silicons
3640a33ff6 e 2020-08-06 23:22:53 -07:00
silicons
bcfc601c7a sigh 2020-08-06 23:11:09 -07:00
silicons
8edb374a20 sigh 2020-08-06 23:09:02 -07:00
silicons
1586625e6b Merge pull request #12960 from timothyteakettle/loadout-you-say
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
timothyteakettle
e773062b9a reverse the loadout update 2020-08-07 03:58:19 +01:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
timothyteakettle
2001c589c4 fuck 2020-08-05 23:28:13 +01:00
timothyteakettle
4cc3ca2193 lets try that again 2020-08-05 23:27:47 +01:00
silicons
f5f0d6be81 Merge pull request #12990 from timothyteakettle/tongue-patch
make tongue preference pass through cloning
2020-08-05 15:26:04 -07:00
Timothy Teakettle
6ba359e0a1 fix 2020-08-05 17:43:54 +01:00
Timothy Teakettle
14bc60955f unlocked 2020-08-05 16:31:27 +01:00
Timothy Teakettle
f2c1b25119 yes 2020-08-05 15:50:25 +01:00
Timothy Teakettle
1f62a4bbf9 typo 2020-08-05 15:29:07 +01:00
Timothy Teakettle
8effb219e1 fix a bug and reduce it by 1 more line 2020-08-05 15:27:48 +01:00
Timothy Teakettle
5297700340 snowflake coders are bad 2020-08-05 14:11:40 +01:00
Letter N
ed67801590 what if the tgui actualy recives it's topic? 2020-08-05 09:21:19 +08:00
silicons
a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
2020-08-03 14:43:07 -07:00
timothyteakettle
3740e40256 sorry travis 2020-08-02 23:25:00 +01:00
Timothy Teakettle
c1f2ef3b38 we can try 2020-08-02 20:46:15 +01:00
Timothy Teakettle
f7093f2f84 yes 2020-08-02 17:32:13 +01:00
zerothebigboy
34a8d8f798 a 2020-08-02 01:38:23 -04:00
timothyteakettle
8d63714f3a make tongue preference dna 2020-07-31 23:04:29 +01:00
Timothy Teakettle
f901aa9d42 travis work 2020-07-29 21:48:47 +01:00
Timothy Teakettle
d5ac2dcd74 debug remove 2020-07-29 18:26:35 +01:00
Timothy Teakettle
b5a16d8945 MORE CLOTHES 2020-07-29 18:20:46 +01:00
Timothy Teakettle
31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
timothyteakettle
c15d0de20d subcategories work 2020-07-29 03:57:16 +01:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
Lin
c36bf1b5ed Merge pull request #12871 from Citadel-Station-13/silicons-patch-47
ports some tg changes to make clients properly garbage collect
2020-07-26 17:26:38 -05:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
Lin
02add89513 Merge pull request #12846 from Citadel-Station-13/silicons-patch-42
it would be real lovely if the server didn't nuke 40 people's characters because the configuration couldn't be loaded because i really hate dll memes
2020-07-23 13:29:18 -05:00
Lin
6fca9af0ed Merge pull request #12848 from silicons/morecolors
species customization now allows 16 million colors instead of 4 thousand
2020-07-23 13:28:50 -05:00