diff --git a/code/datums/supplypacks/munitions_vr.dm b/code/datums/supplypacks/munitions_vr.dm index 243c0ea871f..cc258e42cb5 100644 --- a/code/datums/supplypacks/munitions_vr.dm +++ b/code/datums/supplypacks/munitions_vr.dm @@ -8,7 +8,7 @@ containertype = /obj/structure/closet/crate/secure containername = "frontier phaser crate" access = access_explorer - + /datum/supply_pack/munitions/expeditionbows name = "Frontier bows (station-locked) crate" contains = list( @@ -57,4 +57,14 @@ cost = 35 containertype = /obj/structure/closet/crate/large/secure/heph containername = "Mining disperser charge crate" - access = access_security \ No newline at end of file + access = access_security + +/datum/supply_pack/munitions/longsword + name = "Weapons - Melee -Longsword (Steel)" + contains = list( + /obj/item/weapon/material/twohanded/longsword=2 + ) + cost = 50 + containertype = /obj/structure/closet/crate/secure + containername = "longsword" + access = access_armory \ No newline at end of file diff --git a/code/game/objects/items/weapons/material/twohanded_vr.dm b/code/game/objects/items/weapons/material/twohanded_vr.dm index f21738dd802..17f7a56caa6 100644 --- a/code/game/objects/items/weapons/material/twohanded_vr.dm +++ b/code/game/objects/items/weapons/material/twohanded_vr.dm @@ -7,3 +7,30 @@ slot_r_hand_str = 'icons/vore/custom_items_right_hand_vr.dmi', ) desc = "An infernum made riding crop with Malady Blanche engraved in the shaft. It's a little worn from how many butts it has spanked." + +/obj/item/weapon/material/twohanded/longsword + w_class = ITEMSIZE_NORMAL + name = "longsword" + desc = "a more elegant weapon from a more civilised age" + icon= 'icons/obj/weapons_vr.dmi' + icon_state = "longsword" + base_icon = "longsword" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi', + ) + item_state = "saber" + unwielded_force_divisor = 0.1 + force_divisor = 0.3 + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + edge = TRUE + sharp = TRUE + + +/obj/item/weapon/material/twohanded/saber/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") + if (src.wielded == 1) + if(unique_parry_check(user, attacker, damage_source) && prob(50)) + user.visible_message("\The [user] parries [attack_text] with \the [src]!") + playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) + return 1 + return 0 diff --git a/icons/mob/items/lefthand_melee_vr.dmi b/icons/mob/items/lefthand_melee_vr.dmi index edf9142d1f9..43a56cbfb5e 100644 Binary files a/icons/mob/items/lefthand_melee_vr.dmi and b/icons/mob/items/lefthand_melee_vr.dmi differ diff --git a/icons/mob/items/righthand_melee_vr.dmi b/icons/mob/items/righthand_melee_vr.dmi index 6558ff45936..89942d6e2f5 100644 Binary files a/icons/mob/items/righthand_melee_vr.dmi and b/icons/mob/items/righthand_melee_vr.dmi differ diff --git a/icons/obj/weapons_vr.dmi b/icons/obj/weapons_vr.dmi index b4fdfb9d5c8..33d8a9f286f 100644 Binary files a/icons/obj/weapons_vr.dmi and b/icons/obj/weapons_vr.dmi differ