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-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,713 Commits 55 Branches 0 Tags
8989394742a93f8267a0d42d55c0bede32bb8bb7
Commit Graph

409 Commits

Author SHA1 Message Date
kevinz000
43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic 
Adds epic and also cool paramedics [lazy tg port]
 2020-02-24 02:30:36 -07:00
BlackMajor
ca6341aac4 Merge branch 'master' into SpaceRuins 2020-02-24 19:47:52 +13:00
Persi
4af2eee9dd Haha, okay... this will break Kilo 
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
 2020-02-23 02:28:18 -05:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Persi
c4b4a90bd8 Oh hey it's KiloStation 
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
 2020-02-20 00:58:54 -05:00
Hatterhat
0ad49f9004 shit dude i hope this works lmao 2020-02-19 17:18:51 -06:00
BlackMajor
9a54b451eb Added two more ruins, Owai's suggestions. 2020-02-18 12:57:48 +13:00
BlackMajor
aff71e7f14 Initial Commit. Adds space ruins to station z. 2020-02-17 23:44:06 +13:00
Hatterhat
c00f797a4a extendies 2020-02-16 01:26:33 -06:00
Ghom
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler 
ports auto profiler subsystem from tg
 2020-02-13 15:06:27 +01:00
kevinz000
1ec098b39e shhhh 2020-02-11 08:00:56 -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
Ghom
c2baad44d8 Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit 
ENDS THE PLUSHIE DRAMA
 2020-02-09 21:47:30 +01:00
kevinz000
1f959012c5 Merge pull request #10918 from r4d6/dwarf-config 
Add dwarves as a round-start race
 2020-02-08 21:01:26 -07: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
r4d6
949587d671 dorf config 2020-02-05 11:48:19 -05:00
Ghommie
5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
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
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghom
d19b7a7695 Merge pull request #10744 from r4d6/Moar-Engines 
Moar engines!
 2020-02-01 19:11:10 +01:00
deathride58
74d0fe2770 fixes spacemen going at lightspeed on local/testing servers 2020-01-28 00:18:54 -05:00
r4d6
4884165d4f Add TEG, Code & config 2020-01-26 20:58:16 -05: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
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
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
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
a102bb18a0 Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-01-02 09:39:48 -08:00
kevinz000
c022325159 Merge pull request #10282 from Putnam3145/fix-config 
Updating dynamic config, some balancing
 2019-12-24 13:07:40 -08:00
Putnam
ca1f7839bb Updating dynamic config, some balancing 2019-12-24 10:10:24 -08:00
kevinz000
fb77d07d52 plushies woohoo 2019-12-23 16:56:43 -08: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