Commit Graph

380 Commits

Author SHA1 Message Date
silicons
2fa023346a Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
2020-08-23 05:08:50 -07:00
Timothy Teakettle
264e789c3d yes 2020-08-18 17:38:20 +01:00
Timothy Teakettle
6392367df4 donator items 2020-08-18 17:28:09 +01:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
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
1f240b883f holy shit 2020-08-11 03:37:04 +01: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
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
silicons
a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
2020-08-03 14:43:07 -07: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
timothyteakettle
c15d0de20d subcategories work 2020-07-29 03:57:16 +01: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
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
silicons
87d53957bf sigh 2020-07-20 20:09:13 -07:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons
f7b476bc64 Update preferences.dm 2020-07-11 21:23:06 -07:00
silicons
6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons
cee15792b7 ok 2020-07-07 07:25:10 -07:00
Weblure
832bea9ca5 Fixed sentence formatting, removed Skyrat comments 2020-07-03 21:55:42 -07:00
Weblure
c9ec6d4a03 Fixes a button, rewords text to be clearer 2020-07-03 21:51:22 -07:00
Ghom
e586d03e0a text spans. 2020-07-02 19:47:05 +02:00
Ghom
c919075aca Thanks Timothy. 2020-07-02 19:46:10 +02:00
Timothy Teakettle
97dbd9cedf better customization 2020-06-24 21:44:48 +01:00
deathride58
513ed1ab47 Fixes a major HTML injection vulnerability with flavortext by making flavortext store itself as encoded html instead of decoded html (#12513) 2020-06-12 15:17:32 -07:00
kevinz000
7891c77ea9 text2num 2020-06-05 00:41:48 -07:00
kevinz000
ee2a2ad017 fix 2020-06-05 00:24:01 -07:00
kevinz000
a2d131646f sigh 2020-06-05 00:01:02 -07:00