Encryption keys now use a single icon file.

code/__defines/colors.dm

@@ -39,6 +39,7 @@
 #define COLOR_GREEN_GRAY       "#8daf6a"
 #define COLOR_DARK_GREEN_GRAY  "#54654c"
 #define COLOR_BLUE_GRAY        "#6a97b0"
+#define COLOR_MID_BLUE_GRAY    "#666699"
 #define COLOR_DARK_BLUE_GRAY   "#3e4855"
 #define COLOR_SURGERY_BLUE     "#e0f2f6"
 #define COLOR_SUN              "#ec8b2f"
@@ -92,6 +93,12 @@
 #define COLOR_CRYSTAL          "#00c8a5"
 #define COLOR_ASTEROID_ROCK    "#735555"
 #define COLOR_DIAMOND          "#d8d4ea"
+#define COLOR_BLOOD_RED        "#990000"
+#define COLOR_PALE_GOLD        "#cc9900"
+#define COLOR_ROYAL_BLUE       "#0033ff"
+#define COLOR_VERDANT_GREEN    "#287d00"
+#define COLOR_SCIENCE_PURPLE   "#6633cc"
+
 
 #define PIPE_COLOR_GREY        "#808080"
 #define PIPE_COLOR_RED         "#ff0000"

code/game/machinery/turret_control.dm

@@ -202,7 +202,7 @@
 	else if (enabled)
 		if (lethal)
 			icon_state = "control_kill"
-			set_light(1.5, 1,"#990000")
+			set_light(1.5, 1,COLOR_BLOOD_RED)
 		else
 			icon_state = "control_stun"
 			set_light(1.5, 1,"#ff9900")

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -2,15 +2,40 @@
 	name = "standard encryption key"
 	desc = "An encryption key for a radio headset. Contains cypherkeys."
 	icon = 'icons/obj/items/device/radio/key.dmi'
-	icon_state = "cypherkey"
-	item_state = ""
+	icon_state = ICON_STATE_WORLD
 	w_class = ITEM_SIZE_TINY
 	slot_flags = SLOT_EARS
 	material = /decl/material/solid/metal/steel
 	matter = list(/decl/material/solid/fiberglass = MATTER_AMOUNT_REINFORCEMENT)
+	color             = COLOR_GRAY80
+	var/contact_color = COLOR_PALE_GOLD
+	var/fill_color    = COLOR_MID_BLUE_GRAY
+	var/inlay_color   = COLOR_RED
 	var/translate_binary
 	var/list/can_decrypt
 
+/obj/item/encryptionkey/Initialize()
+	. = ..()
+	update_icon()
+
+/obj/item/encryptionkey/on_update_icon()
+	. = ..()
+	if(contact_color)
+		var/image/I = image(icon, "[icon_state]_contact")
+		I.color = contact_color
+		I.appearance_flags |= RESET_COLOR
+		add_overlay(I)
+	if(fill_color)
+		var/image/I = image(icon, "[icon_state]_fill")
+		I.color = fill_color
+		I.appearance_flags |= RESET_COLOR
+		add_overlay(I)
+	if(inlay_color)
+		var/image/I = image(icon, "[icon_state]_inlay")
+		I.color = inlay_color
+		I.appearance_flags |= RESET_COLOR
+		add_overlay(I)
+
 /obj/item/encryptionkey/attack_self(mob/user)
 	if(alert(user, "Do you wish to factory reset this encryption key? This will remove ALL channel access and cannot be undone.", "Factory Reset", "No", "Yes") == "Yes" && !user.incapacitated() && user.get_held_slot_for_item(src))
 		can_decrypt = null
@@ -33,6 +58,5 @@
 	. = ..()
 
 /obj/item/encryptionkey/binary
-	icon_state = "cypherkey"
 	translate_binary = TRUE
 	origin_tech = @'{"esoteric":3}'

code/game/objects/items/devices/radio/headsets_shared.dm

@@ -5,7 +5,7 @@
 
 /obj/item/encryptionkey/cargo
 	name = "supply radio encryption key"
-	icon_state = "med_cypherkey"
+	inlay_color = COLOR_ASSEMBLY_WHITE
 	can_decrypt = list(access_cargo)
 
 /obj/item/radio/headset/headset_mining
@@ -16,7 +16,7 @@
 
 /obj/item/encryptionkey/mining
 	name = "mining radio encryption key"
-	icon_state = "med_cypherkey"
+	inlay_color = COLOR_ASSEMBLY_WHITE
 	can_decrypt = list(access_mining)
 /obj/item/radio/headset/headset_sec
 	name = "security radio headset"
@@ -25,7 +25,7 @@
 
 /obj/item/encryptionkey/sec
 	name = "security radio encryption key"
-	icon_state = "sec_cypherkey"
+	inlay_color = COLOR_BLOOD_RED
 	can_decrypt = list(access_security)
 
 /obj/item/radio/headset/headset_med
@@ -36,7 +36,7 @@
 
 /obj/item/encryptionkey/med
 	name = "medical radio encryption key"
-	icon_state = "med_cypherkey"
+	inlay_color = COLOR_ASSEMBLY_WHITE
 	can_decrypt = list(access_medical)
 
 /obj/item/radio/headset/headset_service
@@ -47,7 +47,7 @@
 
 /obj/item/encryptionkey/service
 	name = "service radio encryption key"
-	icon_state = "srv_cypherkey"
+	inlay_color = COLOR_VERDANT_GREEN
 	can_decrypt = list(access_bar)
 
 /obj/item/radio/headset/headset_sci
@@ -58,7 +58,7 @@
 
 /obj/item/encryptionkey/sci
 	name = "science radio encryption key"
-	icon_state = "sci_cypherkey"
+	inlay_color = COLOR_SCIENCE_PURPLE
 	can_decrypt = list(access_research)
 
 /obj/item/radio/headset/headset_eng
@@ -69,7 +69,7 @@
 
 /obj/item/encryptionkey/eng
 	name = "engineering radio encryption key"
-	icon_state = "eng_cypherkey"
+	inlay_color = PIPE_COLOR_YELLOW
 	can_decrypt = list(access_engine)
 
 /obj/item/radio/headset/heads
@@ -79,9 +79,14 @@
 
 /obj/item/encryptionkey/command
 	name = "command encryption key"
-	icon_state = "com_cypherkey"
+	inlay_color = COLOR_ROYAL_BLUE
 	can_decrypt = list(access_bridge)
 
+/obj/item/encryptionkey/heads
+	color = COLOR_GOLD
+	fill_color = COLOR_PALE_GOLD
+	inlay_color = COLOR_ROYAL_BLUE
+
 /obj/item/radio/headset/heads/ce
 	name = "chief engineer's headset"
 	desc = "The headset of the boss engineer."
@@ -90,7 +95,6 @@
 
 /obj/item/encryptionkey/heads/ce
 	name = "chief engineer's encryption key"
-	icon_state = "cap_cypherkey"
 	can_decrypt = list(
 		access_bridge,
 		access_engine
@@ -104,7 +108,6 @@
 
 /obj/item/encryptionkey/heads/cmo
 	name = "chief medical officer's encryption key"
-	icon_state = "cap_cypherkey"
 	can_decrypt = list(
 		access_bridge,
 		access_medical
@@ -118,7 +121,6 @@
 
 /obj/item/encryptionkey/heads/rd
 	name = "research director's encryption key"
-	icon_state = "cap_cypherkey"
 	can_decrypt = list(
 		access_bridge,
 		access_research
@@ -131,7 +133,6 @@
 
 /obj/item/encryptionkey/heads/captain
 	name = "captain's encryption key"
-	icon_state = "cap_cypherkey"
 	can_decrypt = list(
 		access_bridge,
 		access_security,
@@ -149,7 +150,6 @@
 
 /obj/item/encryptionkey/heads/hop
 	name = "head of personnel's encryption key"
-	icon_state = "hop_cypherkey"
 	can_decrypt = list(
 		access_bar,
 		access_cargo,
@@ -165,8 +165,8 @@
 	encryption_keys = list(/obj/item/encryptionkey/heads/hos)
 
 /obj/item/encryptionkey/heads/hos
-	name = "head of personnel's encryption key"
-	icon_state = "hos_cypherkey"
+	name = "head of security's encryption key"
+	inlay_color = COLOR_BLOOD_RED
 	can_decrypt = list(
 		access_bridge,
 		access_security
@@ -183,7 +183,6 @@
 	encryption_keys = list(/obj/item/encryptionkey/ert)
 
 /obj/item/encryptionkey/mercenary
-	icon_state = "cypherkey"
 	origin_tech = @'{"esoteric":2}'
 	can_decrypt = list(access_mercenary)
 
@@ -203,7 +202,6 @@
 	encryption_keys = list(/obj/item/encryptionkey/entertainment)
 
 /obj/item/encryptionkey/raider
-	icon_state = "cypherkey"
 	origin_tech = @'{"esoteric":2}'
 	can_decrypt = list(access_raider)
 

code/game/objects/items/devices/spy_bug.dm

@@ -154,4 +154,5 @@
 	broadcasting = 0
 	canhear_range = 1
 	name = "spy device"
-	icon_state = "syn_cypherkey"
+	icon = 'icons/obj/items/device/radio/spybug.dmi'
+	icon_state = ICON_STATE_WORLD

code/modules/mob/living/silicon/ai/ai_radio.dm

@@ -12,7 +12,9 @@
 /obj/item/encryptionkey/heads/ai_integrated
 	name = "ai integrated encryption key"
 	desc = "Integrated encryption key."
-	icon_state = "cap_cypherkey"
+	color = COLOR_GOLD
+	fill_color = COLOR_PALE_GOLD
+	inlay_color = COLOR_ROYAL_BLUE
 	can_decrypt = list(
 		access_bridge,
 		access_security,

maps/ministation/jobs/security.dm

@@ -6,7 +6,7 @@
 	total_positions = 2
 	outfit_type = /decl/hierarchy/outfit/job/ministation/security
 	department_types = list(/decl/department/security)
-	selection_color = "#990000"
+	selection_color = COLOR_BLOOD_RED
 	economic_power = 7
 	minimal_player_age = 7
 	access = list(

mods/content/corporate/datum/antagonists/commando.dm

@@ -29,7 +29,6 @@
 	)
 
 /obj/item/encryptionkey/hacked
-	icon_state = "cypherkey"
 	can_decrypt = list(access_hacked)
 	origin_tech = @'{"esoteric":3}'