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
  */

code/modules/clothing/spacesuits/hardsuit.dm

@@ -939,9 +939,8 @@
 	var/energy_color = "#35FFF0"
 
 /obj/item/clothing/suit/space/hardsuit/lavaknight/Initialize()
-	..()
-	light_color = energy_color
-	set_light(1)
+	. = ..()
+	set_light(l_range=1, l_color = energy_color)
 	update_icon()
 
 /obj/item/clothing/suit/space/hardsuit/lavaknight/update_icon()

code/modules/clothing/spacesuits/plasmamen.dm

@@ -48,7 +48,7 @@
 	var/brightness_on = 4 //luminosity when the light is on
 	var/on = FALSE
 	var/smile = FALSE
-	var/smile_color = "#FF0000"
+	var/smile_color = COLOR_RED
 	var/visor_icon = "envisor"
 	var/smile_state = "envirohelm_smile"
 	actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen/plasmaman)

code/modules/clothing/suits/miscellaneous.dm

@@ -28,46 +28,6 @@
 	allowed = list (/obj/item/gun/energy/laser/redtag)
 	resistance_flags = NONE
 
-/*
- * Posshim's Corpus atire
- */
-/obj/item/clothing/suit/hooded/corpus/
-	name = "Standard Voidsuit"
-	desc = "Standard issue voidsuit in the name of Grofit!"
-	icon_state = "corpus"
-	item_state = "armor"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS|FEET|HANDS
-	hoodtype = /obj/item/clothing/head/hooded/corpus
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT //"Hide shoes" but digi shoes dont get hidden, too bad!
-	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
-	mutantrace_variation = NO_MUTANTRACE_VARIATION //There is no need for a digi variant, it's a costume
-
-/obj/item/clothing/suit/hooded/corpus/s //sec
-	name = "Enforcer Voidsuit"
-	desc = "Delux issue grofit voidsuit. Let the middle class know You're in charge."
-	icon_state = "corpuss"
-	hoodtype = /obj/item/clothing/head/hooded/corpus/s //Enjoy this nice red outfit Kinaris! There is NO NEED for a pink one! xoxo -VivI Fanteriso
-
-/obj/item/clothing/suit/hooded/corpus/c //command
-	name = "Commander Voidsuit"
-	desc = "Premium issue correctional worker attire. Grease the gears of production."
-	icon_state = "corpusc"
-	hoodtype = /obj/item/clothing/head/hooded/corpus/c
-
-/obj/item/clothing/head/hooded/corpus
-	name = "Voidsuit helmet"
-	desc = "galvanized reinforced helm to protect against the elements"
-	icon_state = "corpus"
-	body_parts_covered = HEAD
-	flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK|HIDESNOUT|HIDENECK //hide your ugly face with this one simple trick!
-	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
-
-/obj/item/clothing/head/hooded/corpus/s //sec
-	icon_state = "corpuss"
-
-/obj/item/clothing/head/hooded/corpus/c //command
-	icon_state = "corpusc"
-
 /*
  * Costume
  */