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

code/modules/clothing/head/hardhat.dm

@@ -115,8 +115,10 @@
 	toggle_helmet_light(user)
 
 /obj/item/clothing/head/hardhat/weldhat/AltClick(mob/user)
+	. = ..()
 	if(user.canUseTopic(src, BE_CLOSE))
 		toggle_welding_screen(user)
+		return TRUE
 
 /obj/item/clothing/head/hardhat/weldhat/proc/toggle_welding_screen(mob/living/user)
 	if(weldingvisortoggle(user))

code/modules/clothing/head/jobs.dm

@@ -104,16 +104,16 @@
 	. += "<span class='notice'>Alt-click to take a candy corn.</span>"
 
 /obj/item/clothing/head/fedora/det_hat/AltClick(mob/user)
-	if(user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
-		..()
-		if(loc == user)
-			if(candy_cooldown < world.time)
-				var/obj/item/reagent_containers/food/snacks/candy_corn/CC = new /obj/item/reagent_containers/food/snacks/candy_corn(src)
-				user.put_in_hands(CC)
-				to_chat(user, "You slip a candy corn from your hat.")
-				candy_cooldown = world.time+1200
-			else
-				to_chat(user, "You just took a candy corn! You should wait a couple minutes, lest you burn through your stash.")
+	. = ..()
+	if(loc == user && user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+		if(candy_cooldown < world.time)
+			var/obj/item/reagent_containers/food/snacks/candy_corn/CC = new /obj/item/reagent_containers/food/snacks/candy_corn(src)
+			user.put_in_hands(CC)
+			to_chat(user, "You slip a candy corn from your hat.")
+			candy_cooldown = world.time+1200
+		else
+			to_chat(user, "You just took a candy corn! You should wait a couple minutes, lest you burn through your stash.")
+		return TRUE
 
 
 //Mime

code/modules/clothing/head/misc.dm

@@ -370,13 +370,25 @@
 /obj/item/clothing/head/hotel
 	name = "Telegram cap"
 	desc = "A bright red cap warn by hotel staff. Or people who want to be a singing telegram"
-	icon_state = "telegramhat"
-	item_color = "telegramhat"
-	dog_fashion = null
+	icon_state = "telegram"
+	item_color = "telegram"
+	dog_fashion = /datum/dog_fashion/head/telegram
 
 /obj/item/clothing/head/colour
 	name = "Singer cap"
 	desc = "A light white hat that has bands of color. Just makes you want to sing and dance!"
 	icon_state = "colour"
 	item_color = "colour"
-	dog_fashion = /datum/dog_fashion/head/colour
+	dog_fashion = /datum/dog_fashion/head/colour
+
+/obj/item/clothing/head/christmashat
+	name = "red santa hat"
+	desc = "A red Christmas Hat! How festive!"
+	icon_state = "christmashat"
+	item_state = "christmashat"
+
+/obj/item/clothing/head/christmashatg
+	name = "green santa hat"
+	desc = "A green Christmas Hat! How festive!"
+	icon_state = "christmashatg"
+	item_state = "christmashatg"

code/modules/clothing/head/soft_caps.dm

@@ -22,11 +22,11 @@
 
 
 /obj/item/clothing/head/soft/AltClick(mob/user)
-	..()
+	. = ..()
 	if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
 		return
-	else
-		flip(user)
+	flip(user)
+	return TRUE
 
 
 /obj/item/clothing/head/soft/proc/flip(mob/user)