From 6f697cb993ace3cdcd57ca26a6f41ccaaa790be8 Mon Sep 17 00:00:00 2001 From: QuoteFox <49098813+quotefox@users.noreply.github.com> Date: Thu, 28 Jan 2021 21:21:29 +0000 Subject: [PATCH] Revert "Merge pull request #923 from SandPoot/master" This reverts commit c2cf0de80a0184c2dc432e5402a6a48b26db520d, reversing changes made to de88764136ed1d47be322e5ea6feee1bf9a794d6. --- hyperstation/code/modules/resize/sizegun.dm | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hyperstation/code/modules/resize/sizegun.dm b/hyperstation/code/modules/resize/sizegun.dm index 246b8a58..d1154838 100644 --- a/hyperstation/code/modules/resize/sizegun.dm +++ b/hyperstation/code/modules/resize/sizegun.dm @@ -8,10 +8,10 @@ pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE /obj/item/projectile/sizelaser/shrinkray - icon_state = "bluelaser" + icon_state="bluelaser" /obj/item/projectile/sizelaser/growthray - icon_state = "laser" + icon_state="laser" /obj/item/projectile/sizelaser/shrinkray/on_hit(var/atom/target, var/blocked = 0) if(istype(target, /mob/living/carbon/human)) @@ -71,16 +71,16 @@ item_state = null ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray, /obj/item/ammo_casing/energy/laser/growthray) selfcharge = EGUN_SELFCHARGE - charge_delay = 1 //it's a debug, make it go fast. + charge_delay = 5 ammo_x_offset = 2 clumsy_check = 1 -/obj/item/gun/energy/laser/sizeray/update_overlays() - . = ..() - var/current_index = current_firemode_index - if(current_index == 1) - icon_state = "redtag" - else - icon_state = "bluetag" - -//Attack self is not needed, if ammo_type is a list, the parent code will deal with it + attackby(obj/item/W, mob/user) + if(W==src) + if(icon_state=="bluetag") + icon_state="redtag" + ammo_type = list(/obj/item/ammo_casing/energy/laser/growthray) + else + icon_state="bluetag" + ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray) + return ..()