Commit Graph

498 Commits

Author SHA1 Message Date
r4d6
c57dedd808 fix 2020-01-29 12:30:05 -05:00
Ghom
9ee208dd4f Merge pull request #10722 from Putnam3145/fix-relief
Relief valve fixes
2020-01-27 05:37:53 +01:00
kevinz000
603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
Putnam
6df56a2cf8 properly fixed flags, also made it close on one side's pressure 2020-01-25 18:31:53 -08:00
Putnam
aba40056b3 relief valve tweaks 2020-01-25 17:10:40 -08:00
Putnam3145
a08cd7c046 Merge pull request #10718 from r4d6/HE-Fix
Fix HE Manifold's sprites
2020-01-25 14:31:11 -08:00
r4d6
d5c09f11bc Fix 2020-01-25 17:23:00 -05:00
Ghommie
721fd108f9 A few more, ported, runtime fixes. 2020-01-24 03:02:07 +01:00
kevinz000
1b7265d8c1 Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
2020-01-23 04:46:52 -07:00
Ghom
fcbc5149c4 Merge pull request #10606 from r4d6/patch-2
Update the Passive Vents that I added
2020-01-23 02:40:54 +01:00
r4d6
c78944c5bc Update 2020-01-22 13:47:57 -05:00
Ghommie
5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
kevinz000
088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
Ghom
536900a7ac Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
Hatterhat
590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06:00
r4d6
2b3f00ed1e Fix Freezer overlay bug 2020-01-18 22:16:43 -05:00
r4d6
1eec1b11dd Update passive_vent.dm 2020-01-18 20:00:07 -05:00
r4d6
ae5e87d492 Apparently TG has more code than us 2020-01-18 19:12:00 -05:00
r4d6
5084146400 Port 2020-01-18 18:46:22 -05:00
Ghommie
3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
r4d6
810556cbb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents 2020-01-18 16:03:49 -05:00
Putnam
3788bc6676 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-17 21:33:13 -08:00
Ghommie
9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
kevinz000
327c1e04e0 s 2020-01-15 22:00:08 -07:00
r4d6
f98f033bb3 Fix linter 2020-01-15 23:57:13 -05:00
r4d6
8bc8edb56f Fixes 2020-01-15 20:46:28 -05:00
r4d6
6045d818d8 Add passive vents 2020-01-15 19:12:13 -05:00
Hatterhat
9aedc62ddb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 12:39:17 -06:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat
2842434d00 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 02:49:58 -06:00
kevinz000
60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates
Massive RCD Port & Updates
2020-01-12 00:45:21 -08:00
Ghom
34502cab1d Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
Putnam
c0be46e07f balancing/sanity checks 2020-01-10 04:23:43 -08:00
Putnam
e468fa3e71 Added a binary version and fixed up sprites 2020-01-10 01:26:09 -08:00
Putnam
bdda3f940c it works 2020-01-09 18:55:56 -08:00
Putnam
a7cf509230 relief valve. 2020-01-09 03:43:06 -08:00
Putnam
fdbbcfe59a it's functional, sprite time 2020-01-08 17:05:43 -08:00
r4d6
c3f47e713a Merge branch 'master' into RCD-Updates 2020-01-07 00:04:43 -05:00
Ghom
4655815c12 Merge pull request #10396 from Hatterhat/revert-8056-tegnerf
reverts that one TEG nerf that forced it to require an arbitrary burnmix
2020-01-05 15:36:02 +01:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Seris02
519d379cdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock 2020-01-03 17:42:53 +08:00
r4d6
7347cb0ba6 Merge branch 'master' into RCD-Updates 2020-01-03 03:09:11 -05:00
r4d6
5c94e02eac Add simple RCD Circuits
Port : https://github.com/tgstation/tgstation/pull/45357
2020-01-03 02:32:43 -05:00
Hatterhat
5b99524e82 Revert "Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe" 2020-01-01 20:44:48 -06:00
Ghom
31ba9fe4a8 Revert "Makes HE pipes realistically radiate away heat" 2019-12-21 22:43:26 +01:00
Ghommie
9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Ghom
e526f26f46 Merge pull request #10126 from Putnam3145/he-tweaks
Makes HE pipes realistically radiate away heat
2019-12-20 13:34:47 +01:00
Seris02
61ab3685f1 atmos firelock, changes to temp blocking 2019-12-20 14:14:01 +08:00