Skip to content

Commit

Permalink
linters???
Browse files Browse the repository at this point in the history
  • Loading branch information
Skies-Of-Blue committed Dec 22, 2024
1 parent 441f5ab commit 18c7dc3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion code/game/objects/items/fireaxe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ GLOBAL_DATUM(bridge_axe, /obj/item/fireaxe)
GLOB.bridge_axe = src

AddComponent(/datum/component/butchering, \
speed = 7.5 SECONDS, \ // IRIS EDIT: Originally 10 SECONDS
speed = 7.5 SECONDS, \
effectiveness = 80, \
bonus_modifier = 0 , \
butcher_sound = hitsound, \
)
// IRIS EDIT: Originally 10 SECONDS
//axes are not known for being precision butchering tools
AddComponent(/datum/component/two_handed, force_unwielded=force_unwielded, force_wielded=force_wielded, icon_wielded="[base_icon_state]1")

Expand Down
6 changes: 4 additions & 2 deletions code/game/objects/items/knives.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@
///Adds the butchering component, used to override stats for special cases
/obj/item/knife/proc/set_butchering()
AddComponent(/datum/component/butchering, \
speed = 6 SECONDS - force, \ // IRIS EDIT: Originally 8 SECONDS
speed = 6 SECONDS - force, \
effectiveness = 100, \
bonus_modifier = force - 10, \
)
// IRIS EDIT: Originally 8 SECONDS
//bonus chance increases depending on force

/obj/item/knife/suicide_act(mob/living/user)
Expand Down Expand Up @@ -113,10 +114,11 @@

/obj/item/knife/hunting/set_butchering()
AddComponent(/datum/component/butchering, \
speed = 6 SECONDS - force, \ // IRIS EDIT: Originally 8 SECONDS
speed = 6 SECONDS - force, \
effectiveness = 100, \
bonus_modifier = force + 10, \
)
// IRIS EDIT: Originally 8 SECONDS

/obj/item/knife/combat
name = "combat knife"
Expand Down
3 changes: 2 additions & 1 deletion code/game/objects/items/spear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@
)

AddComponent(/datum/component/butchering, \
speed = 7.5 SECONDS, \ // IRIS EDIT: Originally 10 SECONDS
speed = 7.5 SECONDS, \
effectiveness = 70, \
)
// IRIS EDIT: Originally 10 SECONDS
AddComponent(/datum/component/two_handed, \
force_unwielded = force_unwielded, \
force_wielded = force_wielded, \
Expand Down

0 comments on commit 18c7dc3

Please sign in to comment.