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-15 20:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,341 Commits 55 Branches 0 Tags
147a905b5d4f6bbb51aeb51e6b45f7a58dd9a44f
Commit Graph

1610 Commits

Author SHA1 Message Date
Ghom
879032c52f Merge pull request #11255 from deathride58/sprintconfigdefaults 
Makes the default sprint config options match live's actual config
 2020-02-27 16:23:27 +01:00
deathride58
d7192a7c35 Makes the default sprint config options match live's actual config 2020-02-26 10:21:26 -05:00
Artur
f8469c89a4 Conflict fix 2020-02-25 10:46:20 +02:00
BlackMajor
fc85f62546 Merge branch 'master' into SpaceRuins 2020-02-25 16:51:39 +13:00
Ghom
9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk 
you kids like extend votes?
 2020-02-24 16:39:16 +01:00
BlackMajor
6624155e3d Hey you know this is probably a smarter way to go about ruin spawning in station space. 2020-02-25 02:21:28 +13:00
BlackMajor
ca6341aac4 Merge branch 'master' into SpaceRuins 2020-02-24 19:47:52 +13:00
Hatterhat
19ae30ea5b alright ghom i hope this works 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-23 21:20:57 -06:00
Hatterhat
b89a2314a2 mmm that's compiling i don't like that 2020-02-22 16:17:51 -06:00
Seris02
c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08: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
Hatterhat
6dbd58b5df i really fucked this up please advise 2020-02-21 16:07:41 -06:00
Hatterhat
07222cfd9a *snap 2020-02-20 22:21:25 -06:00
Putnam
9f9881b57e this is so sad 2020-02-20 18:43:36 -08:00
Putnam
a49260e0ac Revert "maybe this'll work." 
This reverts commit 8d00f11fc1.
 2020-02-20 16:03:00 -08:00
Putnam
8d00f11fc1 maybe this'll work. 2020-02-20 16:01:06 -08:00
Artur
5d76d33683 Merge remote-tracking branch 'Upstream/master' into Solar_updates 2020-02-20 13:15:46 +02:00
Putnam
00618dbc9b whoops option is a number 2020-02-19 20:58:06 -08:00
Hatterhat
362ebbcf8f shit 2020-02-19 21:14:13 -06:00
Hatterhat
0ad49f9004 shit dude i hope this works lmao 2020-02-19 17:18:51 -06:00
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
BlackMajor
aff71e7f14 Initial Commit. Adds space ruins to station z. 2020-02-17 23:44:06 +13:00
Ghom
32487a95a3 Fixing sprint buffer cost and regen being rounded down. 2020-02-16 19:23:41 +01:00
Hatterhat
f05a88d36f it compiles now ghom 2020-02-16 02:24:41 -06:00
Hatterhat
c00f797a4a extendies 2020-02-16 01:26:33 -06: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
Seris02
2d9c8ce8fc fixing merge conflicts 2020-02-15 15:41:52 +08: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
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
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
Artur
cf22596477 Reworks solars 2020-02-07 10:59:43 +02: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