Merge remote-tracking branch 'citadel/master' into combat_rework_experimental

code/game/objects/items/tools/crowbar.dm

@@ -18,6 +18,9 @@
 	toolspeed = 1
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
 
+	wound_bonus = -10
+	bare_wound_bonus = 5
+
 /obj/item/crowbar/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)

code/game/objects/items/tools/screwdriver.dm

@@ -31,6 +31,9 @@
 		"yellow" = rgb(255, 165, 0)
 	)
 
+	wound_bonus = -10
+	bare_wound_bonus = 5
+
 /obj/item/screwdriver/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return(BRUTELOSS)

code/game/objects/items/tools/weldingtool.dm

@@ -33,6 +33,8 @@
 	heat = 3800
 	tool_behaviour = TOOL_WELDER
 	toolspeed = 1
+	wound_bonus = 0
+	bare_wound_bonus = 5
 
 /obj/item/weldingtool/Initialize()
 	. = ..()

code/game/objects/items/tools/wrench.dm

@@ -18,6 +18,9 @@
 	toolspeed = 1
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
 
+	wound_bonus = -10
+	bare_wound_bonus = 5
+
 /obj/item/wrench/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)