diff --git a/tff_modular/modules/psyonics/code/coersion.dm b/tff_modular/modules/psyonics/code/coersion.dm index e0ae3f96713..b5d7605fc63 100644 --- a/tff_modular/modules/psyonics/code/coersion.dm +++ b/tff_modular/modules/psyonics/code/coersion.dm @@ -266,7 +266,7 @@ button_icon = 'icons/obj/weapons/baton.dmi' button_icon_state = "stunbaton_active" cooldown_time = 0.5 SECONDS - mana_cost = 15 + mana_cost = 40 stamina_cost = 0 hand_path = /obj/item/melee/touch_attack/psyonic_mending draw_message = span_notice("You ready your hand to deal pain.") diff --git a/tff_modular/modules/psyonics/code/cyberimp.dm b/tff_modular/modules/psyonics/code/cyberimp.dm index fa2d8b5da27..130ade04a83 100644 --- a/tff_modular/modules/psyonics/code/cyberimp.dm +++ b/tff_modular/modules/psyonics/code/cyberimp.dm @@ -15,10 +15,10 @@ . = ..() REMOVE_TRAIT(organ_owner, TRAIT_NO_PSYONICS, IMPLANT_TRAIT) -// Увеличивает реген маны в 1.5 раза +// Увеличивает реген маны в 2 раза /obj/item/organ/internal/cyberimp/brain/pro_psyonic name = "Psyonic Amplifier Model A" - desc = "This implant will boost psyonics energy regenerating." + desc = "This implant will boost psyonics energy regeneration." icon_state = "brain_implant_rebooter" slot = ORGAN_SLOT_BRAIN_PSYONIC diff --git a/tff_modular/modules/psyonics/code/energistics.dm b/tff_modular/modules/psyonics/code/energistics.dm index d53c8d03593..b855fc261e3 100644 --- a/tff_modular/modules/psyonics/code/energistics.dm +++ b/tff_modular/modules/psyonics/code/energistics.dm @@ -173,7 +173,7 @@ cast_range = 9 active_msg = "You prepare to fire ice shard..." deactive_msg = "You relax." - projectile_type = /obj/projectile/temp/watcher/ice_wing + projectile_type = /obj/projectile/temp/watcher/psyonic_freeze /datum/action/cooldown/spell/pointed/projectile/psyonic/psyonic_freeze/is_valid_target(atom/cast_on) if(!isliving(cast_on)) @@ -184,3 +184,17 @@ drain_mana() . = ..() return TRUE + +// Вывел в отдельный тип, потому что в оригинальном ice_wing снаряде видимо баг(?) и он не замораживает, хотя должен. +/obj/projectile/temp/watcher/psyonic_freeze + name = "freezing blast" + damage = 0 // Нет дамага, вместо этого замораживает + +/obj/projectile/temp/watcher/psyonic_freeze/apply_status(mob/living/target) + if(HAS_TRAIT(target, TRAIT_RESISTCOLD)) // Вот тут у ice_wing лишний ! + return + target.apply_status_effect(/datum/status_effect/freon/watcher/psyonic_freeze) + +/datum/status_effect/freon/watcher/psyonic_freeze + duration = 4 // 4 секунды вместо 8 + can_melt = TRUE diff --git a/tff_modular/modules/psyonics/code/redaction.dm b/tff_modular/modules/psyonics/code/redaction.dm index d11d2e1d897..129845467cc 100644 --- a/tff_modular/modules/psyonics/code/redaction.dm +++ b/tff_modular/modules/psyonics/code/redaction.dm @@ -16,12 +16,13 @@ if(tier >= 1) var/datum/action/new_action = new /datum/action/cooldown/spell/touch/psyonic/psyonic_mending(src.mind || src, tier, additional_school) new_action.Grant(src) + if(tier >= 2) var/datum/action/new_action2 = new /datum/action/cooldown/spell/pointed/psyonic/psyonic_drunkness(src.mind || src, tier, additional_school) new_action2.Grant(src) - if(tier >= 2) + if(tier >= 3) var/datum/action/new_action = new /datum/action/cooldown/spell/touch/psyonic/psyonic_cleansing(src.mind || src, tier, additional_school) new_action.Grant(src) - if(tier >= 3) + if(tier >= 4) var/datum/action/new_action = new /datum/action/cooldown/spell/touch/psyonic/psyonic_revival(src.mind || src, tier, additional_school) new_action.Grant(src)