Merge branch 'master' into master

This commit is contained in:
EgorDinamit
2020-02-21 21:23:07 +04:00
committed by GitHub
238 changed files with 1185 additions and 851 deletions
@@ -76,7 +76,7 @@
///Tries to charge from powernet excess, no upper limit except max charge.
/obj/machinery/computer/vaultcontroller/proc/attempt_siphon()
var/surpluspower = CLAMP(attached_cable.surplus(), 0, (siphon_max - siphoned_power))
var/surpluspower = clamp(attached_cable.surplus(), 0, (siphon_max - siphoned_power))
if(surpluspower)
attached_cable.add_load(surpluspower)
siphoned_power += surpluspower