diff --git a/code/game/objects/items/rogueweapons/ranged/ammo.dm b/code/game/objects/items/rogueweapons/ranged/ammo.dm index 3836d9f13c..d09867e3bb 100644 --- a/code/game/objects/items/rogueweapons/ranged/ammo.dm +++ b/code/game/objects/items/rogueweapons/ranged/ammo.dm @@ -72,6 +72,29 @@ name = "stone arrow" ammo_type = /obj/item/ammo_casing/caseless/rogue/arrow/stone +/obj/item/ammo_casing/caseless/rogue/arrow/padded + name = "padded arrow" + desc = "A wooden shaft with a padded sack at the end." + projectile_type = /obj/projectile/bullet/reusable/arrow/padded + caliber = "arrow" + icon_state = "arrow_padded" + force = 0 + dropshrink = 0.6 + possible_item_intents = list(/datum/intent/mace/strike/wood, /datum/intent/mace/smash/wood) + max_integrity = 20 + +/obj/projectile/bullet/reusable/arrow/padded + name = "padded arrow" + damage = 0 + knockdown = 100 + stun = 20 + icon = 'icons/roguetown/weapons/ammo.dmi' + icon_state = "arrow_pad_proj" + ammo_type = /obj/item/ammo_casing/caseless/rogue/arrow/padded + hitsound = 'sound/combat/hits/punch/punch_heavy.ogg' + embedchance = 0 + woundclass = BCLASS_BLUNT + /obj/item/ammo_casing/caseless/rogue/arrow/stone name = "stone arrow" desc = "A wooden shaft with a jagged rock on the end." diff --git a/code/modules/roguetown/roguecrafting/items.dm b/code/modules/roguetown/roguecrafting/items.dm index 98670b2440..8c262a8c8a 100644 --- a/code/modules/roguetown/roguecrafting/items.dm +++ b/code/modules/roguetown/roguecrafting/items.dm @@ -371,3 +371,13 @@ skillcraft = /datum/skill/craft/traps craftdiff = 1 verbage = "put together" + +/datum/crafting_recipe/roguetown/paddedarrow + name = "padded arrow" + result = /obj/item/ammo_casing/caseless/rogue/arrow/padded + reqs = list(/obj/item/storage/roguebag = 1, + /obj/item/grown/log/tree/stick = 1, + /obj/item/natural/fibers = 2) + verbage_simple = "stuff together" + verbage = "stuff together" + craftdiff = 1 diff --git a/icons/roguetown/weapons/ammo.dmi b/icons/roguetown/weapons/ammo.dmi index 4c1ab73d58..9d00a49df2 100644 Binary files a/icons/roguetown/weapons/ammo.dmi and b/icons/roguetown/weapons/ammo.dmi differ diff --git a/sound/combat/hits/punch/punch_abrupt.ogg b/sound/combat/hits/punch/punch_abrupt.ogg new file mode 100644 index 0000000000..044f887fbb Binary files /dev/null and b/sound/combat/hits/punch/punch_abrupt.ogg differ diff --git a/sound/combat/hits/punch/punch_crunch.ogg b/sound/combat/hits/punch/punch_crunch.ogg new file mode 100644 index 0000000000..4e32b1f59d Binary files /dev/null and b/sound/combat/hits/punch/punch_crunch.ogg differ diff --git a/sound/combat/hits/punch/punch_heavy.ogg b/sound/combat/hits/punch/punch_heavy.ogg new file mode 100644 index 0000000000..3178e99691 Binary files /dev/null and b/sound/combat/hits/punch/punch_heavy.ogg differ diff --git a/sound/combat/hits/punch/punch_jester.ogg b/sound/combat/hits/punch/punch_jester.ogg new file mode 100644 index 0000000000..8651ede4e4 Binary files /dev/null and b/sound/combat/hits/punch/punch_jester.ogg differ diff --git a/sound/combat/hits/punch/slap_hard.ogg b/sound/combat/hits/punch/slap_hard.ogg new file mode 100644 index 0000000000..250f7ee212 Binary files /dev/null and b/sound/combat/hits/punch/slap_hard.ogg differ