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-13 11:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,847 Commits 55 Branches 0 Tags
caed4b51b9ed1bf80dd1cae3bcdc1c1f7deb8a08
Commit Graph

249 Commits

Author SHA1 Message Date
Ghom
c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker 
Save panic bunker between rounds
 2020-02-04 21:15:37 +01:00
kevinz000
8910efadfa Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-02-03 13:07:49 -07:00
Putnam
52432ed0a7 too many dynamic changes for my sanity 2020-02-03 07:12:27 -08:00
Putnam
82fbef9920 Made it real time, added to config 2020-02-03 03:13:19 -08: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
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
Ghom
07b3bac674 Merge pull request #10580 from Putnam3145/craft-log 
Craft logging
 2020-01-18 17:47:31 +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
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
kevinz000
90dd0909b8 Merge branch 'master' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into god_wish_your_plushies_holy_shit 2020-01-12 10:25:50 -08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Putnam
3f5e68765e am i fucking stupid? 2020-01-12 03:10:42 -08:00
kevinz000
8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -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
kevinz000
0114f9e223 whitelist 2020-01-07 04:54:32 -08:00
kevinz000
fa7dcad49a compile 2020-01-07 04:54:11 -08:00
kevinz000
ab2292dfd5 Fail2Topic 2020-01-07 04:48:39 -08:00
Putnam
70a1a0a9c1 better way to do it tbh 2020-01-07 00:39:14 -08:00
Putnam
f728c4746f Allowed random engines to be weighted. 2020-01-06 16:25:17 -08:00
Putnam
be98704abe weird super secret vote 2020-01-05 04:19:21 -08:00
kevinz000
8e1affa1f5 nightshift changes 2020-01-02 23:56:40 -08:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
kevinz000
fb77d07d52 plushies woohoo 2019-12-23 16:56:43 -08:00
Ghom
9a022f21eb Merge pull request #10245 from r4d6/substationV2 
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
 2019-12-23 18:58:26 +01:00
r4d6
0a3e370a93 Move the config up to avoid conflict 2019-12-23 12:45:40 -05:00
r4d6
01a8fe1cd6 Add config options 2019-12-23 12:41:52 -05:00
r4d6
b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn"" 
This reverts commit d851beea16.
 2019-12-23 10:25:37 -05:00
r4d6
d851beea16 Revert "Add the option to restrict the Engine that spawn" 
This reverts commit e3e1f91635.
 2019-12-23 10:23:55 -05:00
r4d6
e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -05:00
kevinz000
2c228571f3 nerfs 2019-12-16 15:39:22 -07:00
kevinz000
4551a795e4 Update game_options.dm 2019-11-27 21:20:33 -07:00
kevinz000
9fef2343a7 Update game_options.dm 2019-11-27 21:20:12 -07:00
kevinz000
f776db7ab1 Update game_options.dm 2019-11-27 21:16:42 -07:00
kevinz000
cf141c3a92 Update game_options.dm 2019-11-26 15:41:32 -07:00
kevinz000
877b79ae1c Merge pull request #9822 from Putnam3145/dynamic-wizard-rework 
Reworked how wizard spells interact with dynamic
 2019-11-19 21:29:09 -07:00
deathride58
cb70f47a48 Merge pull request #9814 from Citadel-Station-13/kevinz000-patch-115 
modifies donator config entry to allow multiple ckeys per line
 2019-11-19 13:38:20 -05:00
Putnam
c9de03675e actually no i'm reworking this 2019-11-16 00:36:09 -08:00
Putnam
4f06a25951 Made staff of change require/cost threat 2019-11-14 23:26:59 -08:00
Putnam
f3c4897b48 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 22:31:48 -08:00
kevinz000
b8c45ba6a1 Update donator.dm 2019-11-14 18:26:50 -07:00
kevinz000
e8938f52a7 Update donator.dm 2019-11-14 18:22:21 -07:00
kevinz000
09e5cd95a3 Merge pull request #9690 from Ghommie/Ghommie-cit308 
Unmodularize configuration, _globalvars and subsystems.
 2019-11-14 15:50:20 -07:00