Nerfs smash intent

code/game/objects/items/beartraps.dm

@@ -27,6 +27,8 @@
 	var/trap_damage = 90 // How much brute damage the trap will do to its victim
 	var/used_time = 12 SECONDS // How many seconds it takes to disarm the trap
 	max_integrity = 100
+	grid_width = 64
+	grid_height = 64
 
 /obj/item/restraints/legcuffs/beartrap/attack_hand(mob/user)
 	var/boon = user?.mind?.get_learning_boon(/datum/skill/craft/traps)

code/game/objects/items/rogueitems/waterskins.dm

@@ -16,6 +16,8 @@
 	fillsounds = list('sound/items/fillcup.ogg')
 	poursounds = list('sound/items/fillbottle.ogg')
 	sewrepair = TRUE
+	grid_width = 32
+	grid_height = 64
 
 /obj/item/reagent_containers/glass/bottle/waterskin/milk // Filled subtype used by the cheesemaker
 	list_reagents = list(/datum/reagent/consumable/milk = 64)

code/game/objects/items/rogueweapons/melee/blunt.dm

@@ -75,9 +75,11 @@
 	hitsound = list('sound/combat/hits/blunt/metalblunt (1).ogg', 'sound/combat/hits/blunt/metalblunt (2).ogg', 'sound/combat/hits/blunt/metalblunt (3).ogg')
 	penfactor = AP_CLUB_SMASH
 	damfactor = 1.1
-	swingdelay = 0
+	chargetime = 3
+	swingdelay = 3
+	charging_slowdown = 0.8
 	icon_state = "insmash"
-	misscost = 5
+	misscost = 10
 	item_damage_type = "blunt"
 
 /datum/intent/mace/smash/wood

code/game/objects/items/rogueweapons/melee/polearms.dm

@@ -425,14 +425,15 @@
 	throwforce = 25
 	sellprice = 10
 
-/obj/item/rogueweapon/spear/bonespear
+/obj/item/rogueweapon/polearm/spear/bonespear
 	force = 18
 	force_wielded = 22
 	name = "bone spear"
-	desc = "A spear made of bones..."
-	icon_state = "bonespear"
-	pixel_y = -16
-	pixel_x = -16
+	desc = "A spear made of bones."
+	// icon_state = "bonespear"
+	icon_state = "stonespear_sk"
+	// pixel_y = -16
+	// pixel_x = -16
 	inhand_x_dimension = 64
 	inhand_y_dimension = 64
 	bigboy = TRUE

code/modules/jobs/job_types/roguetown/apprentices/squire.dm

@@ -50,7 +50,7 @@
 	category_tags = list(CTAG_SQUIRE)
 
 /datum/outfit/job/roguetown/squire/lancer/pre_equip(mob/living/carbon/human/H)
-	r_hand = /obj/item/rogueweapon/spear
+	r_hand = /obj/item/rogueweapon/polearm/spear
 	armor = /obj/item/clothing/suit/roguetown/armor/chainmail
 	gloves = /obj/item/clothing/gloves/roguetown/leather
 	wrists = /obj/item/clothing/wrists/roguetown/bracers/leather

code/modules/jobs/job_types/roguetown/garrison/veteran.dm

@@ -227,7 +227,7 @@
 			beltl = /obj/item/ammo_holder/quiver/bolts
 
 		if ("Spear + Shield")
-			r_hand = /obj/item/rogueweapon/spear
+			r_hand = /obj/item/rogueweapon/polearm/spear
 			backl = /obj/item/rogueweapon/shield/tower/metal
 
 /datum/advclass/veteran/merc

code/modules/mob/living/simple_animal/rogue/creacher/orcs.dm

@@ -72,7 +72,7 @@
 	icon_dead = "orcmarauder_spear"
 	base_intents = list(/datum/intent/simple/spear)
 	loot = list(/obj/effect/mob_spawn/human/orc/corpse/orcmarauder,
-			/obj/item/rogueweapon/spear,
+			/obj/item/rogueweapon/polearm/spear,
 			/obj/effect/decal/cleanable/blood)
 
 /mob/living/simple_animal/hostile/rogue/orc/orc_marauder/ravager
@@ -100,7 +100,7 @@
 	attack_verb_simple = "stab"
 	attack_sound = 'sound/blank.ogg'
 	loot = list(/obj/effect/mob_spawn/human/orc/corpse/savageorc,
-			/obj/item/rogueweapon/spear/bonespear,
+			/obj/item/rogueweapon/polearm/spear/bonespear,
 			/obj/effect/decal/cleanable/blood)
 	footstep_type = FOOTSTEP_MOB_BAREFOOT
 
@@ -109,7 +109,7 @@
 	icon_living = "savageorc_spear2"
 	icon_dead = "savageorc_spear2"
 	loot = list(/obj/effect/mob_spawn/human/orc/corpse/savageorc2,
-			/obj/item/rogueweapon/spear/bonespear,
+			/obj/item/rogueweapon/polearm/spear/bonespear,
 			/obj/effect/decal/cleanable/blood)
 
 /mob/living/simple_animal/hostile/rogue/orc/get_sound(input)

code/modules/mob/living/simple_animal/rogue/creacher/skeleton.dm

@@ -58,7 +58,7 @@
 	icon_living = "skeleton_spear"
 	icon_dead = ""
 	attack_sound = 'sound/foley/pierce.ogg'
-	loot = list(/obj/item/alch/bone,	/obj/item/alch/bone, /obj/item/alch/bone,	/obj/item/rogueweapon/spear, /obj/item/skull)
+	loot = list(/obj/item/alch/bone,	/obj/item/alch/bone, /obj/item/alch/bone,	/obj/item/rogueweapon/polearm/spear, /obj/item/skull)
 
 /mob/living/simple_animal/hostile/rogue/skeleton/guard
 	name = "Skeleton"

code/modules/roguetown/roguecrafting/items.dm

@@ -464,7 +464,7 @@
 	craftdiff = 0
 /datum/crafting_recipe/roguetown/bonespear
 	name = "bone spear"
-	result = /obj/item/rogueweapon/spear/bonespear
+	result = /obj/item/rogueweapon/polearm/spear/bonespear
 	reqs = list(/obj/item/rogueweapon/polearm/woodstaff = 1,
 				/obj/item/alch/bone = 2,
 				/obj/item/natural/fibers = 1)