Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

code/modules/clothing/head/_head.dm

@@ -27,14 +27,19 @@
 			if("mam_snouts" in pref_species.default_features)
 				if(H.dna.features["mam_snouts"] != "None")
 					muzzle_var = ALT_STYLE
+				else
+					muzzle_var = NORMAL_STYLE
 
 			else if("snout" in pref_species.default_features)
 				if(H.dna.features["snout"] != "None")
 					muzzle_var = ALT_STYLE
+				else
+					muzzle_var = NORMAL_STYLE
 
 			else
 				muzzle_var = NORMAL_STYLE
-				H.update_inv_head()
+
+			H.update_inv_head()
 
 /obj/item/clothing/head/worn_overlays(isinhands = FALSE)
 	. = list()

code/modules/clothing/head/jobs.dm

@@ -26,7 +26,7 @@
 	icon_state = "captain"
 	item_state = "that"
 	flags_inv = 0
-	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	strip_delay = 60
 	dog_fashion = /datum/dog_fashion/head/captain
 
@@ -50,7 +50,7 @@
 	name = "head of personnel's cap"
 	icon_state = "hopcap"
 	desc = "The symbol of true bureaucratic micromanagement."
-	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	armor = list("melee" = 30, "bullet" = 25, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	dog_fashion = /datum/dog_fashion/head/hop
 
 /obj/item/clothing/head/hopcap/beret
@@ -200,4 +200,4 @@
 /obj/item/clothing/head/beret/qm
 	name = "quartermaster's beret"
 	desc = "This headwear shows off your Cargonian leadership"
-	icon_state = "qmberet"
+	icon_state = "qmberet"

code/modules/clothing/masks/_masks.dm

@@ -30,10 +30,15 @@
 			if("mam_snouts" in pref_species.default_features)
 				if(H.dna.features["mam_snouts"] != "None")
 					muzzle_var = ALT_STYLE
+				else
+					muzzle_var = NORMAL_STYLE
 
 			else if("snout" in pref_species.default_features)
 				if(H.dna.features["snout"] != "None")
 					muzzle_var = ALT_STYLE
+				else
+					muzzle_var = NORMAL_STYLE
+
 			else
 				muzzle_var = NORMAL_STYLE
 

code/modules/clothing/neck/_neck.dm

@@ -171,17 +171,57 @@
 	icon_state = "stripedbluescarf"
 	item_color = "stripedbluescarf"
 
-/obj/item/clothing/neck/petcollar //don't really wear this though please c'mon seriously guys
+///////////
+//COLLARS//
+///////////
+
+/obj/item/clothing/neck/petcollar
 	name = "pet collar"
 	desc = "It's for pets. Though you probably could wear it yourself, you'd doubtless be the subject of ridicule."
 	icon_state = "petcollar"
 	item_color = "petcollar"
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/collar
 	var/tagname = null
 
 /obj/item/clothing/neck/petcollar/attack_self(mob/user)
 	tagname = copytext(sanitize(input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot") as null|text),1,MAX_NAME_LEN)
 	name = "[initial(name)] - [tagname]"
 
+/obj/item/clothing/neck/petcollar/locked
+	name = "locked collar"
+	desc = "A collar that has a small lock on it to keep it from being removed."
+	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
+	return
+
+/obj/item/clothing/neck/petcollar/locked/attack_hand(mob/user)
+	if(loc == user && user.get_item_by_slot(SLOT_NECK) && lock != FALSE)
+		to_chat(user, "<span class='warning'>The collar is locked! You'll need unlock the collar before you can take it off!</span>")
+		return
+	..()
+
+/obj/item/key/collar
+	name = "Collar Key"
+	desc = "A key for a tiny lock on a collar or bag."
+
+/obj/item/clothing/neck/petcollar/Initialize()
+	. = ..()
+	new /obj/item/reagent_containers/food/snacks/cookie(src)
+
+/obj/item/clothing/neck/petcollar/locked/Initialize()
+	. = ..()
+	new /obj/item/key/collar(src)
+
 //////////////
 //DOPE BLING//
 //////////////
@@ -191,4 +231,4 @@
 	desc = "Damn, it feels good to be a gangster."
 	icon = 'icons/obj/clothing/neck.dmi'
 	icon_state = "bling"
-	item_color = "bling"
+	item_color = "bling"