Skip to content

Commit

Permalink
Patch №1
Browse files Browse the repository at this point in the history
Фикс комментов и грамматики.
Подняли стоимость стан дубинки  с 15 до 40. То есть максимум 2 удара подряд, пока не кончится мана
Пофиксил спелл заморозки
Передвинул спелл оживления на один уровень повыше, аналогично для очищения
  • Loading branch information
Microvolnovka19 committed Dec 13, 2024
1 parent d318c01 commit 1d0f4d2
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 6 deletions.
2 changes: 1 addition & 1 deletion tff_modular/modules/psyonics/code/coersion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
4 changes: 2 additions & 2 deletions tff_modular/modules/psyonics/code/cyberimp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 15 additions & 1 deletion tff_modular/modules/psyonics/code/energistics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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
5 changes: 3 additions & 2 deletions tff_modular/modules/psyonics/code/redaction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 1d0f4d2

Please sign in to comment.