Adds Parry to all hand items. Don't at me, tongue parry exists now.

code/datums/components/melee_special.dm

@@ -34,7 +34,7 @@
 	/// The maximum distance the weapon can hit a mob from.
 	var/max_distance = 1
 	/// List of which intents trigger this thing
-	var/list/intent_flags = list(INTENT_HARM)
+	var/list/intent_flags = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
 	/// targetting flags
 	var/target_flags = WS_TARGET_WALLS | WS_TARGET_IGNORE_DEAD | WS_TARGET_IGNORE_SELF | WS_TARGET_MOBS | WS_TARGET_STRUCTURES | WS_TARGET_MACHINES
 	/// target mode

code/game/objects/hand_items.dm

@@ -14,6 +14,7 @@
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	rad_flags = RAD_NO_CONTAMINATE
 	slot_flags = INV_SLOTBIT_DENYPOCKET
+	block_parry_data = /datum/block_parry_data/bokken //release the butt parries
 
 /obj/item/hand_item/Initialize(mapload)
 	. = ..()

modular_coyote/code/modules/znuguns/code/guns/tier0.dm

@@ -1,7 +1,7 @@
 // Put tier respective guns (and loadout options) here. Ammo goes in their respective files somewhere around modular_coyote/code/modules/znuguns/code/ammo .
 
 /obj/item/gun/flintlock/musket
-	name = "post-fall fire belcher"
+	name = "Musket"
 	desc = "A decently made, probably even safe, muzzle loading rifle made after the fall of the old world."
 	icon = 'modular_coyote/icons/objects/ancient.dmi'
 	icon_state = "musket1"
@@ -52,7 +52,7 @@
 	prefire_randomness = FLINTLOCK_MINIMUSKET_PREFIRE_STD
 
 /obj/item/gun/flintlock/musket/jezail
-	name = "post-fall heirloom long belcher"
+	name = "post-fall jezail"
 	desc = "A well taken care of muzzle loading firearm. This one shows family insignia and looks to have been handed down for generations."
 	icon = 'modular_coyote/icons/objects/ancient.dmi'
 	icon_state = "jezail"
@@ -77,7 +77,7 @@
 	weapon_special_component = /datum/component/weapon_special/single_turf
 
 /obj/item/gun/flintlock
-	name = "post-fall short belcher"
+	name = "post-fall muzzle loading pistol"
 	desc = "An almost safe post-fall muzzle loading pistol. Probably- uh. Just don't drop it while loaded."
 	icon_state = "flintlock"
 	inhand_icon_state = "flintlock"
@@ -97,7 +97,7 @@
 	gun_accuracy_zone_type = ZONE_WEIGHT_AUTOMATIC //smoothbore short barrel round ball
 
 /obj/item/gun/ballistic/automatic/pistol/pistol22
-	name = "can tacker"
+	name = "Ruger .22 pistol"
 	desc = "A 16 shot pre-fall handgun chambered in .22 long rifle. Great for killing rusty cans."
 	icon_state = "silenced22"
 	mag_type = /obj/item/ammo_box/magazine/m22
@@ -116,7 +116,7 @@
 	damage_multiplier = TIER0
 
 /obj/item/gun/ballistic/revolver/detective
-	name = "sidewinder"
+	name = ".22 revolver"
 	desc = "A very handy six shooter. If your only worries in life are killing a family of squirrels."
 	icon_state = "detective"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev22
@@ -130,7 +130,7 @@
 	damage_multiplier = TIER0
 
 /obj/item/gun/ballistic/rifle/repeater/trainer
-	name = "snapback"
+	name = "Henry .22 leveraction"
 	desc = "A lever action rifle chambered in .22LR. Used to teach people the basics of firearm operation."
 	icon_state = "lever22" // Placeholder
 	inhand_icon_state = "lever22"
@@ -156,7 +156,7 @@
 	damage_multiplier = TIER0
 
 /obj/item/gun/ballistic/automatic/sportcarbine
-	name = "spitball"
+	name = "Ruger 10-22"
 	desc = "One of the many .22 LR carbines that were all the rage before the cataclysm. While lacking in firepower, it more than makes up for it with its cheapness to fire."
 	icon_state = "surplus"
 	inhand_icon_state = "rifle"

modular_coyote/code/modules/znuguns/code/guns/tier2.dm

@@ -1,7 +1,7 @@
 // Put tier respective guns (and loadout options) here. Ammo goes in their respective files somewhere around modular_coyote/code/modules/znuguns/code/ammo .
 
 /obj/item/gun/ballistic/automatic/pistol/ninemil/rare99
-	name = "warden"
+	name = "Colt N104-D"
 	desc = "A compact .45 pistol. A shorter version of a straightline. It is tiny compared to its bigger brothers and packs a punch."
 	icon = 'icons/fallout/objects/guns/ballistic.dmi'
 	lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
@@ -25,7 +25,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/pistol/beretta
-	name = "big nine"
+	name = "Beretta 9mm"
 	desc = "One of the more common 9mm pistols, the Beretta is popular due to its reliability, 15 round magazine and good looks."
 	icon_state = "beretta"
 	init_mag_type = /obj/item/ammo_box/magazine/m9mm/doublestack
@@ -82,7 +82,7 @@
 	icon_state = "autopipe[magazine ? "-[CEILING(get_ammo(0)/1, 6)*1]" : ""][chambered ? "" : "-e"][silenced ? "-suppressed" : ""]"
 
 /obj/item/gun/ballistic/automatic/pistol/sig
-	name = "straightline"
+	name = "Sig 9mm"
 	desc = "A pistol that is compact and has an average rate of fire, but still in .45. Adopted by Park Rangers."
 	icon_state = "newsig"
 	inhand_icon_state = "gun"
@@ -106,7 +106,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/pistol/deagle
-	name = "shucker"
+	name = "Desert Eagle"
 	desc = "A .44 magnum semi-automatic handgun."
 	icon_state = "deagle"
 	inhand_icon_state = "deagle"
@@ -124,7 +124,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/revolver/police
-	name = ".357 one step"
+	name = "Double Action Revoler"
 	desc = "Pre-Cataclysm double action police revolver chambered in .357 magnum."
 	icon_state = "police"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev357
@@ -140,7 +140,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/revolver/m29
-	name = ".44 one step"
+	name = "Big Iron"
 	desc = "Powerful handgun for those who want to travel the deadlands safely in style. Has a bit of a kick."
 	inhand_icon_state = "model29"
 	icon_state = "m29"
@@ -159,7 +159,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/smg/mini_uzi/mp5
-	name = "hose"
+	name = "HK MP5"
 	desc = "A pre-fall design, ancient and fairly common as far as sub machineguns go."
 	icon = 'modular_coyote/icons/objects/automatic.dmi'
 	mob_overlay_icon = 'modular_coyote/icons/objects/back.dmi'
@@ -174,7 +174,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/smg/mini_uzi/mac10
-	name = "lil' hose"
+	name = "MAC-10"
 	desc = "A pre-fall compact machine pistol with a blistering fire rate. Not terribly accurate though."
 	icon = 	'modular_coyote/icons/objects/automatic.dmi'
 	icon_state = "mac10"
@@ -190,7 +190,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/smg/greasegun
-	name = "heavy hose"
+	name = "Greasegun"
 	desc = "A pre-fall design similar to the fairly common post-fall open bolt smgs. It has tight tolerances and fires a heavy cartridge."
 	icon_state = "grease_gun"
 	inhand_icon_state = "smg9mm"
@@ -212,7 +212,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/m1carbine/compact
-	name = "reservist compact"
+	name = "M1 Carbine - Folding Stock"
 	desc = "Similar to the reservist carbine, this model has a folding stock for greater mobility."
 	icon_state = "m1a1carbine"
 	weapon_class = WEAPON_CLASS_CARBINE
@@ -223,7 +223,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/varmint
-	name = "coyote"
+	name = "Ruger Ranch Rifle"
 	desc = "A simple pre-fall semi-auto rifle in 5.56mm calibre. Easy to use and maintain."
 	icon_state = "varmint"
 	inhand_icon_state = "varmintrifle"
@@ -249,7 +249,7 @@
 	damage_multiplier = TIER2 * 1.05
 
 /obj/item/gun/ballistic/automatic/service
-	name = "wolf"
+	name = "AR-15"
 	desc = "A pre-fall semi-automatic rifle that is believed to have served a great nation at one time. Now they're fairly rare, high maintenance and not very popular. Good for those who can keep it fed."
 	icon_state = "service_rifle"
 	inhand_icon_state = "servicerifle"
@@ -272,7 +272,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/m1garand/sks // to-do, make this have an internal mag please
-	name = "eastern dragon"
+	name = "SKS"
 	desc = "Somehow, despite all that has gone wrong over the last few hundred years this eastern rifle is still working. It's almost immaculate."
 	icon = 'icons/fallout/objects/guns/ballistic.dmi'
 	lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
@@ -298,7 +298,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/aksmol
-	name = "eastern drake"
+	name = "Draco"
 	desc = "An assault rifle given to rear echelon troops in place of an SMG. Lacks a stock, but packs a punch."
 	icon = 'icons/fallout/objects/guns/ballistic.dmi'
 	lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
@@ -323,7 +323,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/fnfal/ak47
-	name = "eastern wyvern"
+	name = "AK-47"
 	desc = "A fairly uncommon eastern rifle. It's hard to tell if this one is in good shape or really bad. They just don't ever look quite right."
 	icon_state = "trueak"
 	inhand_icon_state = "trueak"
@@ -348,7 +348,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/automatic/armalite
-	name = "bear"
+	name = "AR-10"
 	desc = "A pre-fall semi-automatic .308 rifle. Accurate and packs a punch, but recoil picks up quick, and it's heavy. Makes it suitable for bashing skulls, at least..."
 	icon_state = "armalite"
 	inhand_icon_state = "assault_carbine"
@@ -365,7 +365,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/shotgun/grenade // keep this out of the loot list until we fix it
-	name = "bloop"
+	name = "Grenade Launcher"
 	desc = "A pre-fall bulky but surprisingly lightweight grenade launcher with a stiff pump."
 	icon = 'modular_coyote/icons/objects/ncrrangersguns.dmi'
 	icon_state = "china_lake"
@@ -384,7 +384,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/shotgun/hunting
-	name = "razorback"
+	name = "Pump Shotgun"
 	desc = "A pre-fall traditional hunting shotgun with wood furniture and a four-shell capacity underneath."
 	icon_state = "pump"
 	inhand_icon_state = "shotgunpump"
@@ -398,7 +398,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/shotgun/automatic/combat/auto5
-	name = "hawg"
+	name = "Auto 5"
 	desc = "A pre-fall semi-automatic shotgun with a four round tube."
 	icon_state = "auto5"
 	inhand_icon_state = "shotgunauto5"
@@ -415,7 +415,7 @@
 	damage_multiplier = TIER2
 
 /obj/item/gun/ballistic/rifle/repeater/trail
-	name = "heavy snapback"
+	name = ".44 Lever Action"
 	desc = "A lever action rifle chambered in .44 Magnum."
 	icon_state = "trailcarbine"
 	inhand_icon_state = "trailcarbine"