shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490

Browse Source
This commit is contained in:
Ghommie
2020-01-10 02:26:19 +01:00
parent 592422ee70 ee5d6a3d4a
commit 825b4f01c2
178 changed files with 10647 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/collector.dm
+2 -2
View File
@@ -45,8 +45,8 @@
eject()
else
var/gasdrained = min(powerproduction_drain*drainratio,loaded_tank.air_contents.gases[/datum/gas/plasma])
loaded_tank.air_contents.gases[/datum/gas/plasma] -= gasdrained
loaded_tank.air_contents.gases[/datum/gas/tritium] += gasdrained
loaded_tank.air_contents.gases[/datum/gas/plasma] -= 2.7 * gasdrained
loaded_tank.air_contents.gases[/datum/gas/tritium] += 2.7 * gasdrained
GAS_GARBAGE_COLLECT(loaded_tank.air_contents.gases)
var/power_produced = RAD_COLLECTOR_OUTPUT