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.

Sign up for GitHub

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

Shield and Flail Nerfs #34

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Shield and Flail Nerfs #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions code/game/objects/items/rogueweapons/melee/flail.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
swingsound = BLUNTWOOSH_MED
throwforce = 5
wdefense = 0
minstr = 4
minstr = 5

/datum/intent/flail/strike
name = "strike"
blade_class = BCLASS_BLUNT
attack_verb = list("strikes", "hits")
hitsound = list('sound/combat/hits/blunt/flailhit.ogg')
chargetime = 0
penfactor = 5
penfactor = 4
icon_state = "instrike"
item_d_type = "slash"

Expand All @@ -34,18 +34,18 @@
blade_class = BCLASS_BLUNT
attack_verb = list("strikes", "hits")
hitsound = list('sound/combat/hits/blunt/flailhit.ogg')
chargetime = 5
chargetime = 6
recovery = 15
penfactor = 5
penfactor = 4
reach = 2
icon_state = "instrike"
item_d_type = "slash"

/datum/intent/flail/strike/smash
name = "smash"
chargetime = 5
chargetime = 6
no_early_release = TRUE
penfactor = 80
penfactor = 50
recovery = 10
damfactor = 1.5
chargedloop = /datum/looping_sound/flailswing
Expand Down Expand Up @@ -84,7 +84,7 @@


/obj/item/rogueweapon/flail/sflail
force = 30
force = 25
icon_state = "flail"
desc = "This is a swift, steel flail. Strikes hard and far."
smeltresult = /obj/item/ingot/steel
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/rogueweapons/shields.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
resistance_flags = FLAMMABLE
can_parry = TRUE
wdefense = 15
var/coverage = 90
var/coverage = 60
parrysound = "parrywood"
attacked_sound = "parrywood"
max_integrity = 150
Expand Down
Loading