gyatt

code/modules/mob/living/carbon/human/species.dm

@@ -1542,7 +1542,11 @@ GLOBAL_LIST_EMPTY(selectable_races)
 		add_hard = 1
 	if(user.zone_selected == BODY_ZONE_PRECISE_EYES || user.zone_selected == BODY_ZONE_PRECISE_MOUTH)
 		add_hard = 2
-	var/modifikator = secret_vampireroll(get_a_strength(user)+get_a_melee(user)+get_potence_dices(user), 6+add_hard, user)
+	var/modifikator
+	if(I.attack_diff_override > 0)
+		modifikator = secret_vampireroll(get_a_strength(user)+get_a_melee(user)+get_potence_dices(user), I.attack_diff_override, user)
+	else
+		modifikator = secret_vampireroll(get_a_strength(user)+get_a_melee(user)+get_potence_dices(user), 6+add_hard, user)
 	if(modifikator == -1)
 		H = user
 		modifikator = 3

code/modules/wod13/doorcode.dm

@@ -445,6 +445,23 @@
 		closed = TRUE
 
 /obj/structure/vampdoor/attackby(obj/item/W, mob/living/user, params)
+	if(istype(W, /obj/item/melee/vampirearms/sledgehammer))
+		playsound(get_turf(src), 'code/modules/wod13/sounds/get_bent.ogg', 100, FALSE)
+		var/difficulties = secret_vampireroll(get_a_strength(user)+get_a_melee(user), lockpick_difficulty, user)
+		if(difficulties == -1)
+			user.visible_message("<span class='warning'>[user] fails to break [src] with [W]!</span>", \
+						"<span class='userdanger'>You fail to break [src] with [W]!</span>")
+			user.AdjustKnockdown(60, TRUE)
+			return
+		else if(difficulties > 1)
+			var/obj/item/shield/door/D = new(get_turf(src))
+			D.icon_state = baseicon
+			var/atom/throw_target = get_edge_target_turf(src, user.dir)
+			D.throw_at(throw_target, rand(2, 4), 4, user)
+			qdel(src)
+		else
+			animate(src, pixel_x = 16*sin(get_angle_raw(user.x, user.y, 0, 0, x, y, 0, 0)), pixel_y = 16*cos(get_angle_raw(user.x, user.y, 0, 0, x, y, 0, 0)), time = 5, loop = 1)
+			animate(src, pixel_x = 0, pixel_y = 0)
 	if(istype(W, /obj/item/vamp/keys/hack))
 		if(locked)
 			hacking = TRUE

code/modules/wod13/food.dm

@@ -519,8 +519,11 @@
 		new /datum/data/mining_equipment("Colt M1911 magazine",		/obj/item/ammo_box/magazine/vamp45acp,	50),
 		new /datum/data/mining_equipment("knife",	/obj/item/melee/vampirearms/knife,	100),
 		new /datum/data/mining_equipment("baseball bat",	/obj/item/melee/vampirearms/baseball,	200),
-		new /datum/data/mining_equipment("real katana",	/obj/item/melee/vampirearms/katana,	1500),
+		new /datum/data/mining_equipment("real katana",	/obj/item/melee/vampirearms/katana,	2000),
 		new /datum/data/mining_equipment("machete", /obj/item/melee/vampirearms/machete, 500),
+		new /datum/data/mining_equipment("brass knuckles",	/obj/item/kastet,	250),
+		new /datum/data/mining_equipment("brass knuckles (spiked)",	/obj/item/kastet/spiked,	500),
+		new /datum/data/mining_equipment("sledgehammer",	/obj/item/melee/vampirearms/sledgehammer,	1500),
 		new /datum/data/mining_equipment("donut",	/obj/item/food/vampire/donut,	10)
 	)
 

code/modules/wod13/melee.dm

@@ -8,6 +8,47 @@
 
 /obj/item
 	var/masquerade_violating = FALSE
+	var/attack_diff_override = 0
+
+/obj/item/kastet
+	icon_state = "kastet"
+	name = "brass knuckles"
+	desc = "Lethaly efficient brawl weapon."
+	force = 20
+	attack_diff_override = 4
+	lefthand_file = 'code/modules/wod13/righthand.dmi'
+	righthand_file = 'code/modules/wod13/lefthand.dmi'
+	worn_icon = 'code/modules/wod13/worn.dmi'
+	onflooricon = 'code/modules/wod13/onfloor.dmi'
+	cost = 25
+
+/obj/item/kastet/spiked
+	icon_state = "kastet_s"
+	name = "brass knuckles"
+	force = 35
+	attack_diff_override = 5
+	sharpness = SHARP_EDGED
+
+/obj/item/melee/vampirearms/sledgehammer
+	icon_state = "sledgehammer"
+	name = "sledgehammer"
+	desc = "Truly, the weapon of a madman. Who would think to fight sledge with an hammer?"
+	force = 50
+	throwforce = 20
+	w_class = WEIGHT_CLASS_BULKY
+	attack_verb_continuous = list("attacks", "bumps", "squeashes", "tears", "hits", "bonks")
+	attack_verb_simple = list("attack", "bump", "squeash", "tear", "hit", "bonk")
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	sharpness = SHARP_EDGED
+	max_integrity = 200
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 30)
+	resistance_flags = FIRE_PROOF
+	wound_bonus = 25
+	bare_wound_bonus = 20
+	armour_penetration = 0
+	block_chance = 0
+	pixel_w = -8
+	masquerade_violating = FALSE
 
 /obj/item/melee/vampirearms/fireaxe
 	icon = 'code/modules/wod13/48x32weapons.dmi'
@@ -25,7 +66,7 @@
 	max_integrity = 200
 	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 30)
 	resistance_flags = FIRE_PROOF
-	wound_bonus = -15
+	wound_bonus = 25
 	bare_wound_bonus = 20
 	armour_penetration = 0
 	block_chance = 15