Commit Graph

815 Commits

Author SHA1 Message Date
Katherine Kiefer
16a490ee5c update auxmos 2023-08-18 22:13:30 +10:00
SandPoot
19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
Lin
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
Lin
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
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
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
silicons
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
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
Putnam3145
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
silicons
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
Putnam3145
2337939868 Nitrogen stuff second pass 2022-08-05 14:48:00 -07:00
deathride58
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
Putnam3145
627314b2b2 Fix miasma not being colored right 2022-07-02 16:13:08 -07:00
Putnam3145
5b37ebb4f1 GAS_OXYGEN should be GAS_O2 2022-06-27 13:23:15 -07:00
Putnam3145
858333295b I miscalibrated QCD's difficulty a bit 2022-06-13 19:14:25 -07:00
Putnam3145
6fe08f0a4e Rebalancing QCD a bit 2022-06-06 20:41:10 -07:00
Putnam3145
f165f79a8d Made hyper-nob's price commiserate with its difficulty 2022-05-24 21:48:00 -07:00
Putnam3145
4af3633d6f Some gas balancing/rearranging 2022-05-24 18:11:58 -07:00
Putnam3145
171fd771f9 Fixes bad alpha stuff (why?) 2022-04-29 23:53:55 -07:00
Putnam3145
5ea144b9f9 forgot to give hydrogen a color 2022-04-28 21:16:54 -07:00
Putnam3145
a7408beb4c Updated auxmos to 1.0 2022-04-28 21:07:51 -07:00
silicons
004e91c743 Merge pull request #15602 from Putnam3145/lavaland-more-atmos
Allow planets to have fuel-based atmospheres
2022-04-27 16:11:15 -07:00
Putnam3145
6c04b27a52 Use adjust_heat
it came to me in a dream
2022-04-26 13:58:22 -07:00
Putnam3145
2d6e4aa769 Gas addition already weights by spec heat 2022-04-26 13:57:17 -07:00
Putnam3145
b5ce67ce55 Weird reaction stuff 2022-04-26 01:14:41 -07:00
Putnam3145
3055cfa3c6 Adds methane, methyl bromide to default scrubber 2022-04-25 21:58:06 -07:00
Putnam3145
57d24edcf2 I forgot to compile 2022-04-25 21:07:44 -07:00
Putnam3145
621b974691 Allow planets to have fuel-based atmospheres 2022-04-25 20:27:01 -07:00
silicons
a1268032d6 Merge pull request #15593 from Putnam3145/fix-linux
Makes auxmos do fires on Linux
2022-04-15 17:42:05 -07:00
Putnam3145
9e9c38c4a5 Makes auxmos do fires on Linux 2022-04-09 21:44:04 -07: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
993db66237 Adds a LOT more enthalpy to tritium 2022-03-06 14:54:48 -08:00