Merge pull request #3121 from Anewbe/borg_zap

Borg stun arm should work now
This commit is contained in:
MagmaRam
2017-03-22 19:42:01 -05:00
committed by GitHub
2 changed files with 10 additions and 24 deletions
@@ -360,7 +360,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/device/lightreplacer(src)
src.modules += new /obj/item/device/pipe_painter(src)
src.modules += new /obj/item/device/floor_painter(src)
src.emag = new /obj/item/borg/stun(src)
src.emag = new /obj/item/weapon/melee/baton/robot/arm(src)
var/datum/matter_synth/metal = new /datum/matter_synth/metal(40000)
var/datum/matter_synth/glass = new /datum/matter_synth/glass(40000)