cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-19 20:22:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rebase issues

Browse Source
This commit is contained in:
atermonera
2022-04-17 19:18:15 -08:00
parent 7c807a2f90
commit fec412daaa
8 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/swords.dm
+6 -6
View File
@@ -25,7 +25,7 @@
icon_state = "katana"
slot_flags = SLOT_BELT | SLOT_BACK
/obj/item/weapon/material/sword/rapier
/obj/item/material/sword/rapier
name = "rapier"
desc = "A slender, fancy and sharply pointed sword."
icon_state = "rapier"
@@ -35,7 +35,7 @@
attack_verb = list("attacked", "stabbed", "prodded", "poked", "lunged")
edge = 0 //rapiers are pointy, but not cutty like other swords
/obj/item/weapon/material/sword/longsword
/obj/item/material/sword/longsword
name = "longsword"
desc = "A double-edged large blade."
icon_state = "longsword"
@@ -44,7 +44,7 @@
slot_flags = SLOT_BELT | SLOT_BACK
can_cleave = TRUE
/obj/item/weapon/material/sword/sabre
/obj/item/material/sword/sabre
name = "sabre"
desc = "A sharp curved sword, a favored weapon of pirates far in the past."
icon_state = "sabre"
@@ -52,7 +52,7 @@
applies_material_colour = 0 //messes up the hilt color otherwise
slot_flags = SLOT_BELT
/obj/item/weapon/material/sword/battleaxe
/obj/item/material/sword/battleaxe
name = "battleaxe"
desc = "A one handed battle axe, still a deadly weapon."
icon_state = "axe"
@@ -64,14 +64,14 @@
pickup_sound = 'sound/items/pickup/axe.ogg'
can_cleave = TRUE
/obj/item/weapon/material/sword/battleaxe/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
/obj/item/material/sword/battleaxe/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(unique_parry_check(user, attacker, damage_source) && prob(10))
user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
return 1
return 0
/obj/item/weapon/material/sword/gladius
/obj/item/material/sword/gladius
name = "gladius"
desc = "An ancient short sword, designed to stab and cut."
icon_state = "gladius"
code/game/objects/items/weapons/material/twohanded.dm
+5 -5
View File
@@ -175,7 +175,7 @@
icon_state = "riding_crop0"
attack_verb = list("cropped","spanked","swatted","smacked","peppered")
/obj/item/weapon/material/twohanded/spear/pike
/obj/item/material/twohanded/spear/pike
name = "pike"
icon_state = "pike0"
base_icon = "pike"
@@ -187,7 +187,7 @@
drop_sound = 'sound/items/drop/woodweapon.ogg'
pickup_sound = 'sound/items/pickup/woodweapon.ogg'
/obj/item/weapon/material/twohanded/spear/halberd
/obj/item/material/twohanded/spear/halberd
icon_state = "halberd0"
base_icon = "halberd"
name = "halberd"
@@ -200,14 +200,14 @@
can_cleave = TRUE
/obj/item/weapon/material/twohanded/spear/pike/pitchfork
/obj/item/material/twohanded/spear/pike/pitchfork
icon_state = "pitchfork0"
base_icon = "pitchfork"
name = "pitchfork"
desc = "An old farming tool, not something you would find at hydroponics."
applies_material_colour = 0
/obj/item/weapon/material/twohanded/zweihander
/obj/item/material/twohanded/zweihander
icon_state = "zweihander0"
base_icon = "zweihander"
name = "zweihander"
@@ -225,7 +225,7 @@
default_material = "steel"
can_cleave = TRUE
/obj/item/weapon/material/twohanded/zweihander/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
/obj/item/material/twohanded/zweihander/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(unique_parry_check(user, attacker, damage_source) && prob(10))
user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)