Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changing crews armblade wepons #12129

Merged
merged 1 commit into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/items/weaponry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
item_state = "hydraulic_blade"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
force = 18
force = 20
block_upgrade_walk = 1
block_flags = BLOCKING_ACTIVE | BLOCKING_NASTY
sharpness = SHARP_DISMEMBER
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/nanites/nanite_programs/buffing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
/obj/item/melee/arm_blade/nanite
name = "metallic armblade"
desc = "Nanites have formed this extremely sharp blade around your arm. Owie."
force = 15
force = 20
sharpness = SHARP_DISMEMBER
icon = 'icons/obj/nanite.dmi'
icon_state = "nanite_blade"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Slimecrossing Weapons
/obj/item/melee/arm_blade/slime
name = "slimy boneblade"
desc = "What remains of the bones in your arm. Incredibly sharp, and painful for both you and your opponents."
force = 15
force = 20
sharpness = SHARP_DISMEMBER
force_string = "painful"

Expand Down
Loading