diff --git a/code/modules/clothing/under/xenos/vox.dm b/code/modules/clothing/under/xenos/vox.dm index e84f6952761..b29df92e8c9 100644 --- a/code/modules/clothing/under/xenos/vox.dm +++ b/code/modules/clothing/under/xenos/vox.dm @@ -20,9 +20,9 @@ //Vox Accessories /obj/item/clothing/accessory/storage/vox - name = "" + name = "alien mesh" desc = "An alien mesh. Seems to be made up mostly of pockets and writhing flesh." - icon_state = "vox-webbing" + icon_state = "webbing-vox" slot = "vox" slots = 5 diff --git a/code/modules/projectiles/guns/vox.dm b/code/modules/projectiles/guns/vox.dm index 95423fece94..c1e0e84cf80 100644 --- a/code/modules/projectiles/guns/vox.dm +++ b/code/modules/projectiles/guns/vox.dm @@ -103,6 +103,7 @@ item_state = "noise" fire_sound = 'sound/effects/basscannon.ogg' self_recharge = 1 + charge_cost = 600 projectile_type=/obj/item/projectile/sonic/strong @@ -121,6 +122,8 @@ embed_chance = 0 vacuum_traversal = 0 +// var/amplitude = 10 //Roughly how loud it is, changes the way damage will work, and such + /obj/item/projectile/sonic/weak agony = 30 @@ -128,8 +131,9 @@ damage = 45 //Already have thoughts on how to improve this, will take a day or two after initial testing. - Anewbe + /obj/item/projectile/sonic/strong/on_hit(var/atom/movable/target, var/blocked = 0) - if(istype(target)) + if(ismob(target)) var/throwdir = get_dir(firer,target) - target.throw_at(get_edge_target_turf(target, throwdir),10,10) + target.throw_at(get_edge_target_turf(target, throwdir), rand(1,6), 10) return 1 \ No newline at end of file diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 23630954b00..5345f06dc93 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -140,7 +140,7 @@ armor_penetration = 10 kill_count = 4 damage = 5 - agony = 70 + agony = 55 damage_type = BURN vacuum_traversal = 0 //Projectile disappears in empty space @@ -156,7 +156,7 @@ M.confused += 30 else if (!ear_safety) M.Stun(10) - M.Weaken(3) + M.Weaken(2) M.ear_damage += rand(1, 10) M.ear_deaf = max(M.ear_deaf,15) if (M.ear_damage >= 15)