diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index 0f52332ee944..272882779d57 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -836,7 +836,7 @@ to_chat(caller, SPAN_WARNING("You recently activated the stabilising crystal. Be patient.")) return FALSE - if(!drain_power(caller, 1000)) + if(!drain_power(caller, 400)) return FALSE inject_timer = TRUE @@ -877,7 +877,7 @@ to_chat(usr, SPAN_WARNING("Your bracer is still generating a new healing capsule!")) return FALSE - if(!drain_power(caller, 800)) + if(!drain_power(caller, 600)) return FALSE healing_capsule_timer = TRUE diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm index 9b8399571cab..0ea527847d72 100644 --- a/code/modules/cm_preds/yaut_weapons.dm +++ b/code/modules/cm_preds/yaut_weapons.dm @@ -955,12 +955,15 @@ if(!HAS_TRAIT(user, TRAIT_YAUTJA_TECH)) to_chat(user, SPAN_WARNING("You have no idea how this thing works!")) return + if(charge_time < 7) + to_chat(user, SPAN_WARNING("The rifle does not have enough power remaining!")) + return return ..() /obj/item/weapon/gun/energy/yautja/plasmarifle/load_into_chamber() ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/rifle/bolt] - charge_time -= 10 + charge_time -= 7 var/obj/projectile/projectile = create_bullet(ammo, initial(name)) projectile.set_light(1) in_chamber = projectile @@ -975,7 +978,8 @@ /obj/item/weapon/gun/energy/yautja/plasmarifle/delete_bullet(obj/projectile/projectile_to_fire, refund = 0) qdel(projectile_to_fire) - if(refund) charge_time *= 2 + if(refund) + charge_time += 7 return TRUE #define FIRE_MODE_STANDARD "Standard" @@ -1165,15 +1169,15 @@ switch(strength) if("low power stun bolts") strength = "high power stun bolts" - charge_cost = 100 - set_fire_delay(FIRE_DELAY_TIER_6 * 3) + charge_cost = 50 + set_fire_delay(FIRE_DELAY_TIER_1) fire_sound = 'sound/weapons/pred_lasercannon.ogg' to_chat(user, SPAN_NOTICE("[src] will now fire [strength].")) ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/caster/bolt/stun] if("high power stun bolts") strength = "plasma immobilizers" - charge_cost = 300 - set_fire_delay(FIRE_DELAY_TIER_6 * 20) + charge_cost = 200 + set_fire_delay(FIRE_DELAY_TIER_2 * 8) fire_sound = 'sound/weapons/pulse.ogg' to_chat(user, SPAN_NOTICE("[src] will now fire [strength].")) ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/caster/sphere/stun] @@ -1188,8 +1192,8 @@ switch(strength) if("plasma bolts") strength = "plasma spheres" - charge_cost = 1200 - set_fire_delay(FIRE_DELAY_TIER_6 * 20) + charge_cost = 1000 + set_fire_delay(FIRE_DELAY_TIER_2 * 12) fire_sound = 'sound/weapons/pulse.ogg' to_chat(user, SPAN_NOTICE("[src] will now fire [strength].")) ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/caster/sphere] diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index 1bb1083a9d4f..783b982f10bd 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -2464,9 +2464,6 @@ else M.apply_effect(stun_time, WEAKEN) - - - /datum/ammo/energy/yautja/rifle/bolt name = "plasma rifle bolt" icon_state = "ion"