Commit Graph

797 Commits

Author SHA1 Message Date
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
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
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
silicons
af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460)
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
2022-02-07 15:17:24 -08:00
LetterN
7e326ed947 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-22 20:42:55 +08:00
Putnam3145
ece671087f Added a bit of enthalpy to tritium 2022-01-13 20:30:26 -08:00
Putnam3145
b1d05d4956 Fixes hydrogen fires to have right products 2022-01-13 20:25:53 -08:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08: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
Putnam3145
a6837e33ff Added hydrogen to contaminated 2021-12-20 00:45:20 -08:00
Putnam3145
8458823993 Some air alarm tweaks, as requested
First, filtering now filters chemicals by default, too.
Second, draught now only pressurizes up to 1.4x pressure instead of 2x--2x was too much, massive overpressure.
Third, all of the alarm types interact with siphoning vents properly. Panic siphon maximizes siphoning vents, draught sets siphoning vents to lower levels etc.
2021-12-08 12:44:39 -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
LetterN
fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
Putnam3145
c7ae228bda unnecessary var 2021-11-15 16:32:55 -08:00
Putnam3145
1da28b8ec6 Chem gas tweaks, + toxins rebalance 2021-11-15 16:29:30 -08:00
DeltaFire
6224da71a3 contents_explosion
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
Putnam3145
b91fb21234 Merge branch 'chem-gases' into genericized-plasma-trit 2021-11-14 11:51:22 -08:00
Putnam3145
60e61ecbb0 Fire overhaul 2021-11-13 22:43:54 -08:00
Putnam3145
71e6676e9a ( 2021-11-11 17:53:00 -08:00
Putnam3145
a3b6ac7b54 Fixes freezer display + fixing bad math 2021-11-11 17:46:48 -08:00