Support Patch (#26530)

This commit is contained in:
Kurfursten
2020-05-18 06:00:34 -05:00
committed by GitHub
parent 0a67788c71
commit 3a5d9d6cf0
4 changed files with 21 additions and 11 deletions

View File

@@ -174,7 +174,7 @@
/obj/item/weapon/gun/energy/shotgun
name = "energy shotgun"
desc = "An experimental energy shotgun from Alcatraz IV. It has two modes that fire experimental stun electrodes codenamed HUNTER and SWEEPER."
icon_state = "cshotgun"
icon_state = "eshotgun"
item_state = null
inhand_states = list("left_hand" = 'icons/mob/in-hand/left/guninhands_left.dmi', "right_hand" = 'icons/mob/in-hand/right/guninhands_right.dmi')
origin_tech = Tc_COMBAT + "=5;" + Tc_MATERIALS + "=2"
@@ -197,12 +197,9 @@
pumped = FALSE
return TRUE
/obj/item/weapon/gun/energy/shotgun/update_icon()
return //no indicator
/obj/item/weapon/gun/energy/shotgun/proc/pump(mob/M as mob)
if(world.time > pumped + 1 SECONDS)
if(power_supply.charge > charge_cost)
if(power_supply.charge >= charge_cost)
playsound(src, 'sound/weapons/shotgunpump.ogg', 60, 1)
pumped = world.time
else

View File

@@ -81,15 +81,17 @@
/obj/item/weapon/gun/projectile/hecate/hunting/attack_self(mob/user)
if(wielded)
if(!getAmmo())
handing(user)
return
if(recentpump)
return
pump(user)
recentpump = 1
spawn(10)
recentpump = 0
return
else
to_chat(user, "<span class='warning'>You must dual-wield \the [src] before you can pull the bolt on it!</span>")
handing(user)
/obj/item/weapon/gun/projectile/hecate/hunting/proc/handing(mob/user)
scope_toggled = 0