Commit Graph

253 Commits

Author SHA1 Message Date
kevinz000 9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
Ghommie bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
kevinz000 045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000 ecbb7767c3 Update cryo.dm 2020-02-11 23:07:47 -07:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Arturlang 83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Artur db36a90e35 Fixes. 2020-01-30 19:23:38 +01:00
kevinz000 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07: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
Artur e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Artur ff8289c177 Fixes 2020-01-24 18:48:50 +01: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
Artur f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
kevinz000 f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -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
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
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
r4d6 f98f033bb3 Fix linter 2020-01-15 23:57:13 -05:00
kevinz000 02841f8e92 compile 2020-01-15 18:49:37 -07: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
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02: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
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat 080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
kevinz000 830054c106 sigh 2020-01-10 13:25:47 -08: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
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
Ghommie 651370c5b4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2019-12-11 21:10:24 +01:00
Lin 9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
Ghommie 19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +01:00
Ghommie 414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00