Merge pull request #2999 from Fox-McCloud/tesla-port-final

Ports TG's Tesla Engine
This commit is contained in:
Mark van Alphen
2015-12-25 16:21:11 +01:00
56 changed files with 542 additions and 250 deletions
@@ -111,7 +111,6 @@
gender = NEUTER
icon = 'icons/obj/weapons.dmi'
icon_state = "bolas"
siemens_coefficient = 1
slot_flags = SLOT_BELT
throwforce = 2
w_class = 2
+10
View File
@@ -16,6 +16,9 @@
var/Mtoollink = 0 // variable to decide if an object should show the multitool menu linking menu, not all objects use it
var/being_shocked = 0
// What reagents should be logged when transferred TO this object?
// Reagent ID => friendly name
var/list/reagents_to_log=list()
@@ -258,3 +261,10 @@ a {
/obj/proc/container_resist(var/mob/living)
return
/obj/proc/tesla_act(var/power)
being_shocked = 1
var/power_bounced = power * 0.76923
tesla_zap(src, 5, power_bounced)
spawn(10)
being_shocked = 0