Skip to content

Commit

Permalink
Minor tweaks to forged tools (#2013) (#2966)
Browse files Browse the repository at this point in the history
* changes

* comment

Co-authored-by: JimKil3 <[email protected]>
  • Loading branch information
Steals-The-PRs and JimKil3 authored Apr 19, 2024
1 parent e2ccaa1 commit 8708ca9
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion modular_nova/modules/reagent_forging/code/forge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@

in_use = TRUE
while(forge_temperature < 91)
if(!do_after(user, skill_modifier * forge_item.toolspeed, target = src))
if(!do_after(user, (skill_modifier * forge_item.toolspeed) SECONDS, target = src))
balloon_alert_to_viewers("stopped billowing")
in_use = FALSE
return ITEM_INTERACT_SUCCESS
Expand Down
6 changes: 3 additions & 3 deletions modular_nova/modules/reagent_forging/code/forge_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ GLOBAL_LIST_INIT(allowed_forging_materials, list(
icon = 'modular_nova/modules/reagent_forging/icons/obj/forge_items.dmi'
lefthand_file = 'modular_nova/modules/reagent_forging/icons/mob/forge_weapon_l.dmi'
righthand_file = 'modular_nova/modules/reagent_forging/icons/mob/forge_weapon_r.dmi'
toolspeed = 1 SECONDS
toolspeed = 1
///whether the item is in use or not
var/in_use = FALSE

Expand All @@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(allowed_forging_materials, list(

/obj/item/forging/tongs/primitive
name = "primitive forging tongs"
toolspeed = 2 SECONDS
toolspeed = 2

/obj/item/forging/tongs/attack_self(mob/user, modifiers)
. = ..()
Expand Down Expand Up @@ -78,7 +78,7 @@ GLOBAL_LIST_INIT(allowed_forging_materials, list(

/obj/item/forging/billow/primitive
name = "primitive forging billow"
toolspeed = 2 SECONDS
toolspeed = 2

//incomplete pre-complete items
/obj/item/forging/incomplete
Expand Down
4 changes: 3 additions & 1 deletion modular_nova/modules/reagent_forging/code/forge_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_COLOR
obj_flags = UNIQUE_RENAME
obj_flags_nova = ANVIL_REPAIR
toolspeed = 0.9 //Slightly better than avg. - A forged hammer or knife is probably better than a standard one

/obj/item/forging/reagent_weapon/Initialize(mapload)
. = ..()
Expand Down Expand Up @@ -75,6 +76,7 @@
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
sharpness = SHARP_EDGED
tool_behaviour = TOOL_KNIFE

//what a cute gimmick
/obj/item/forging/reagent_weapon/dagger/attack(mob/living/M, mob/living/user, params)
Expand Down Expand Up @@ -212,7 +214,7 @@
var/obj/item/forging/hammer/attacking_hammer = attacking_item
var/skill_modifier = user.mind.get_skill_modifier(/datum/skill/smithing, SKILL_SPEED_MODIFIER) * attacking_hammer.toolspeed
while(atom_integrity < max_integrity)
if(!do_after(user, skill_modifier, src))
if(!do_after(user, skill_modifier SECONDS, src))
return
var/fixing_amount = min(max_integrity - atom_integrity, 5)
atom_integrity += fixing_amount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
/obj/item/forging/tongs/integrated
name = "heat-sheathed fingertip tongs"
desc = "Hardy heat-treated metal and integrated heatsinks allow these two fingertip replacement augs to act as one might use ordinary metallurgical tongs, resisting burns from all but the most raging forges."
toolspeed = 2 SECONDS
toolspeed = 2

/obj/item/forging/tongs/integrated/Initialize(mapload)
. = ..()
Expand All @@ -141,7 +141,7 @@
/obj/item/forging/billow/integrated
name = "motorized mini-bellows"
desc = "Let not its size deceive you, for the gale this hinged accordion-like aug can produce when activated is enough to stoke even the most timid fires into a frenzy. Has a health and safety warning on it which reads: 'DO NOT INSERT INTO MOUTH'."
toolspeed = 2 SECONDS
toolspeed = 2

/obj/item/forging/billow/integrated/Initialize(mapload)
. = ..()
Expand Down

0 comments on commit 8708ca9

Please sign in to comment.