Merge branch 'master' into wounds-part-2

code/modules/clothing/shoes/_shoes.dm

@@ -268,13 +268,13 @@
 			our_alert = our_guy.throw_alert("shoealert", /obj/screen/alert/shoes/untied)
 
 
-/obj/item/clothing/shoes/attack_hand(mob/living/carbon/human/user)
+/obj/item/clothing/shoes/on_attack_hand(mob/living/user, act_intent, unarmed_attack_flags)
 	if(!istype(user))
 		return ..()
 	if(loc == user && tied != SHOES_TIED && (user.mobility_flags & MOBILITY_USE))
 		handle_tying(user)
 		return
-	..()
+	return ..()
 
 /obj/item/clothing/shoes/attack_self(mob/user)
 	. = ..()

code/modules/clothing/under/syndicate.dm

@@ -73,6 +73,9 @@
 	item_state = "g_suit"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/syndicate/camo/cosmetic
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
 /obj/item/clothing/under/syndicate/soviet
 	name = "Ratnik 5 tracksuit"
 	desc = "Badly translated labels tell you to clean this in Vodka. Great for squatting in."