cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
RavingManiac
2014-10-27 20:48:25 +08:00
parent 27df7dca09 3839644bd8
commit 2ecf93563c
47 changed files with 2329 additions and 1961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/objects/items/devices/powersink.dm
View File

@@ -97,10 +97,7 @@
SetLuminosity(12)
// found a powernet, so drain up to max power from it
var/drained = min ( drain_rate, PN.avail )
PN.newload += drained
power_drained += drained
var/drained = PN.draw_power(drain_rate)
// if tried to drain more than available on powernet
// now look for APCs and drain their cells

2
code/game/objects/structures/crates_lockers/largecrate.dm
View File

@@ -70,5 +70,5 @@
/obj/structure/largecrate/hoverpod/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/crowbar))
new /obj/mecha/working/hoverpod(loc)
new /obj/mecha/hoverpod(loc)
..()