Merge branch 'master' into economy-update-junk

code/modules/clothing/head/hardhat.dm

@@ -3,16 +3,16 @@
 	desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
 	icon_state = "hardhat0_yellow"
 	item_state = "hardhat0_yellow"
-	var/brightness_on = 4 //luminosity when on
-	light_color = "#FFCC66"
-	var/power_on = 0.8
-	var/on = FALSE
+	light_color = COLOR_CREAMY_ORANGE
 	item_color = "yellow" //Determines used sprites: hardhat[on]_[item_color] and hardhat[on]_[item_color]2 (lying down sprite)
 	armor = list("melee" = 15, "bullet" = 5, "laser" = 20,"energy" = 10, "bomb" = 20, "bio" = 10, "rad" = 20, "fire" = 100, "acid" = 50)
 	flags_inv = 0
 	actions_types = list(/datum/action/item_action/toggle_helmet_light)
 	resistance_flags = FIRE_PROOF
 	dynamic_hair_suffix = "+generic"
+	light_on = FALSE
+	var/brightness_on = 4 //luminosity when on
+	var/power_on = 0.8
 
 	dog_fashion = /datum/dog_fashion/head
 
@@ -20,16 +20,16 @@
 	toggle_helmet_light(user)
 
 /obj/item/clothing/head/hardhat/proc/toggle_helmet_light(mob/living/user)
-	on = !on
-	if(on)
+	set_light_on(!light_on)
+	if(light_on)
 		turn_on(user)
 	else
 		turn_off(user)
 	update_icon()
 
 /obj/item/clothing/head/hardhat/update_icon()
-	icon_state = "hardhat[on]_[item_color]"
-	item_state = "hardhat[on]_[item_color]"
+	icon_state = "hardhat[light_on]_[item_color]"
+	item_state = "hardhat[light_on]_[item_color]"
 	if(ishuman(loc))
 		var/mob/living/carbon/human/H = loc
 		H.update_inv_head()

code/modules/clothing/head/misc_special.dm

@@ -77,7 +77,7 @@
 	STOP_PROCESSING(SSobj, src)
 
 /obj/item/clothing/head/hardhat/cakehat/is_hot()
-	return on * heat
+	return light_on * heat
 /*
  * Ushanka
  */