Merge pull request #5542 from VOREStation/upstream-merge-6328

[MIRROR] Makes Heavy-Duty Cell Chargers Constructable
This commit is contained in:
Novacat
2019-07-31 02:10:06 -04:00
committed by GitHub
8 changed files with 146 additions and 63 deletions
+1 -11
View File
@@ -37,17 +37,7 @@
// Research borg's version
/obj/item/weapon/melee/baton/slime/robot
hitcost = 200
/obj/item/weapon/melee/baton/slime/robot/attack_self(mob/user)
//try to find our power cell
var/mob/living/silicon/robot/R = loc
if (istype(R))
bcell = R.cell
return ..()
/obj/item/weapon/melee/baton/slime/robot/attackby(obj/item/weapon/W, mob/user)
return
use_external_power = TRUE
// Xeno stun gun + projectile
/obj/item/weapon/gun/energy/taser/xeno