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-16 21:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,497 Commits 55 Branches 0 Tags
901b54b7e8d79d59eb51b9387d2bf4d4aaa1628c
Commit Graph

1124 Commits

Author SHA1 Message Date
Putnam
dd3520896a wow there's an else 2020-02-19 11:45:37 -08:00
Putnam
6aec971b4e haha i'm dumb 2020-02-18 21:41:00 -08:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569 
Something about the in operator and spaceDMM version update.
 2020-02-15 12:17:37 -07:00
kevinz000
56545d742d Merge pull request #10923 from Citadel-Station-13/Ghommie-patch-7 
Nerfing cargo passive points generation
 2020-02-15 12:15:31 -07:00
Ghom
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler 
ports auto profiler subsystem from tg
 2020-02-13 15:06:27 +01:00
Ghom
7198637463 Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7 
STOP_PROCESSING now also removes from currentrun
 2020-02-13 15:05:51 +01:00
kevinz000
4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571 
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
 2020-02-13 04:11:01 -07:00
kevinz000
d8d6a8efb8 lazy-be-gone 2020-02-12 02:15:56 -07:00
Putnam
7795e1609d why did i do that 2020-02-11 15:32:43 -08:00
kevinz000
3848da5b6b mso 2020-02-11 07:55:00 -07:00
kevinz000
275fb6fc41 auto profiler 2020-02-11 07:54:17 -07:00
Ghommie
0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
Ghommie
c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Ghom
f27ce86769 Merge pull request #10942 from Putnam3145/map-vote-options 
Added a config for map voting types
 2020-02-08 23:31:33 +01:00
Putnam
c45dab8ebd uhh? 2020-02-07 20:37:22 -08:00
Putnam
84a9f2f058 make the fallback majority judgement 2020-02-07 19:54:15 -08:00
Ghom
9c14d03051 Merge pull request #10774 from Citadel-Station-13/kevinz000-patch-2 
nuke explosion is 512 dev which is actually less laggy than heavy + light
 2020-02-07 22:44:20 +01:00
Putnam
27efd54274 why was that else there. why 2020-02-07 04:38:39 -08:00
Putnam
7f0a369870 Also added options for custom votes 2020-02-07 04:29:53 -08:00
kevinz000
e6f14a085d Update fail2topic.dm 2020-02-07 00:06:32 -07:00
kevinz000
ed2bfb66d8 Update fail2topic.dm 2020-02-07 00:05:21 -07:00
Putnam
0ebd2a814f fixed spurious divide-by-zero 2020-02-06 16:11:14 -08:00
Putnam
edcdb531cc kwargs 2020-02-06 15:57:42 -08:00
Putnam
e6d353dd01 that's not how switch works... 2020-02-06 15:56:58 -08:00
Putnam
d05c2426a8 Added a config for map voting types. 2020-02-06 15:47:04 -08:00
kevinz000
62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul 
Better antag objectives: for real this time
 2020-02-06 16:25:22 -07:00
Ghom
84f91cf665 Update shuttle.dm 2020-02-05 21:33:37 +01:00
Ghom
e14d2caacc Update shuttle.dm 2020-02-05 21:20:49 +01:00
Ghom
6159c197bb Update persistence.dm 2020-02-05 06:30:50 +01:00
Putnam
a67902ee32 Also added instant runoff and renamed schulze. 
yak shaving
 2020-02-04 12:43:59 -08:00
Ghom
c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker 
Save panic bunker between rounds
 2020-02-04 21:15:37 +01:00
Putnam
72c1f60af7 and now the voting works 2020-02-03 08:10:34 -08:00
Putnam
52432ed0a7 too many dynamic changes for my sanity 2020-02-03 07:12:27 -08:00
Putnam
bc52b99758 ok putnam 2020-02-03 03:27:06 -08:00
Putnam
53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08:00
Putnam
82fbef9920 Made it real time, added to config 2020-02-03 03:13:19 -08:00
kevinz000
2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538 
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
 2020-02-02 16:31:59 -07:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
Putnam
8d5839c2d2 up to 100 it is then 2020-02-01 10:01:49 -08:00
Putnam
3dcce2b43a added some cleanup code 2020-02-01 09:10:02 -08:00
Putnam
463036a4f4 made panic bunker save in json 2020-02-01 08:44:05 -08:00
Putnam
847e6382c0 fixes some quirk stuff 2020-02-01 00:32:08 -08:00
Ghommie
dba9fdd2b0 time track? 2020-01-31 05:37:28 +01:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Ghommie
05567e2292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538 2020-01-30 03:42:50 +01:00
Ghommie
0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
kevinz000
b26d6c443f Update ticker.dm 2020-01-29 02:23:54 -07:00
kevinz000
a4c5975b7d Update fail2topic.dm 2020-01-25 02:03:39 -07:00
kevinz000
bedb42f147 Merge remote-tracking branch 'citadel/master' into optimization_1 2020-01-24 03:41:40 -07:00