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-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,209 Commits 55 Branches 0 Tags
374aa3301300fc6117dba972ad8bae202bd102fd
Commit Graph

2231 Commits

Author SHA1 Message Date
SandPoot
c0e1198702 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-05 18:25:05 -03:00
Lin
2379a2a342 Merge pull request #15370 from Putnam3145/genericized-plasma-trit 
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
 2022-01-03 22:31:40 +00:00
SandPoot
9694d84e14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-02 20:56:15 -03:00
DeltaFire
2940d141cf please-dont-smite-us-lummox 2022-01-01 07:10:35 +01:00
SandPoot
e27a6cda5c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-22 15:01:25 -03:00
Putnam3145
f61b638a9e Fixes excited group process delay heuristic (#15420) 2021-12-22 17:38:48 +01:00
SandPoot
bb7d894944 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-15 17:33:44 -03:00
Putnam3145
13834847e0 it works better when you're actually using a delta 2021-12-11 17:04:05 -08:00
SandPoot
e21a8445e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-10 14:53:39 -03:00
Putnam3145
f21be027d0 am i just eternally wrong 2021-12-08 16:26:34 -08:00
Putnam3145
5ff8d7c356 grammar unfix 2021-12-08 12:02:07 -08:00
Putnam3145
36c60830dd should be rounded 2021-12-07 21:17:07 -08:00
Putnam3145
db4c9c1b06 Makes science points show actual change 2021-12-07 21:12:46 -08:00
Putnam3145
1da28b8ec6 Chem gas tweaks, + toxins rebalance 2021-11-15 16:29:30 -08:00
SandPoot
f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
SandPoot
e5badd2e09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 13:31:55 -03:00
silicons
e5faee5774 Merge pull request #15254 from Putnam3145/dynamic-better-extended 
Dynamic extended: antags allowed, but only later
 2021-10-27 05:15:22 -07:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
SandPoot
a797436f45 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-15 15:03:21 -03:00
SandPoot
bdd0cee2eb Update ticker.dm 
shhhh
 2021-10-13 19:12:23 -03:00
SandPoot
39a7449625 Update ticker.dm 2021-10-13 16:57:00 -03:00
SandPoot
4d7e1b32db Update ticker.dm 2021-10-13 16:49:44 -03:00
SandPoot
5153dba0f2 Upload files 2021-10-13 15:11:25 -03:00
SandPoot
37b5020729 biggest fuck-up in the world 2021-10-13 13:56:31 -03:00
SandPoot
829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
SandPoot
5f72ad8d61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-11 20:33:04 -03:00
Putnam3145
3209917830 Merge pull request #15173 from silicons/vpn_block 
adds PANIC_BUNKER_LIVING_VPN option (READ, THIS IS NOT A VPN BAN)
 2021-10-11 15:51:52 -07:00
SandPoot
2541ad050b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-10 21:07:48 -03:00
silicons
84c6970c27 Merge pull request #15250 from SandPoot/you-are-now-rate-limited 
You are now rate limited
 2021-10-09 22:14:45 -07:00
SandPoot
d55d628efe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-08 21:34:03 -03:00
SandPoot
437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
Putnam3145
de51455fac Dynamic extended rewrite: some antags 2021-10-07 20:50:45 -07:00
Putnam3145
3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport 
(Probably ready for test merge) DYNAMIC 2021
 2021-10-07 18:14:59 -07:00
Putnam3145
ac84eed0d1 Merge pull request #15129 from Citadel-Station-13/silicons-patch-15 
if you recognize this is not the way to do it, don't do it (bandaid to polychromatic loadout lookup)
 2021-10-07 00:05:06 -07:00
SandPoot
e88368cd4c Update fail2topic.dm 2021-10-06 16:27:06 -03:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
keronshb
fb5653e12c Voting fix 2021-09-25 12:59:18 -04:00
keronshb
a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
SandPoot
e7d5275a70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-20 14:32:29 -03:00
keronshb
c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb
cd00d1589e fucking hell 2021-09-19 18:06:24 -04:00
silicons
ae513d3114 feautre 2021-09-17 21:58:26 -07:00
keronshb
408517fb1d SHOULD? FIX? 2021-09-16 20:53:46 -04:00
keronshb
372725c1f4 Fixes everything???? 2021-09-16 15:40:21 -04:00
keronshb
792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
keronshb
7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00