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 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,703 Commits 55 Branches 0 Tags
cdaef63fa1200a6054fef3fa82ae782da3dd3a31
Commit Graph

1391 Commits

Author SHA1 Message Date
timothyteakettle
cdaef63fa1 sorry travis 2020-09-03 23:07:19 +01:00
timothyteakettle
90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
timothyteakettle
9e2ee588c9 rp prosthetics 2020-09-03 22:05:21 +01: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
Timothy Teakettle
fe25046410 Merge branch 'master' into limbs 2020-08-27 18:06:35 +01:00
silicons
973839dee4 ports my baystruments updates from tg (#13219) 
* subsystem

* fix

* e

* update

* fix
 2020-08-25 21:04:42 +02:00
timothyteakettle
cd7293a9a2 limbs 2020-08-24 03:19:36 +01:00
silicons
7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835 
Removing priority overlays, update_icon() splitup for guns.
 2020-08-22 15:19:07 -07: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
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
Putnam
81dc6c7ee5 Ports reftracking from TG. 2020-08-18 20:41:43 -07:00
Letter N
5dff3e9a04 deletes ping 2020-08-18 11:35:10 +08:00
Letter N
90cb13f6af Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-18 10:33:21 +08:00
Letter N
610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
Detective Google
016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08: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
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
silicons
ed5aa7c9f7 Merge pull request #12994 from kappa-sama/patch-37 
removes dildo
 2020-08-05 15:27:29 -07:00
silicons
2d697e1867 Merge pull request #12926 from GlitchyCore/master 
Adds a new fun round end sound
 2020-08-05 15:14:20 -07:00
kappa-sama
178976f5e5 no 2020-08-01 16:54:21 -04:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08: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
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
Timothy Teakettle
721e018aec loadout stuff 2020-07-28 22:52:00 +01:00
GlitchyCore
cf7678c7d4 hey let's forget to add the filetype to this instead of making sure it would actually work 2020-07-27 14:41:10 -05:00
Ghom
f946a157f4 Update mapping.dm 2020-07-27 14:54:46 +02:00
Ghom
7e18e7a7a8 Update mapping.dm 2020-07-27 14:52:05 +02:00
Ghommie
f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
GlitchyCore
0e780d4ba0 hey you know what it'd be good if the filepath was actually there instead of the the .ogg name 2020-07-26 16:59:26 -05:00
GlitchyCore
e9b397cbad ADDS END ROUND SOUND 2020-07-26 16:41:48 -05:00
timothyteakettle
315e7e1f99 bugfixes 2020-07-24 23:49:15 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
d30acd5b09 smooth 2020-07-23 13:49:17 -07:00
silicons
9222933d77 Merge pull request #12816 from timothyteakettle/wound-port 
ports part 1 of tg wounds
 2020-07-23 10:25:25 -07:00
Letter N
d5a6a3ecd9 actual code chang 2020-07-22 12:02:31 +08:00
Letter N
49941ea2e6 code, still not enabled 2020-07-22 10:27:37 +08:00
lolman360
0f1aa3c0ca 'lolman? did you test your code?' 
no i did not ms. kevinz
 2020-07-22 10:49:56 +10:00
Putnam
3faa9d6f13 Chat queue optimization. 
To be exact, makes it only do the expensive text replacement when there's a client to receive the text.
 2020-07-20 19:58:44 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Lin
f7355dde62 Merge pull request #12728 from silicons/vote 
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
 2020-07-20 18:17:45 -05:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +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
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00