Merge branch 'master' into xantholne-christmas01

code/modules/clothing/head/collectable.dm

@@ -27,7 +27,6 @@
 	icon_state = "chef"
 	item_state = "chef"
 	dynamic_hair_suffix = ""
-
 	dog_fashion = /datum/dog_fashion/head/chef
 
 /obj/item/clothing/head/collectable/paper

code/modules/clothing/head/misc.dm

@@ -113,10 +113,8 @@
 	desc = "Wearing these makes you look useless, and only good for your sex appeal."
 	icon_state = "bunny"
 	dynamic_hair_suffix = ""
-
 	dog_fashion = /datum/dog_fashion/head/rabbit
 
-
 /obj/item/clothing/head/flatcap
 	name = "flat cap"
 	desc = "A working man's cap."
@@ -205,7 +203,6 @@
 	item_state = "sombrero"
 	desc = "You can practically taste the fiesta."
 	flags_inv = HIDEHAIR
-
 	dog_fashion = /datum/dog_fashion/head/sombrero
 
 /obj/item/clothing/head/sombrero/green
@@ -370,6 +367,19 @@
 	desc = "A cheap replica of old riot helmet without visor. It has \"D.A.B.\" written on the front."
 	flags_inv = HIDEHAIR
 
+/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
+
+/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
 /obj/item/clothing/head/christmashat
 	name = "red santa hat"
 	desc = "A red Christmas Hat! How festive!"

code/modules/clothing/head/misc_special.dm

@@ -254,8 +254,8 @@
 		return
 	if(paranoia)
 		QDEL_NULL(paranoia)
-	paranoia = new()
-	user.gain_trauma(paranoia, TRAUMA_RESILIENCE_MAGIC, "conspiracies")
+	paranoia = new("conspiracies")
+	user.gain_trauma(paranoia, TRAUMA_RESILIENCE_MAGIC)
 	to_chat(user, "<span class='warning'>As you don the foiled hat, an entire world of conspiracy theories and seemingly insane ideas suddenly rush into your mind. What you once thought unbelievable suddenly seems.. undeniable. Everything is connected and nothing happens just by accident. You know too much and now they're out to get you. </span>")
 
 /obj/item/clothing/head/foilhat/MouseDrop(atom/over_object)

code/modules/clothing/head/soft_caps.dm

@@ -139,4 +139,4 @@
 	flags_inv = HIDEEYES|HIDEFACE
 	armor = list("melee" = 35, "bullet" = 35, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 90)
 	strip_delay = 90 //You dont take a Major Leage cap
-	dog_fashion = null
+	dog_fashion = null