Commit Graph
494 Commits
Author SHA1 Message Date
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 9fd9f60855 compile 2020-01-11 10:49:44 -08: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
r4d6andGitHub c3f47e713a Merge branch 'master' into RCD-Updates 2020-01-07 00:04:43 -05:00
GhomandGitHub 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
r4d6andGitHub 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
HatterhatandGitHub 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
GhomandGitHub 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
GhomandGitHub e526f26f46 Merge pull request #10126 from Putnam3145/he-tweaks
Makes HE pipes realistically radiate away heat
2019-12-20 13:34:47 +01:00
Ghommie 70e8026411 two more PRs. 2019-12-19 11:59:15 +01:00
Ghommie 8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01: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
LinandGitHub 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
Putnam 54162947bc Also takes into account external temp (radiation coming back in, specifically) 2019-12-09 07:10:01 -08:00
Putnam 75d8be980a atmos tweaks 2019-12-09 02:00:58 -08: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
r4d6andGitHub 2eca1657ab Add a N2O Pressure Tank 2019-12-08 08:54:50 -05:00
Ghommie 542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Putnam 1b310d41bf Filters are now volume-based. 2019-11-29 21:23:08 -08:00
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
kevinz000andGitHub 178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
2019-11-14 16:38:27 -07:00
Ghommie 6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
kevinz000andGitHub 318c03cc28 Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
2019-11-14 15:52:11 -07:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie 9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Ghommie a204fddc4b Fixing some issues with dullahans. 2019-11-01 18:51:06 +01:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Poojawa 9c4a808e7e Adds Cryo QoL with hotkeys
Ctrl click to swap power, Alt click to close/open machine. This is how you do a "QoL" PR.
2019-10-03 23:14:46 -05:00
Ghommie 24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Ghommie ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie 1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
CameronWoof d944c0bb27 Normalizes Air Alarms 2019-07-12 15:04:43 -07:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Sishen e5cd1bd7c2 Update thermomachine.dm 2019-07-03 17:46:05 -04:00
Sishen 4fa244e8e4 Update thermomachine.dm 2019-07-03 17:41:27 -04:00
Sishen 9e514bfab5 Update thermomachine.dm 2019-07-03 17:39:41 -04:00
Sishen df75f9f289 Update thermomachine.dm 2019-07-03 17:38:19 -04:00
Sishen a9f5b99510 Update thermomachine.dm 2019-07-03 16:55:14 -04:00