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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,021 Commits 55 Branches 0 Tags
9da84c0acb26d7ecd88a42c2d526d8a2a272441c
Commit Graph

1503 Commits

Author SHA1 Message Date
Letter N
9da84c0acb reg 2020-12-24 14:09:26 +08:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
Letter N
35edf3589b break it real good 2020-12-23 18:58:02 +08:00
Letter N
47a3afff54 DB stickies 2020-12-23 16:50:48 +08:00
Letter N
61c8f69be8 better telemetry 2020-12-23 15:56:15 +08:00
Letter N
792c9ad752 actualy important because of glidesize 2020-12-23 14:16:29 +08:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2 
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
 2020-12-22 17:40:33 +01:00
silicons
0e7a597a2b alright 2020-12-21 10:27:28 -07:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
2966f985a3 rustg updates& makes shit work 2020-12-21 21:06:45 +08:00
Letter N
98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
silicons
db6f9349c5 Merge pull request #13785 from Putnam3145/fix-grab-bag 
Makes grab bag ONLY make station antags; triples alien dynamic threat.
 2020-12-20 15:42:04 -07:00
Putnam
f9edd8e8ac Made the previous-round weight-adjust based on max instead of average. 2020-12-19 20:34:28 -08:00
Putnam
e0d7699e27 Made vote only use runnable storytellers. 2020-12-15 18:48:59 -08:00
Lin
c022956c75 Merge pull request #13725 from silicons/anti_collision_bindings 
makes keybind system automatically generate anti-collision keybinds where necessary to avoid unintentional macro fires
 2020-12-15 21:24:30 +00:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
silicons
5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00
silicons
a4688557d7 Cryo 2020-12-13 02:29:31 -07:00
Lin
0d95172bef Merge pull request #13749 from Citadel-Station-13/silicons-patch-7 
fixes nonsensical verb
 2020-12-12 20:00:41 +00:00
silicons
07d8e72125 fix 2020-12-12 11:19:45 -07:00
silicons
45a7c68da1 wow 2020-12-11 15:05:00 -07:00
silicons
8af8063e73 Update input.dm 2020-12-10 13:39:22 -07:00
Timothy Teakettle
132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
Timothy Teakettle
ac9e383638 WOOPS ONE MORE DEBUG MESSAGE 2020-12-07 21:28:17 +00:00
timothyteakettle
61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-12-06 17:26:04 +00:00
timothyteakettle
0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
timothyteakettle
5566c00a69 fixes 2020-12-06 17:24:12 +00:00
timothyteakettle
a478da678e bugfixes 2020-12-06 15:50:33 +00:00
timothyteakettle
fa26f4c402 b 2020-12-06 00:02:14 +00:00
Timothy Teakettle
afdbac31fa test 2020-12-05 22:35:27 +00:00
silicons
8d7f3aebc4 sigh 2020-12-02 09:20:23 -07:00
silicons
a6d73e0344 fix 2020-11-27 04:25:22 -07:00
silicons
9f4e0ac4df woops 2020-11-26 23:38:39 -07:00
silicons
5e965d099f COME ON 2020-11-26 23:37:27 -07:00
Timothy Teakettle
285208ece3 Merge branch 'master' into communication-hotkeys 2020-11-22 21:30:43 +00:00
timothyteakettle
60077f028e port 2020-11-17 01:41:19 +00:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
silicons
2d842270f5 Merge pull request #13625 from LetterN/revert-12994-patch-37 
Reverts this circuit frame removal
 2020-10-28 07:53:15 -07:00
silicons
e672ee847e Merge pull request #13592 from Putnam3145/stat-voting-tweaks 
Adds ranked choice ballots to stat voting
 2020-10-28 07:41:43 -07:00
silicons
a3228b3366 Merge pull request #13593 from Putnam3145/add-all-vote-types-to-maps 
Stringified the vote #defines for easier config stuff
 2020-10-28 07:41:35 -07:00
timothyteakettle
b1379dd49e still not working 2020-10-27 21:11:42 +00:00
timothyteakettle
e35b3e4a33 color editing 2020-10-26 00:47:40 +00:00
Timothy Teakettle
0c2e1997ce more loadout 2 2020-10-25 22:49:39 +00:00
Letter N
3d2bd4a98e Revert "removes dildo" 2020-10-25 12:55:04 +08:00
timothyteakettle
a39dea1b4d json loadout 2020-10-24 00:31:45 +01:00
Putnam
558d11bc73 Stringified the vote #defines for easier config stuff 2020-10-18 14:49:43 -07:00
Putnam
07a02617c2 Fixed compiler errors, runtimes 2020-10-18 12:51:00 -07:00