Commit Graph

1311 Commits

Author SHA1 Message Date
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
Lin
293e6576c8 Merge pull request #10564 from kevinz000/optimization_1
Experimental optimizations
2020-01-29 19:25:13 +00: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
kevinz000
bedb42f147 Merge remote-tracking branch 'citadel/master' into optimization_1 2020-01-24 03:41:40 -07: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
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
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
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
kevinz000
97ded4b27b ok 2020-01-14 18:09:12 -07:00
kevinz000
6ead30eab3 more shit 2020-01-14 17:22:54 -07:00
kevinz000
eff86a449f wew 2020-01-14 16:45:22 -07:00
Ghom
2cc87c3127 Merge pull request #10531 from Trilbyspaceclone/Seed-to-points
Hydroponics can now make sci points
2020-01-14 18:26:34 +01:00
TrilbySpaceClone
ccfaa294bc Update research.dm 2020-01-14 10:40:47 -05:00
Ghommie
1d948907f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-13 23:26:21 +01:00
TrilbySpaceClone
43dcb70718 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Seed-to-points 2020-01-13 03:27:01 -05:00
kevinz000
884ea59d63 fix logic 2020-01-12 18:38:22 -08:00
kevinz000
8f5d4a0a49 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-12 18:27:03 -08:00
Putnam
4c4c965e86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into score-instead 2020-01-12 17:36:56 -08:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Putnam
82d8900e5d aaand move this over 2020-01-12 03:36:47 -08:00
Putnam
3f5e68765e am i fucking stupid? 2020-01-12 03:10:42 -08:00
Putnam
295c134243 i'm so dumb dude 2020-01-12 03:06:17 -08:00
Putnam
5dc5ddaa76 daddy compiler please stop hating me 2020-01-11 22:17:18 -08:00
Putnam
0c64ea1351 wow that was fucking dumb 2020-01-11 18:37:16 -08:00
Putnam
37c6119708 Sanity
this is a commit by jimmy buffett
2020-01-11 18:26:32 -08:00
TrilbySpaceClone
29e7c49627 Pss got any of the good stuf Hydro? 2020-01-11 13:07:02 -05:00
Putnam
85f6367df5 weh 2020-01-11 03:50:19 -08:00
Putnam
9d3873f26f traitor always available 2020-01-11 03:32:14 -08:00
Putnam
e0587aeac0 another dumb patch 2020-01-10 23:33:26 -08:00
Putnam
c6507d47e2 bad patches, ugh 2020-01-10 20:06:35 -08:00
kevinz000
8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08:00
Letter N
6ec3fde836 better-signalers 2020-01-10 18:06:55 +08:00
Putnam
896df2ace3 score instead of ranked choice 2020-01-09 04:47:14 -08:00
Putnam3145
3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
deathride58
0b9d566076 Merge pull request #10469 from kevinz000/fail2topic
Ports fail2topic from Aurora
2020-01-08 22:19:22 -05:00
kevinz000
652cf6e60c Merge pull request #10440 from Putnam3145/weird-secret
Allows users to vote their least favorite game modes in secret/extended vote
2020-01-08 13:41:26 -08:00