Merge pull request #4328 from Fox-McCloud/tesla-update

Tesla Update/Rebalance
This commit is contained in:
TheDZD
2016-05-01 12:52:40 -04:00
9 changed files with 235 additions and 165 deletions
+4 -2
View File
@@ -273,8 +273,10 @@ a {
being_shocked = 1
var/power_bounced = power * 0.5
tesla_zap(src, 3, power_bounced)
spawn(10)
being_shocked = 0
addtimer(src, "reset_shocked", 10)
/obj/proc/reset_shocked()
being_shocked = 0
/obj/proc/CanAStarPass()
. = !density