From f9d6a9b9c49ebb04f849f363d486a9d5eb48daf8 Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Wed, 29 Jan 2020 14:23:50 +1100 Subject: [PATCH] Added the tweaks suggested by kevin but good fucking lord this changes a lot and also fuck the pka reload proc --- code/modules/projectiles/guns/energy/special.dm | 3 ++- .../projectiles/projectile/energy/ebow.dm | 16 +++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index f84079645d..f0b38f2d4e 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -105,7 +105,7 @@ /obj/item/gun/energy/kinetic_accelerator/crossbow/large name = "energy crossbow" - desc = "A reverse engineered weapon using syndicate technology." + desc = "A reverse engineered weapon using syndicate technology. This thing seems incredibly unwieldly, and seems to be using similar internals to the Proto-Kinetic Accelerator. It might not play nice when brought near weapons similar to it." icon_state = "crossbowlarge" w_class = WEIGHT_CLASS_BULKY materials = list(MAT_METAL=4000) @@ -113,6 +113,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/bolt/large) weapon_weight = WEAPON_HEAVY pin = null + unique_frequency = FALSE /obj/item/gun/energy/plasmacutter name = "plasma cutter" diff --git a/code/modules/projectiles/projectile/energy/ebow.dm b/code/modules/projectiles/projectile/energy/ebow.dm index 41ed6dfcf1..47aff5fb24 100644 --- a/code/modules/projectiles/projectile/energy/ebow.dm +++ b/code/modules/projectiles/projectile/energy/ebow.dm @@ -4,21 +4,11 @@ damage = 15 damage_type = TOX nodamage = 0 - stamina = 60 eyeblur = 10 slur = 5 - var/hardstun_ds = 0 - var/softstun_ds = 1 - var/stam_dmg = 0 - -/obj/item/projectile/energy/bolt/on_hit(atom/target, blocked = FALSE) - . = ..() - if(iscarbon(target)) - var/mob/living/carbon/C = target - var/obj/item/I = C.get_active_held_item() - if(I && C.dropItemToGround(I)) - to_chat(C, "Your arm goes limp, and you drop what you're holding!") - C.Knockdown(softstun_ds, TRUE, FALSE, hardstun_ds, stam_dmg) + knockdown = 160 + stamina = 0 + knockdown_stamoverride = 60 /obj/item/projectile/energy/bolt/halloween name = "candy corn"