Commit Graph

781 Commits

Author SHA1 Message Date
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
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08: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
Lin
e1aeaa76fd Merge pull request #15280 from Putnam3145/siphoning-vents
Allows setting vents to siphon
2021-10-24 15:09:35 -07:00
Putnam3145
34936ee5af Properly implements hysteresis 2021-10-18 03:44:40 -07:00
Putnam3145
42da1e2079 Allows setting vents to siphon 2021-10-17 19:55:13 -07: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
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
Putnam3145
51f85c58a4 One last ashwalker fix 2021-10-04 20:56:08 -07:00
qweq12yt
91a738fb9e fix canisters 2021-09-27 17:17:16 -03:00
Putnam3145
5eb272c0a6 Makes it so zaps don't explode pipes 2021-09-08 18:42:38 -07:00
silicons
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
silicons
841ff4f81c Merge pull request #15011 from Putnam3145/lavaland-random-atmos
Port of randomized planet atmos
2021-08-26 21:39:23 -07:00
Putnam3145
db2e01d8ae Miasma now sterilizes into methane instead of oxygen 2021-08-14 21:20:50 -07:00
Putnam3145
ff52c241f4 Procedural planet atmos 2021-08-14 21:13:45 -07:00
Putnam3145
22fae70132 Supermatter surge rework 2021-08-14 19:39:31 -07:00
silicons
c37f2ca739 Merge pull request #14961 from Putnam3145/supermatter-auxgm
Makes supermatter properties auxgm-based
2021-08-11 02:01:05 -07:00