fixing merge conflicts

2020-02-15 15:41:52 +08:00
parent b2d2b00238 d3926d73ac
commit 2d9c8ce8fc
636 changed files with 11747 additions and 9426 deletions
@@ -5,6 +5,7 @@
 	force = 3
 	throwforce = 3
 	icon = 'icons/mob/human_parts.dmi'
+	w_class = WEIGHT_CLASS_SMALL
 	icon_state = ""
 	layer = BELOW_MOB_LAYER //so it isn't hidden behind objects when on the floor
 	var/mob/living/carbon/owner = null