Skip to content

Commit

Permalink
QOLmod - pre PR clean
Browse files Browse the repository at this point in the history
  • Loading branch information
Resomi Enjoer committed Oct 15, 2023
1 parent 0c75884 commit f7b3194
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
14 changes: 13 additions & 1 deletion tff_modular/modules/tff_modsuits/modules/module_combat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
var/datum/weakref/spear_ref

/obj/item/mod/module/energy_spear/on_use()
..()
if(!..())
return
//Если прошлое копье еще существует(каким-то образом), останавливаем создание нового.
if(deployed)
mod.wearer.balloon_alert(mod.wearer, "Old spear exist!")
Expand Down Expand Up @@ -81,6 +82,17 @@
/obj/item/mod/module/itemgive/mod_blade/syndicate,
)

/obj/item/mod/module/itemgive/mod_blade/on_install()
. = ..()
for(var/obj/item/melee/mod_blade/blade in items_to_give)
balde.mod = mod

Check failure on line 88 in tff_modular/modules/tff_modsuits/modules/module_combat.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "balde"

Check warning on line 88 in tff_modular/modules/tff_modsuits/modules/module_combat.dm

View workflow job for this annotation

GitHub Actions / Run Linters

field access requires static type: "mod"


/obj/item/mod/module/itemgive/mod_blade/on_uninstall(deleting)
. = ..()
for(var/obj/item/melee/mod_blade/blade in items_to_give)
balde.mod = null

Check failure on line 94 in tff_modular/modules/tff_modsuits/modules/module_combat.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "balde"

Check warning on line 94 in tff_modular/modules/tff_modsuits/modules/module_combat.dm

View workflow job for this annotation

GitHub Actions / Run Linters

field access requires static type: "mod"

/obj/item/mod/module/itemgive/mod_blade/syndicate
name = "MOD armblade module"
icon_state = "module_mod_armblade"
Expand Down
7 changes: 5 additions & 2 deletions tff_modular/modules/tff_modsuits/modules_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
// Урон от альтернативной атаки.
var/alt_attack_force = 10
// Время перезарядки альтерантивной атаки.
var/alt_attack_cooldown = 3 SECONDS
var/alt_attack_cooldown = 5 SECONDS
COOLDOWN_DECLARE(cooldown_aoe)
// Цена по энергии для второстепенной атаки.
var/alt_attack_power_cost = 50
Expand Down Expand Up @@ -109,7 +109,11 @@
var/turf/turf = get_step(user_turf, turn(dir_to_target, i))
for(var/mob/living/living_target in turf)
if(user.Adjacent(living_target) && living_target.body_position != LYING_DOWN)
if(living_target == user)
user.balloon_alert(user, "Hurting self!")
break
living_target.apply_damage(alt_attack_force, BRUTE, attacking_item = src)
user.do_attack_animation(target, "slash", src, TRUE)
playsound(get_turf(user), 'tff_modular/master_files/sounds/anomaly_attack_slice.ogg', 40)
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN

Expand All @@ -123,5 +127,4 @@
wound_bonus = 30
bare_wound_bonus = 30
alt_attack_force = 20
alt_attack_cooldown = 1 SECONDS
alt_attack_power_cost = 100

0 comments on commit f7b3194

Please sign in to comment.