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
33,867 Commits 55 Branches 0 Tags
dabdf16eacab8cdea3bf8a875d14627a6fd931c2
Commit Graph

1548 Commits

Author SHA1 Message Date
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
Ghommie
55fa48737e Forgot about not versioned files. 2020-02-02 01:28:16 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +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
Lin
293e6576c8 Merge pull request #10564 from kevinz000/optimization_1 
Experimental optimizations
 2020-01-29 19:25:13 +00:00
kevinz000
b26d6c443f Update ticker.dm 2020-01-29 02:23:54 -07:00
kevinz000
2e6cfef224 Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-01-25 22:13:28 -07:00
Ghom
98c8b6c5c8 Merge pull request #10648 from Citadel-Station-13/kevinz000-patch-19 
Sprinting in general is now a config
 2020-01-26 05:53:53 +01:00
kevinz000
a4c5975b7d Update fail2topic.dm 2020-01-25 02:03:39 -07:00
Putnam
847b3c0a09 Fixed flavor objectives and added more. 2020-01-24 10:46:07 -08:00
kevinz000
bedb42f147 Merge remote-tracking branch 'citadel/master' into optimization_1 2020-01-24 03:41:40 -07:00
Seris02
9761d68f4b more merge conflict fixes 2020-01-24 10:14:31 +08:00
kevinz000
3dcd2a75cf Update configuration.dm 2020-01-22 02:27:51 -07:00
kevinz000
16c14b55ae Update game_options.dm 2020-01-22 01:52:43 -07:00
kevinz000
ea5f35a457 Update game_options.dm 2020-01-22 01:06:50 -07:00
kevinz000
b0b90d4d28 Update game_options.dm 2020-01-22 00:45:17 -07:00
kevinz000
12c832b40b Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-01-20 17:53:06 -07:00
Putnam
815b4f033d made flavor things a game option + more hoard 2020-01-20 04:13:54 -08:00
Artur
f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
Putnam
06c66617e6 m o r e traitor objectives 2020-01-19 18:58:10 -08:00
Ghom
8a091c5140 Merge pull request #10614 from Putnam3145/suicide_option 
Made suicide a config flag
 2020-01-20 03:24:00 +01:00
Putnam
1bdb515592 made suicide a config flag 2020-01-19 03:44:45 -08:00
Seris02
718ff58e0b fixes + advanced injectors 2020-01-19 15:17:57 +08:00
Ghommie
3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
Ghom
07b3bac674 Merge pull request #10580 from Putnam3145/craft-log 
Craft logging
 2020-01-18 17:47:31 +01:00
Ghommie
9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
Putnam
a4cc73f219 some craft logging 2020-01-16 18:40:00 -08:00
Artur
472d18403c Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties 2020-01-16 11:38:09 +02:00
Ghom
7d9f4f9fe5 Merge pull request #10417 from kevinz000/nightshift_1 
Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc
 2020-01-16 03:21:49 +01:00
Ghom
31c3b0f7bb Merge pull request #10415 from kevinz000/tg_update_1 
Small controller/backend updates from /tg/
 2020-01-15 15:23:09 +01:00
kevinz000
7fb515173d FUCK 2020-01-15 01:35:03 -07:00
kevinz000
5c94813267 WHYISTHISLITERALLYWASTINGCPUONANULLFUCKINGLIST 2020-01-15 01:31:49 -07:00
kevinz000
ca47a4e762 a 2020-01-15 01:23:49 -07:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Seris02
a8e4989d74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-15 12:15:13 +08:00
kevinz000
97ded4b27b ok 2020-01-14 18:09:12 -07:00