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
40,037 Commits 55 Branches 0 Tags
999262665b5e152d05e920bccc6c366684e74c5f
Commit Graph

1839 Commits

Author SHA1 Message Date
silicons
999262665b map keys 2020-12-25 15:54:28 -08:00
silicons
c05c57acf9 persistent module 2020-12-25 15:49:55 -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
silicons
7da6979b54 ok 2020-12-21 00:28:03 -07:00
silicons
ce10278c5a changes 2020-12-20 19:25:49 -07: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
4e6abdec74 i wish we both die 2020-12-19 20:51:58 -08:00
Putnam
f9edd8e8ac Made the previous-round weight-adjust based on max instead of average. 2020-12-19 20:34:28 -08:00
Putnam
c47761fa58 Added a DYNAMIC_THREAT_BASELINE config option. 
why didn't i do this sooner
 2020-12-19 19:30:16 -08:00
Putnam
f209fec1ee oh, that's why extended is there 2020-12-18 22:19:40 -08:00
Putnam
5e8f76792e Readjusted weight; added min/max config options 2020-12-18 20:24:30 -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
silicons
e87cc27803 modifications 2020-12-15 07:21:06 -07: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
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