Merge branch 'master' into economy-update-junk

hyperstation/code/modules/clothing/suits/misc.dm

@@ -21,4 +21,43 @@
 	name = "\improper Hellraider's Vest"
 	desc = "An open leather vest with battlescarred metal shoulderpads, discovered in a dimensional anomaly. Smells of gunpowder and plasma."
 	icon_state = "guncaster_alt"
-	item_state = "guncaster_alt"
+	item_state = "guncaster_alt"
+
+/*
+ * Posshim's Corpus atire
+ */
+ //Making this a subset of wintercoats/winterhoods since poss intends it to have wintercoat stats --Archie
+ 
+/obj/item/clothing/suit/hooded/wintercoat/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/winterhood/corpus
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT //"Hide shoes" but digi shoes dont get hidden, too bad!
+	mutantrace_variation = NO_MUTANTRACE_VARIATION //There is no need for a digi variant, it's a costume
+
+/obj/item/clothing/suit/hooded/wintercoat/corpus/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/winterhood/corpus/sec //Enjoy this nice red outfit Kinaris! There is NO NEED for a pink one! xoxo -VivI Fanteriso
+
+/obj/item/clothing/suit/hooded/wintercoat/corpus/command
+	name = "Commander Voidsuit"
+	desc = "Premium issue correctional worker attire. Grease the gears of production."
+	icon_state = "corpusc"
+	hoodtype = /obj/item/clothing/head/hooded/winterhood/corpus/command
+
+/obj/item/clothing/head/hooded/winterhood/corpus
+	name = "Voidsuit helmet"
+	desc = "galvanized reinforced helm to protect against the elements"
+	icon_state = "corpus"
+	flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK|HIDESNOUT|HIDENECK //hide your ugly face with this one simple trick!
+
+/obj/item/clothing/head/hooded/winterhood/corpus/sec
+	icon_state = "corpuss"
+
+/obj/item/clothing/head/hooded/winterhood/corpus/command
+	icon_state = "corpusc"

hyperstation/code/modules/hydroponics/grown/kalyna.dm

@@ -25,7 +25,7 @@
 	icon = 'hyperstation/icons/obj/hydroponics/harvest.dmi'
 	icon_state = "kalynaberries"
 	gender = PLURAL
-	filling_color = "#FF0000"
+	filling_color = COLOR_RED
 	bitesize_mod = 2
 	foodtype = FRUIT
 	juice_results = list(/datum/reagent/consumable/kalynajuice = 1)

hyperstation/code/modules/power/reactor/rbmk.dm

@@ -436,9 +436,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
 		if(!alert) //Congrats! You stopped the meltdown / blowout.
 			stop_relay(CHANNEL_REACTOR_ALERT)
 			warning = FALSE
-			set_light(0)
-			light_color = LIGHT_COLOR_CYAN
-			set_light(10)
+			set_light(l_range=10, l_color=LIGHT_COLOR_CYAN)
 	else
 		if(!alert)
 			return
@@ -447,9 +445,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
 		next_warning = world.time + 30 SECONDS //To avoid engis pissing people off when reaaaally trying to stop the meltdown or whatever.
 		warning = TRUE //Start warning the crew of the imminent danger.
 		relay('hyperstation/sound/effects/rbmk/alarm.ogg', null, loop=TRUE, channel = CHANNEL_REACTOR_ALERT)
-		set_light(0)
-		light_color = LIGHT_COLOR_RED
-		set_light(10)
+		set_light(l_range=10, l_color=COLOR_SOFT_RED)
 
 //Failure condition 1: Meltdown. Achieved by having heat go over tolerances. This is less devastating because it's easier to achieve.
 //Results: Engineering becomes unusable and your engine irreparable

hyperstation/code/obj/economy.dm

@@ -15,6 +15,10 @@
 	resistance_flags = FIRE_PROOF
 	var/obj/item/card/held_card
 	var/user = ""
+	light_power = 0
+	light_range = 7
+	light_color = COLOR_VIVID_RED
+
 	var/pin = 0
 
 /obj/machinery/atm/ui_interact(mob/user)

hyperstation/code/obj/rewards.dm

@@ -168,7 +168,7 @@
 	icon_state = null
 	item_state = null
 	w_class = WEIGHT_CLASS_NORMAL
-	light_color = "#FFCC66"
+	light_color = COLOR_CREAMY_ORANGE
 	icon_off = "pipe"
 	icon_on = "pipe_lit"