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
39,710 Commits 55 Branches 0 Tags
2966f985a30341b1086d09bb1f565b508e5a76f0
Commit Graph

1823 Commits

Author SHA1 Message Date
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
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08: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
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
0f9734b1f7 Merge pull request #13698 from timothyteakettle/communication-hotkeys 
ports rebindable communication hotkeys from tg
 2020-11-28 09:12:40 -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
Putnam
cdcba275d7 Makes dynamic no longer show none in the vote. 2020-11-24 01:13:41 -08: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
silicons
0001a2edca Merge pull request #13669 from Arturlang/sacrifice_tweaks 
Makes cult sacrifice not permakill people anymore.
 2020-11-11 11:16:15 -07:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
LetterJay
10c90e06c1 Merge pull request #13661 from timothyteakettle/age-verification 
adds in-game age verification as an alternative to access requests
 2020-11-08 11:07:05 -06:00
silicons
aab0b000c8 Merge pull request #13659 from timothyteakettle/gateway-fix 
admins loading gateways will no longer crash the server
 2020-11-07 00:30:06 -07:00
silicons
77a1bdba0c Merge pull request #13630 from timothyteakettle/short-tall-quirks 
character size scaling
 2020-11-07 00:19:29 -07:00
Timothy Teakettle
1993364ce0 Revert "deletes one word" 
This reverts commit 8b7fd151af.
 2020-11-06 21:45:52 +00:00
Timothy Teakettle
fdd7cc9843 Revert "fix" 
This reverts commit 58e884d18e.
 2020-11-06 21:45:47 +00:00
Timothy Teakettle
e2ca7164b9 age verification 2020-11-06 21:00:14 +00:00
Timothy Teakettle
58e884d18e fix 2020-11-05 21:49:46 +00:00
Timothy Teakettle
8b7fd151af deletes one word 2020-11-05 16:59:49 +00: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
Timothy Teakettle
0fa83322a1 re-add slow stride but it defaults to disabled 2020-10-26 20:40:11 +00:00
Timothy Teakettle
4e6146898c fixes/config edits 2020-10-26 20:27:58 +00:00
Timothy Teakettle
2b00f2bb2f config values 2020-10-26 20:27:02 +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
Putnam
00b4d207c5 Added ranked choice ballots to stat voting. 2020-10-18 12:32:45 -07:00
Ghommie
c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
silicons
c3cdeb0507 fixes movespeed configurations (#13555) 
* Update config_entry.dm

* Update game_options.dm

* Update config_entry.dm

* Update code/controllers/configuration/config_entry.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-10-15 13:53:21 +02:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
BlackMajor
313970000b Merge pull request #13522 from silicons/async 
Fixes the intermittent master controller lockups
 2020-10-11 18:48:37 +13:00