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

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/objects/items.dm
This commit is contained in:
PsiOmega
2015-07-06 18:33:09 +02:00
parent 6b3895cba5 ba7b378183
commit cee5f1a057
22 changed files with 231 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/shieldgen/sheldwallgen.dm
View File

@@ -80,10 +80,10 @@
return 1
/obj/machinery/shieldwallgen/process()
spawn(100)
power()
if(power)
storedpower -= 2500 //the generator post itself uses some power
power()
if(power)
storedpower -= 2500 //the generator post itself uses some power
if(storedpower >= max_stored_power)
storedpower = max_stored_power
if(storedpower <= 0)