Merge pull request #6128 from Citadel-Station-13/upstream-merge-36622

[MIRROR] Fixes wormhole projectors
This commit is contained in:
deathride58
2018-03-27 17:51:00 +00:00
committed by GitHub
3 changed files with 17 additions and 2 deletions
@@ -37,7 +37,7 @@
//proc to magically refill a casing with a new projectile
/obj/item/ammo_casing/proc/newshot() //For energy weapons, syringe gun, shotgun shells and wands (!).
if(!BB)
BB = new projectile_type(src)
BB = new projectile_type(src, src)
/obj/item/ammo_casing/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/ammo_box))
@@ -12,3 +12,9 @@
/obj/item/ammo_casing/energy/wormhole/Initialize(mapload, obj/item/gun/energy/wormhole_projector/wh)
. = ..()
gun = wh
/obj/item/ammo_casing/energy/wormhole/throw_proj()
. = ..()
if(istype(BB, /obj/item/projectile/beam/wormhole))
var/obj/item/projectile/beam/wormhole/WH = BB
WH.gun = gun
@@ -185,7 +185,16 @@
/obj/item/gun/energy/wormhole_projector/update_icon()
icon_state = "[initial(icon_state)][select]"
item_state = icon_state
return
/obj/item/gun/energy/wormhole_projector/update_ammo_types()
. = ..()
for(var/i in 1 to ammo_type.len)
var/obj/item/ammo_casing/energy/wormhole/W = ammo_type[i]
if(istype(W))
W.gun = src
var/obj/item/projectile/beam/wormhole/WH = W.BB
if(istype(WH))
WH.gun = src
/obj/item/gun/energy/wormhole_projector/process_chamber()
..()