Commit Graph

413 Commits

Author SHA1 Message Date
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
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
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie
af2598035a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-05 19:32:17 +02:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
Arturlang
352b07d5b1 Goddamnit, TABS, not spaces.
Also removes alt click function for vol pumps, since thats unnecesary.
2019-05-26 17:49:48 +03:00
Arturlang
3f7f8a3560 Update mixer.dm
Adds logging and to-admin
2019-05-26 17:34:48 +03:00
Arturlang
3eff474300 Update filter.dm
Adds logging and to-admin
2019-05-26 17:33:25 +03:00
Arturlang
b494e21ef6 Update volume_pump.dm
Adds logging and message to admins
2019-05-26 17:31:23 +03:00
Arturlang
ac066c3425 Logging
Adds logging and message to admins for CTRL and Alt
2019-05-26 17:27:21 +03:00
Arturlang
869fac49a7 Apply suggestions from code review
Fixes compile errors

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-05-26 03:29:27 +03:00
Arturlang
08bb998cf3 Fixes some oofs 2019-05-25 14:06:45 +03:00
Arturlang
749e3a6f6a Apply suggestions from code review
Added logging as suggested by Poojawa

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-05-25 14:01:55 +03:00
Arturlang
96ab12cb48 Update code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-05-25 13:59:35 +03:00
Arturlang
9e025a03bd Ditto
Adds output max confirmation, removes unneeded icon update
2019-05-24 15:23:54 +03:00
Arturlang
7b82ce463b Ditto
Removes icon update, adds text confirmation to maxed pump in filter
2019-05-24 15:23:10 +03:00
Arturlang
40e90d1e34 Adds volume pump max text, as unlikely as it may be. Removes unnecesary icon update. 2019-05-24 15:21:40 +03:00
Arturlang
5a7ab390ce Gah, forgot to do spacing 2019-05-24 15:20:36 +03:00
Arturlang
661c1d9020 Add fancy colours to the plaintext. 2019-05-24 15:18:38 +03:00
Arturlang
5b2fc29d1f Pumps now let you know when their output is maxed using Alt 2019-05-24 15:08:25 +03:00
Arturlang
5d06de81b6 Fixes inconsistent indentation 2019-05-24 15:00:27 +03:00
Arturlang
fc54f4b7bf Update mixer.dm 2019-05-24 13:49:24 +03:00
Arturlang
07db00be8f Update filter.dm 2019-05-24 13:48:03 +03:00
Arturlang
e91338f9e3 Update volume_pump.dm 2019-05-24 13:47:23 +03:00
Arturlang
77bfcc61ed Update pump.dm 2019-05-24 13:37:05 +03:00
Arturlang
ea1edd965d Update mixer.dm 2019-05-24 12:18:13 +03:00
Arturlang
277a498f28 Update filter.dm 2019-05-24 12:13:45 +03:00
Arturlang
54e013272a Volume pump CTRL and alt click functionality 2019-05-24 12:12:15 +03:00