Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11

code/modules/clothing/neck/_neck.dm

@@ -193,15 +193,14 @@
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/collar/locked
 	var/lock = FALSE
 
-/obj/item/clothing/neck/petcollar/locked/attackby(obj/item/key/collar, mob/user, params)
-	if(lock != FALSE)
-		to_chat(user, "<span class='warning'>With a click the collar unlocks!</span>")
-		lock = FALSE
-		item_flags = NONE
-	else
-		to_chat(user, "<span class='warning'>With a click the collar locks!</span>")
-		lock = TRUE
-		item_flags = NODROP
+/obj/item/clothing/neck/petcollar/locked/attackby(obj/item/K, mob/user, params)
+	if(istype(K, /obj/item/key/collar))
+		if(lock != FALSE)
+			to_chat(user, "<span class='warning'>With a click the collar unlocks!</span>")
+			lock = FALSE
+		else
+			to_chat(user, "<span class='warning'>With a click the collar locks!</span>")
+			lock = TRUE
 	return
 
 /obj/item/clothing/neck/petcollar/locked/attack_hand(mob/user)

code/modules/clothing/spacesuits/hardsuit.dm

@@ -443,7 +443,6 @@
 	icon_state = "hardsuit0-medical"
 	item_state = "medical_helm"
 	item_color = "medical"
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
 	flash_protect = 0
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75)
 	scan_reagents = 1