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

2020-09-19 15:56:13 -07:00
parent e7220e842e b29143ea03
commit 1ea0dd9f76
1781 changed files with 68073 additions and 31311 deletions
@@ -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)