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 2026-08-26 22:28:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph
200 Commits
Author SHA1 Message Date
ariaworld 814eeeb211 Update supermatter sprites 2024-09-09 00:37:46 +02:00
BongaTheProto ed4ab9e8ab Merge branch 'auxmos-515' of https://github.com/jupyterkat/Citadel-Station-13 into upstream-merge 2024-03-28 18:27:30 -05:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
Katherine Kiefer fd29f9c902 initial 2024-03-09 21:16:02 +11:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot a558377206 more stuff i can't guarantee works by itself yet 2023-11-29 23:37:15 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
BongaTheProto fb1dc86226 Merge remote-tracking branch 'upstream/master' 2023-09-03 18:06:53 -05:00
Katherine Kiefer 16a490ee5c update auxmos 2023-08-18 22:13:30 +10:00
BongaTheProto 1f58235a4a Merge remote-tracking branch 'upstream/master' 2023-04-03 11:52:47 -05:00
LinandGitHub 654e5dad9d Merge pull request #15864 from Putnam3145/auxmos-2 
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
 2023-04-01 00:17:22 -07:00
BongaTheProtoandGitHub 4a4f4aaa54 Merge branch 'Sandstorm-Station:master' into master 2022-10-18 23:18:56 -05:00
BongaTheProto f1ed056576 Merge remote-tracking branch 'upstream/master' 2022-09-28 15:26:54 -05:00
Putnam3145 67f2dad1d7 stop stealing the furniture from my house 2022-09-28 12:41:56 -07:00
siliconsandGitHub 93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00
BongaTheProto e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
Putnam3145 d95f5729cc wow i forgot some extremely important updates haha 2022-09-18 16:27:48 -07:00
Putnam3145 b933545ba9 have to rebalance this too 2022-09-04 13:53:42 -07:00
Putnam3145 ff1de6e30a i forgot to actually push this change 2022-09-04 13:51:49 -07:00
Putnam3145 9f53a7f6da i did the math and it's not good 2022-09-03 23:44:27 -07:00
AManWithAToolbox dda0869f82 Merge branch 'pr/1' into its-wasnt-gonna-happen 2022-04-18 23:19:18 -05:00
ProdsandGitHub a84ff25202 Update supermatter.dm 
Notifies admins through Redbot Crossed Cogs SS13 status cog that supermatter is delaminating.
 2022-04-16 19:39:34 -04:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Putnam3145 857253a07b who names a var T. 2022-03-10 21:42:27 -08:00
Putnam3145 a44d0af4dc hackish supermatter dying on spaced nearby turfs 2022-03-09 07:49:02 -08:00
LetterN 8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
DeltaFire 6224da71a3 contents_explosion 
at least this one had less overrides.
 2021-11-14 21:41:42 +01:00
LetterN 1fc778f70a soundloop fix. also it gets deleted (woo) 2021-10-30 13:16:31 +08:00
LetterN 99019166e4 i think it works 
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
 2021-10-30 11:45:50 +08:00
LetterN f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
Putnam3145 ce0107dfdf effective temperature for power increase too 2021-09-16 21:49:43 -07:00
Putnam3145andGitHub 99908e17c5 Revert "Reworks supermatter gas output to be less cascade-y, more risky" 2021-09-13 11:39:32 -07:00
siliconsandGitHub 4f0d5e8c9a Merge pull request #15112 from Putnam3145/fix-supermatter-cascade 
Reworks supermatter gas output to be less cascade-y, more risky
 2021-09-12 20:58:48 -07:00
Putnam3145 137a30a047 more nerfs lol 2021-09-12 15:04:42 -07:00
Putnam3145 083704e29d lowered max oxy mult, made temp not matter 2021-09-11 11:03:15 -07:00
Putnam3145 3965ad9dae yeah that's just too much gas sorry 2021-09-11 10:25:39 -07:00
keronshb 5587cc91cd Other fix 2021-09-09 21:56:58 -04:00
keronshb 8dfb97cdf7 SALTPR 2021-09-09 20:17:55 -04:00
Putnam3145 cc2471cf7f Reworked supermatter gas output 
basically it's less likely to cause forever runaway trit fires... but it can still get runaway, it's just more power-based than temperature-based
 2021-09-09 13:51:22 -07:00
siliconsandGitHub 6de44f794e Merge pull request #15010 from Putnam3145/atmos-funnies 
Supermatter surge rework: consequential for N2, won't explode immediately for CO2
 2021-08-26 21:39:33 -07:00
Putnam3145 0f7f11be71 Made supermatter respect heat capacity 2021-08-15 19:43:13 -07:00
Putnam3145 22fae70132 Supermatter surge rework 2021-08-14 19:39:31 -07:00
siliconsandGitHub c37f2ca739 Merge pull request #14961 from Putnam3145/supermatter-auxgm 
Makes supermatter properties auxgm-based
 2021-08-11 02:01:05 -07:00
Putnam3145 ac577c7699 adds powermix to the list of accepted SM properties, whoops 2021-08-03 17:19:02 -07:00
Putnam3145 d4dc10b29b error fixin' 2021-08-03 16:29:08 -07:00