Commit Graph

330 Commits

Author SHA1 Message Date
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 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 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 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 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Putnam3145 f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
bunny232 03b921a121 Update tank.dm 2021-06-14 06:12:04 -04:00
Putnam bcbcd6bfce aoaoaoao 2021-06-11 18:16:47 -07:00
Putnam 3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
Putnam 268d3ec408 Fixed the funny UI stuff 2021-06-08 18:22:15 -07:00
Putnam 86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
Putnam 80e8c8af4a WHOOPS I SWAPPED FILTERS 2021-06-08 02:40:32 -07:00
Putnam d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
Putnam f1e55f2df0 Paranoid updates to maybe fix air duplication 2021-03-20 22:02:47 -07:00
Putnam cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08:00
Putnam f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
Letter N 2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08:00
Letter N 636d6bf32f grr atmos 2021-02-19 10:39:06 +08:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N 92eb4fb684 filter 2021-02-12 12:40:24 +08:00
Putnam f05df1c7de Huge optimizations+some fixes 2021-01-19 17:48:20 -08:00
Putnam 186bb483b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-06 23:55:24 -08:00
silicons bc9dbc0060 Update circulator.dm 2020-12-15 14:00:20 -07:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
ArchieBeepBoop 9eff4147fd Fixes the Layer 3 Outlet Injector mapping asset being on the wrong layer (#13633)
* why is this on the wrong layer?

* ahem, icon state.

Co-authored-by: Dip <gabriel.spm002@gmail.com>
2020-11-01 22:02:15 +01:00
Putnam 3c4eff605d broken but compiles and runs sans panics 2020-10-28 23:07:59 -07:00
Letter N 9eb7aaa2d1 fixes pumps and reverts this small vending change 2020-08-07 16:12:44 +08:00
Letter N 8f0f30f6f7 lazy datacore fix 2020-08-06 17:27:51 +08:00
Letter N 7c7d635193 what if atmos relief works? and all the other ui's gets updated 2020-08-04 12:54:55 +08:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
silicons 9ff94e019b Merge pull request #12924 from SiliconMain/analyzer
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
Letter N 5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator 2020-07-29 15:10:01 +08:00
SiliconMain abdafe15fa fuck 2020-07-26 15:21:24 -05:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00