Skip to content

Makes quarterstaves not suck #7393

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

Open
HeWhoBe wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −10
Open

Makes quarterstaves not suck #7393

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
24 changes: 14 additions & 10 deletions code/game/objects/items/weapons/melee/polearms.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
desc = "The ultimate tool of travel for weary wanderers, support your weight or crack the heads that don't support you."
icon_state = "woodstaff"
force = DAMAGE_STAFF
force_wielded = DAMAGE_STAFF_WIELD - 1
force_wielded = DAMAGE_STAFF_WIELD
wdefense = GREAT_PARRY
wlength = WLENGTH_LONG
possible_item_intents = list(POLEARM_BASH)
Expand Down Expand Up @@ -75,7 +75,7 @@
name = "wooden quarterstaff"
desc = "A staff that makes any journey easier. Durable and swift, capable of bludgeoning stray volves and ruffians alike."
icon_state = "quarterstaff"
force_wielded = DAMAGE_STAFF_WIELD
force_wielded = DAMAGE_STAFF_WIELD + 3
max_integrity = INTEGRITY_STRONG * 0.8
sellprice = 10
item_weight = 1.2 KILOGRAMS
Expand All @@ -85,6 +85,8 @@
name = "iron quarterstaff"
desc = "A perfect tool for bounty hunters who prefer their prisoners broken and bruised but not slain. This reinforced staff is capable of clubbing even an armed opponent into submission with some carefully placed strikes."
icon_state = "quarterstaff_iron"
force = DAMAGE_STAFF + 4
force_wielded = DAMAGE_STAFF_WIELD + 5
gripped_intents = list(POLEARM_BASH, MACE_SMASH)
max_integrity = INTEGRITY_STRONG
minstr = 7
Expand All @@ -97,7 +99,8 @@
name = "steel quarterstaff"
desc = "An unusual sight, a knightly combat staff made out of worked steel and reinforced wood. It is a heavy and powerful weapon, more than capable of beating the living daylights out of any brigand."
icon_state = "quarterstaff_steel"
force_wielded = DAMAGE_STAFF_WIELD + 1
force = DAMAGE_STAFF + 6
force_wielded = DAMAGE_STAFF_WIELD + 7
gripped_intents = list(POLEARM_BASH, MACE_SMASH)
max_integrity = INTEGRITY_STRONGEST
minstr = 7
Expand All @@ -110,7 +113,8 @@
name = "silver quarterstaff"
desc = "A quarterstaff with silver reinforcements, more effective against supernatural foes than a steel quarterstaff."
icon_state = "quarterstaff_silver"
force_wielded = DAMAGE_STAFF_WIELD + 1
force = DAMAGE_STAFF + 6
force_wielded = DAMAGE_STAFF_WIELD + 7
gripped_intents = list(POLEARM_BASH, MACE_SMASH)
max_integrity = INTEGRITY_STRONGEST * 0.8
minstr = 7
Expand All @@ -127,7 +131,7 @@
name = "staff of the rous seer"
desc = "A staff used by the rousman seers, mainly to protect themselves."
icon_state = "seerstaff"
force_wielded = DAMAGE_STAFF_WIELD + 1
force_wielded = DAMAGE_STAFF_WIELD + 3
sellprice = 100
item_weight = 1.2 KILOGRAMS

Expand Down Expand Up @@ -344,7 +348,7 @@

/obj/item/weapon/polearm/spear/javelin
name = "copper javelin"
desc = "Made for throwing, long out of favor and using inferior metals, it still can kill when the aim is true."
desc = "Made for throwing, long out of favor and using inferior metals, it can still kill when your aim is true."
icon_state = "cspear"
force = DAMAGE_SPEAR - 2
force_wielded = DAMAGE_SPEAR + 2
Expand Down Expand Up @@ -390,7 +394,7 @@

/obj/item/weapon/polearm/spear/javelin/steel
name = "steel javelin"
desc = "A sturdy javelin made from steel, suitable to hunt knightly foes."
desc = "A sturdy javelin made from steel, suitable for hunting knightly foes."
icon = 'icons/roguetown/weapons/ammo.dmi'
icon_state = "javelin"
melting_material = /datum/material/steel
Expand All @@ -406,7 +410,7 @@

/obj/item/weapon/polearm/spear/javelin/silver
name = "silver javelin"
desc = "A sturdy javelin made from silver, suitable to hunt supernatural foes."
desc = "A sturdy javelin made from silver, suitable for hunting supernatural foes."
icon = 'icons/roguetown/weapons/ammo.dmi'
icon_state = "sjavelin"
gripsprite = FALSE
Expand All @@ -426,7 +430,7 @@

/obj/item/weapon/polearm/spear/bone
name = "bone javelin"
desc = "Made by the tribes of the wilds for hunting, this spear has will eventually kill your prey, if aim remains true."
desc = "Made by the tribes of the wilds for hunting, this spear will eventually kill your prey, if your aim remains true."
icon_state = "bspear"
throwforce = DAMAGE_SPEAR_WIELD
max_blade_int = 60
Expand All @@ -453,7 +457,7 @@

/obj/item/weapon/polearm/spear/trollbone
name = "troll-horn bone javelin"
desc = "Made by the tribes of the wilds for hunting, and strengthed with a troll's horn, this spear has will outlast your prey, if aim remains true."
desc = "Made by the tribes of the wilds for hunting, and strengthened with a troll's horn, this spear will outlast your prey, if your aim remains true."
icon_state = "bspear"
throwforce = DAMAGE_SPEAR_WIELD
max_blade_int = 60
Expand Down
Loading