Energy weapons can be reloaded

This commit is contained in:
Anewbe
2016-10-06 21:17:40 -05:00
parent 62b02e8e05
commit 0f51fda83a
22 changed files with 218 additions and 141 deletions

View File

@@ -1,11 +1,11 @@
/* What this file contains:
* A specialized stun prod, for handling fiesty slimes
* A specialized stun gun, for handling many fiesty slimes
* A stun projectile for handling xenomorphs.
*/
/obj/item/weapon/melee/baton/slime
name = "slimebaton"
@@ -27,32 +27,31 @@
else
X.stasis += (stasisforce / 6)
..()
/obj/item/weapon/melee/baton/slime/loaded/New()
..()
bcell = new/obj/item/weapon/cell/high(src)
bcell = new/obj/item/weapon/cell/device(src)
update_icon()
return
// Xeno stun gun + projectile
/obj/item/weapon/gun/energy/taser/xeno
name = "xeno taser gun"
desc = "Straight out of NT's testing laboratories, this small gun is used to subdue non-humanoid xeno life forms. While marketed towards handling slimes, it may be useful for other creatures."
icon_state = "taserold"
fire_sound = 'sound/weapons/taser2.ogg'
max_shots = 10
projectile_type = /obj/item/projectile/beam/stun/xeno
/obj/item/projectile/beam/stun/xeno
icon_state = "omni"
agony = 4
var/stasisforce = 40
muzzle_type = /obj/effect/projectile/laser_omni/muzzle
tracer_type = /obj/effect/projectile/laser_omni/tracer
impact_type = /obj/effect/projectile/laser_omni/impact
/obj/item/projectile/beam/stun/xeno/on_hit(var/atom/target, var/blocked = 0)
if(istype(target, /mob/living/simple_animal/xeno))
var/mob/living/simple_animal/xeno/X = target