Commit Graph

439 Commits

Author SHA1 Message Date
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
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
r4d6
2eca1657ab Add a N2O Pressure Tank 2019-12-08 08:54:50 -05:00
Ghommie
3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31: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
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
kevinz000
755559bb66 Merge pull request #9836 from Ghommie/Ghommie-cit364
Ports "Uses defines for turf atmos"
2019-11-19 21:32:42 -07:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie
773b3e6605 Oh yea, now I remember why I did not port the webedit.. bhjiiiiiiin! 2019-11-17 04:11:37 +01:00
Ghommie
641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +01:00
kevinz000
178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
2019-11-14 16:38:27 -07:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
kevinz000
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
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
a2f9aaf899 Porting "Adjacent Atmos subsystem revival" 2019-10-28 17:04:31 +01:00
Ghommie
4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
deathride58
f7cf10853e Merge pull request #8894 from Citadel-Station-13/tgfusion
T G F U S I O N
2019-10-21 21:17:16 -04: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
kevinz000
6fa6502b75 Merge branch 'master' into tgfusion 2019-09-28 00:35:50 -07:00
BlackMajor
4d6b9f5da1 Merge pull request #8537 from Ghommie/Ghommie-cit28
Fixes emags wasting charges on un-emaggable stuff.
2019-08-28 13:54:03 +12:00
kevinz000
d64e5b29fd Update reactions.dm 2019-08-25 15:59:45 -07:00
Sishen
b093439c73 aaaaaaaa 2019-08-25 16:27:02 -04: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
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
Ghommie
8bd64598c5 umh mh... 2019-07-17 01:32:33 +02:00
Ghommie
408c9aec51 Nothing the power of copypasta won't stop. 2019-07-17 01:01:33 +02:00
Ghommie
ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie
c7db3ad8f9 Porting a couple atmos performance improvements. 2019-07-16 23:51:38 +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
kevinz000
835e91d46e compile 2019-07-14 05:13:47 -07:00
kevinz000
0299cb3dcf tgfusion 2019-07-14 03:55:35 -07: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
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
Sishen
f55ef6a755 Update thermomachine.dm 2019-06-30 16:10:54 -04:00
Sishen
0d3efa0abd sell gases to get that fuckin bike 2019-06-20 19:21:12 -04:00
Ghommie
d5279c8373 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-17 09:51:22 +02:00
Arturlang
44be4ea7b4 Reviewers suggestions 2019-06-12 23:58:54 +03:00
unknown
355e384ba1 Spacing fixes 2019-06-11 14:31:27 +03:00
unknown
9219401154 Doneso 2019-06-11 14:24:16 +03:00