cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,676 Commits 55 Branches 0 Tags
4ef4220c8892126efa7317bdd607a10db46c43f6
Commit Graph

868 Commits

Author SHA1 Message Date
silicons
77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref 
pref for hiding your ckey from roundend report
 2020-08-31 21:19:37 -07:00
timothyteakettle
af2c7b295e ah yes 2020-08-31 02:25:54 +01:00
timothyteakettle
a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
silicons
5f7d80eab2 Merge pull request #13281 from Putnam3145/examine-pref 
Added genital/vore examine text prefs
 2020-08-29 21:19:03 -07:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Putnam
c7883775fa Added a pref to see genitals on examine. 2020-08-27 20:22:24 -07:00
silicons
857c581931 Merge pull request #13232 from timothyteakettle/is-this-a-good-idea 
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
 2020-08-27 09:55:26 -07:00
Timothy Teakettle
d877a8c0fb qol (#13250) 2020-08-26 14:14:19 +02:00
Letter N
2ddddbbbaa input moment 2020-08-23 22:07:26 +08:00
silicons
2fa023346a Merge pull request #13204 from timothyteakettle/donator-items 
adds three t1 donator items
 2020-08-23 05:08:50 -07:00
Letter N
0b159b218a revert moment 2020-08-22 16:30:56 +08:00
Letter N
317480a3e7 something something skin texture revert. oh and oh fuck shit passkeys works again. 2020-08-22 15:07:02 +08:00
Letter N
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
timothyteakettle
613880b9b0 saves and moths 2020-08-21 23:32:43 +01:00
timothyteakettle
a75d91299a yep 2020-08-21 23:16:44 +01:00
timothyteakettle
709ddb4e58 test 2020-08-21 03:48:30 +01:00
Timothy Teakettle
88fb9d277a fix lizard snouts (#13223) 2020-08-20 22:58:54 +02:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08: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
Letter N
5dff3e9a04 deletes ping 2020-08-18 11:35:10 +08: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
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