 BongaTheProto
|
fb1dc86226
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-03 18:06:53 -05:00 |
|
|
SandPoot
|
f53a7a1f40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-03 17:47:27 -03:00 |
|
|
Katherine Kiefer
|
16a490ee5c
|
update auxmos
|
2023-08-18 22:13:30 +10:00 |
|
|
BongaTheProto
|
e87e828638
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-25 22:47:02 -05:00 |
|
|
SandPoot
|
ef186347ca
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-23 18:56:20 -03:00 |
|
|
SandPoot
|
19ee7f8bd2
|
some hints
|
2023-07-19 20:51:25 -03:00 |
|
|
BongaTheProto
|
1f58235a4a
|
Merge remote-tracking branch 'upstream/master'
|
2023-04-03 11:52:47 -05:00 |
|
|
SandPoot
|
9d214e2f9d
|
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-04-03 12:53:37 -03: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 |
|
|
BongaTheProto
|
368c3a8e16
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-18 18:15:56 -05:00 |
|
|
SandPootandGitHub
|
d362dacfd0
|
Rebalances the equalizing atmos to be more like bee's (#287)
|
2023-01-18 08:13:27 -03:00 |
|
|
BongaTheProto
|
ee6823c69b
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-13 12:14:11 -05:00 |
|
|
SandPoot
|
f4b7513f10
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-12-13 01:35:33 -03:00 |
|
|
LinandGitHub
|
7205781c47
|
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
|
2022-12-12 19:11:49 -07:00 |
|
|
SandPoot
|
8911fe5e0b
|
clear em
|
2022-12-11 17:58:45 -03:00 |
|
|
Putnam3145
|
b820b61a48
|
Make QCD not generate infinite science
|
2022-11-28 23:54:50 -08:00 |
|
|
BongaTheProtoandGitHub
|
4a4f4aaa54
|
Merge branch 'Sandstorm-Station:master' into master
|
2022-10-18 23:18:56 -05:00 |
|
|
SandPoot
|
1607d9ead8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-10-19 00:54:33 -03:00 |
|
|
Putnam3145
|
4e2406fdd4
|
i've just been retestmerging wrong wow.
|
2022-10-10 23:06:55 -07:00 |
|
|
Putnam3145
|
892d07975a
|
just?? comment out?? this for now??
|
2022-10-10 20:10:21 -07:00 |
|
|
Putnam3145
|
3b74564a4a
|
well that's no good
|
2022-10-09 20:27:25 -07: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 |
|
|
Putnam3145
|
17929ced89
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2
|
2022-09-28 12:35:58 -07:00 |
|
|
SandPoot
|
a2baf4e789
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-09-28 15:14:24 -03:00 |
|
|
siliconsandGitHub
|
93e8a69c4c
|
Revert "Updates auxmos to 2.0.0"
|
2022-09-28 01:05:10 -07:00 |
|
|
Putnam3145
|
60eb536dd2
|
A couple things (oy)
|
2022-09-27 21:46:44 -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
|
1ac44f22c8
|
i am wont to make the worst mistakes
|
2022-09-21 17:55:34 -07:00 |
|
|
Putnam3145
|
223307aaa8
|
i need to reimplement this joy
|
2022-09-21 17:43:37 -07:00 |
|
|
Putnam3145
|
eb6a86f37f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2
|
2022-09-18 16:41:24 -07:00 |
|
|
Putnam3145andGitHub
|
fa9bbfaedf
|
Revert "Update auxmos to 2.0.0" (#15859)
|
2022-09-18 16:40:45 -07:00 |
|
|
Putnam3145
|
d95f5729cc
|
wow i forgot some extremely important updates haha
|
2022-09-18 16:27:48 -07:00 |
|
|
Putnam3145
|
1bb15d2858
|
Fixes condensation overwriting other condensation
|
2022-08-30 00:21:05 -07:00 |
|
|
Putnam3145
|
c87c72bfb8
|
this needs arguments lol
|
2022-08-28 16:11:51 -07:00 |
|
|
Putnam3145
|
c96228e258
|
Updated auxmos to 2.0.0
|
2022-08-28 15:17:04 -07:00 |
|
|
Putnam3145
|
e845bcee50
|
let's just hard cap that
|
2022-08-24 23:32:46 -07:00 |
|
|
BongaTheProto
|
3341812b44
|
Merge remote-tracking branch 'upstream/master'
|
2022-08-20 17:16:19 -05:00 |
|
|
SandPoot
|
550db1b6ee
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-08-20 17:27:19 -03:00 |
|
|
siliconsandGitHub
|
98e0e1262f
|
Merge pull request #15764 from Putnam3145/drying-agent-chem-gas
Space lube is now a chem gas (also some other stuff too)
|
2022-08-20 12:26:38 -07:00 |
|
|
Putnam3145
|
d565d6a097
|
makes chem gases fully condense if below threshold
|
2022-08-16 00:50:47 -07:00 |
|
|
Putnam3145
|
186db17c41
|
actually no this is how you do it
|
2022-08-12 14:32:18 -07:00 |
|
|
Putnam3145
|
92cbbeb9f6
|
new
|
2022-08-07 23:47:06 -07:00 |
|
|
BongaTheProto
|
9e7c5033cc
|
Merge remote-tracking branch 'upstream/master'
|
2022-08-07 21:42:16 -05:00 |
|
|
SandPoot
|
00dadda3df
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-08-07 23:15:57 -03:00 |
|
|
Putnam3145
|
2337939868
|
Nitrogen stuff second pass
|
2022-08-05 14:48:00 -07:00 |
|
|
BongaTheProto
|
a72b79f56c
|
Merge remote-tracking branch 'upstream/master'
|
2022-07-20 21:41:02 -05:00 |
|
|
SandPoot
|
da1df79599
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-07-20 23:30:31 -03:00 |
|
|
deathride58andGitHub
|
e529e78b2c
|
Merge pull request #15690 from Putnam3145/qcd-nerf-wah
Nerfs quark matter's value a lot
|
2022-07-19 19:23:38 -04:00 |
|