Hard upstream sync (#6951)

* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
deathride58
2018-05-31 23:03:18 +00:00
committed by kevinz000
parent b6e608cb4c
commit 2f9e3e403d
395 changed files with 134016 additions and 26287 deletions
+2 -2
View File
@@ -360,7 +360,7 @@
var/tesla_power = 20000
var/tesla_range = 15
var/tesla_boom = FALSE
var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_MOB_STUN | TESLA_OBJ_DAMAGE
var/chain
var/mob/living/caster
@@ -377,7 +377,7 @@
visible_message("<span class='warning'>[src] fizzles on contact with [target]!</span>")
qdel(src)
return
tesla_zap(src, tesla_range, tesla_power, tesla_boom)
tesla_zap(src, tesla_range, tesla_power, tesla_flags)
qdel(src)
/obj/item/projectile/magic/aoe/lightning/Destroy()