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 2026-01-02 05:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,847 Commits 55 Branches 0 Tags
caed4b51b9ed1bf80dd1cae3bcdc1c1f7deb8a08
Commit Graph

1018 Commits

Author SHA1 Message Date
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
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
8a9d806d04 Update client_procs.dm 2020-07-23 08:12:48 -07:00
silicons
87d53957bf sigh 2020-07-20 20:09:13 -07:00
silicons
4832069181 Update preferences_savefile.dm 2020-07-20 18:57:09 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons
b1ccccb322 more 2020-07-18 18:51:16 -07:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
Artur
d0f1a805e4 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-14 16:15:48 +03:00
Lin
55c4e40fbb Merge pull request #12706 from silicons/records 
adds security/medical records to character setup
 2020-07-13 11:50:02 -05:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
silicons
f7b476bc64 Update preferences.dm 2020-07-11 21:23:06 -07:00
Timothy Teakettle
02f46322ad port examine 2020-07-09 18:32:45 +01:00
silicons
22c3d9fe3e ok 2020-07-07 21:07:13 -07:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
silicons
6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons
cee15792b7 ok 2020-07-07 07:25:10 -07:00
Ghom
bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix 
[READY] Fixes Small Strides Formula
 2020-07-06 22:48:09 +02:00
Ghom
871993ce14 Merge pull request #12593 from silicons/autobunker 
adds verb to auto bunker override on linked servers
 2020-07-04 18:36:59 +02:00
silicons
03aa8fcc2b Update autobunker.dm 2020-07-04 00:14:32 -07:00
silicons
ae5fb008c7 Update client_defines.dm 2020-07-04 00:13:34 -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
Artur
f0154f3f1c conflicts!!! 2020-07-03 15:45:11 +03:00
Artur
365aadec54 Trying to fix the dna t 2020-07-03 00:55:18 +03:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00