diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index 3dd62f58ef5..aa20bcace6e 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -10602,9 +10602,9 @@ /obj/item/radio/headset/interdyne/command, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate/winter, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate/winter, -/obj/item/encryptionkey/headset_interdyne, -/obj/item/encryptionkey/headset_interdyne, -/obj/item/encryptionkey/headset_interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, /turf/open/floor/iron/dark/smooth_large, /area/ruin/space/has_grav/skyrat/interdynefob/bridge/admiral) "Kz" = ( diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm index 3b6c3dc52a3..fddeec07cbc 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm @@ -5674,11 +5674,11 @@ "FR" = ( /obj/structure/table, /obj/effect/turf_decal/tile/blue/half, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/comms) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm index 6e5bed0075a..7ca547a20a0 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm @@ -5540,11 +5540,11 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/effect/turf_decal/tile/blue/half, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/comms) "FS" = ( diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm index 1c56ff14f8b..1f167959701 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm @@ -4833,11 +4833,11 @@ "FR" = ( /obj/structure/table, /obj/effect/turf_decal/tile/blue/half, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/comms) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm index dd1dd76df73..e26ec341f38 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm @@ -5271,11 +5271,11 @@ "FR" = ( /obj/structure/table, /obj/effect/turf_decal/tile/blue/half, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, -/obj/item/encryptionkey/headset_tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, +/obj/item/encryptionkey/headset_cargo/tarkon, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/comms) diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index d9a37483236..526365e52f8 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -822,3 +822,55 @@ name = "Worn Fancy Coat" icon_file = 'icons/mob/clothing/suits/jacket.dmi' json_config = 'code/datums/greyscale/json_configs/fancy_coat_worn.json' + +/datum/greyscale_config/encryptionkey_basic + name = "Basic Encryptionkey" + icon_file = 'icons/obj/radio.dmi' + json_config = 'code/datums/greyscale/json_configs/encryptionkey_basic.json' + +/datum/greyscale_config/encryptionkey_cube + name = "Block Encryptionkey" + icon_file = 'icons/obj/radio.dmi' + json_config = 'code/datums/greyscale/json_configs/encryptionkey_cube.json' + + +/datum/greyscale_config/encryptionkey_research + name = "Research Encryptionkey" + icon_file = 'icons/obj/radio.dmi' + json_config = 'code/datums/greyscale/json_configs/encryptionkey_research.json' + +/datum/greyscale_config/encryptionkey_syndicate + name = "Syndicate Encryptionkey" + icon_file = 'icons/obj/radio.dmi' + json_config = 'code/datums/greyscale/json_configs/encryptionkey_syndicate.json' + +/datum/greyscale_config/encryptionkey_medical + name = "Medical Encryptionkey" + icon_file = 'icons/obj/radio.dmi' + json_config = 'code/datums/greyscale/json_configs/encryptionkey_medical.json' + +/datum/greyscale_config/encryptionkey_service + name = "Service Encryptionkey" + icon_file = 'icons/obj/radio.dmi' + json_config = 'code/datums/greyscale/json_configs/encryptionkey_service.json' + +/datum/greyscale_config/encryptionkey_engineering + name = "Engineering Encryptionkey" + icon_file = 'icons/obj/radio.dmi' + json_config = 'code/datums/greyscale/json_configs/encryptionkey_engineering.json' + +/datum/greyscale_config/encryptionkey_centcom + name = "Centcom Encryptionkey" + icon_file = 'icons/obj/radio.dmi' + json_config = 'code/datums/greyscale/json_configs/encryptionkey_centcom.json' + +/datum/greyscale_config/encryptionkey_cargo + name = "Cargo Encryptionkey" + icon_file = 'icons/obj/radio.dmi' + json_config = 'code/datums/greyscale/json_configs/encryptionkey_cargo.json' + +/datum/greyscale_config/encryptionkey_security + name = "Security Encryptionkey" + icon_file = 'icons/obj/radio.dmi' + json_config = 'code/datums/greyscale/json_configs/encryptionkey_security.json' + diff --git a/code/datums/greyscale/json_configs/encryptionkey_basic.json b/code/datums/greyscale/json_configs/encryptionkey_basic.json new file mode 100644 index 00000000000..addefeea013 --- /dev/null +++ b/code/datums/greyscale/json_configs/encryptionkey_basic.json @@ -0,0 +1,21 @@ +{ + "cypherkey_basic": [ + { + "type": "icon_state", + "icon_state": "cypher_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_stripe", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_wiring", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/encryptionkey_cargo.json b/code/datums/greyscale/json_configs/encryptionkey_cargo.json new file mode 100644 index 00000000000..225ac9e02cc --- /dev/null +++ b/code/datums/greyscale/json_configs/encryptionkey_cargo.json @@ -0,0 +1,21 @@ +{ + "cypherkey_cargo": [ + { + "type": "icon_state", + "icon_state": "cypher_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_cargo", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_wiring", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/encryptionkey_centcom.json b/code/datums/greyscale/json_configs/encryptionkey_centcom.json new file mode 100644 index 00000000000..3683dd00183 --- /dev/null +++ b/code/datums/greyscale/json_configs/encryptionkey_centcom.json @@ -0,0 +1,21 @@ +{ + "cypherkey_centcom": [ + { + "type": "icon_state", + "icon_state": "cypher_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_cent", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_wiring", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/encryptionkey_cube.json b/code/datums/greyscale/json_configs/encryptionkey_cube.json new file mode 100644 index 00000000000..9eb63502b45 --- /dev/null +++ b/code/datums/greyscale/json_configs/encryptionkey_cube.json @@ -0,0 +1,21 @@ +{ + "cypherkey_cube": [ + { + "type": "icon_state", + "icon_state": "cypher_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_block", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_wiring", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/encryptionkey_engineering.json b/code/datums/greyscale/json_configs/encryptionkey_engineering.json new file mode 100644 index 00000000000..31160b2d18c --- /dev/null +++ b/code/datums/greyscale/json_configs/encryptionkey_engineering.json @@ -0,0 +1,21 @@ +{ + "cypherkey_engineering": [ + { + "type": "icon_state", + "icon_state": "cypher_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_engi", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_wiring", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/encryptionkey_medical.json b/code/datums/greyscale/json_configs/encryptionkey_medical.json new file mode 100644 index 00000000000..b2ef5ef818a --- /dev/null +++ b/code/datums/greyscale/json_configs/encryptionkey_medical.json @@ -0,0 +1,21 @@ +{ + "cypherkey_medical": [ + { + "type": "icon_state", + "icon_state": "cypher_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_med", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_wiring", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/encryptionkey_research.json b/code/datums/greyscale/json_configs/encryptionkey_research.json new file mode 100644 index 00000000000..f5cc11f5c1d --- /dev/null +++ b/code/datums/greyscale/json_configs/encryptionkey_research.json @@ -0,0 +1,21 @@ +{ + "cypherkey_research": [ + { + "type": "icon_state", + "icon_state": "cypher_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_res", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_wiring", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/encryptionkey_security.json b/code/datums/greyscale/json_configs/encryptionkey_security.json new file mode 100644 index 00000000000..d10d7cb4083 --- /dev/null +++ b/code/datums/greyscale/json_configs/encryptionkey_security.json @@ -0,0 +1,21 @@ +{ + "cypherkey_security": [ + { + "type": "icon_state", + "icon_state": "cypher_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_sec", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_wiring", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/encryptionkey_service.json b/code/datums/greyscale/json_configs/encryptionkey_service.json new file mode 100644 index 00000000000..7927e7ce4c0 --- /dev/null +++ b/code/datums/greyscale/json_configs/encryptionkey_service.json @@ -0,0 +1,21 @@ +{ + "cypherkey_service": [ + { + "type": "icon_state", + "icon_state": "cypher_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_serv", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_wiring", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/encryptionkey_syndicate.json b/code/datums/greyscale/json_configs/encryptionkey_syndicate.json new file mode 100644 index 00000000000..a30ba6763f1 --- /dev/null +++ b/code/datums/greyscale/json_configs/encryptionkey_syndicate.json @@ -0,0 +1,21 @@ +{ + "cypherkey_syndicate": [ + { + "type": "icon_state", + "icon_state": "cypher_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_syn", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cypher_wiring", + "blend_mode": "overlay" + } + ] +} diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 7797a451d91..4b50ee9d8e0 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -2,7 +2,7 @@ name = "standard encryption key" desc = "An encryption key for a radio headset." icon = 'icons/obj/radio.dmi' - icon_state = "cypherkey" + icon_state = "cypherkey_basic" w_class = WEIGHT_CLASS_TINY /// Can this radio key access the binary radio channel? var/translate_binary = FALSE @@ -13,6 +13,8 @@ /// What channels does this encryption key grant to the parent headset. var/list/channels = list() var/datum/language/translated_language + greyscale_config = /datum/greyscale_config/encryptionkey_basic + greyscale_colors = "#820a16#3758c4" /obj/item/encryptionkey/Initialize(mapload) . = ..() @@ -33,116 +35,160 @@ /obj/item/encryptionkey/syndicate name = "syndicate encryption key" - icon_state = "syn_cypherkey" + icon_state = "cypherkey_syndicate" channels = list(RADIO_CHANNEL_SYNDICATE = 1) syndie = TRUE + greyscale_config = /datum/greyscale_config/encryptionkey_syndicate + greyscale_colors = "#171717#990000" /obj/item/encryptionkey/binary name = "binary translator key" - icon_state = "bin_cypherkey" + icon_state = "cypherkey_basic" translate_binary = TRUE translated_language = /datum/language/machine + greyscale_config = /datum/greyscale_config/encryptionkey_basic + greyscale_colors = "#24a157#3758c4" /obj/item/encryptionkey/headset_sec name = "security radio encryption key" - icon_state = "sec_cypherkey" + icon_state = "cypherkey_security" channels = list(RADIO_CHANNEL_SECURITY = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_security + greyscale_colors = "#820a16#280b1a" /obj/item/encryptionkey/headset_eng name = "engineering radio encryption key" - icon_state = "eng_cypherkey" + icon_state = "cypherkey_engineering" channels = list(RADIO_CHANNEL_ENGINEERING = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_engineering + greyscale_colors = "#f8d860#dca01b" /obj/item/encryptionkey/headset_rob name = "robotics radio encryption key" - icon_state = "rob_cypherkey" + icon_state = "cypherkey_engineering" channels = list(RADIO_CHANNEL_SCIENCE = 1, RADIO_CHANNEL_ENGINEERING = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_engineering + greyscale_colors = "#793a80#dca01b" /obj/item/encryptionkey/headset_med name = "medical radio encryption key" - icon_state = "med_cypherkey" + icon_state = "cypherkey_medical" channels = list(RADIO_CHANNEL_MEDICAL = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_medical + greyscale_colors = "#ebebeb#69abd1" /obj/item/encryptionkey/headset_sci name = "science radio encryption key" - icon_state = "sci_cypherkey" + icon_state = "cypherkey_research" channels = list(RADIO_CHANNEL_SCIENCE = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_research + greyscale_colors = "#793a80#bc4a9b" /obj/item/encryptionkey/headset_medsci name = "medical research radio encryption key" - icon_state = "medsci_cypherkey" + icon_state = "cypherkey_medical" channels = list(RADIO_CHANNEL_SCIENCE = 1, RADIO_CHANNEL_MEDICAL = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_medical + greyscale_colors = "#ebebeb#9d1de8" /obj/item/encryptionkey/headset_srvsec name = "law and order radio encryption key" - icon_state = "srvsec_cypherkey" + icon_state = "cypherkey_service" channels = list(RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_SECURITY = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_service + greyscale_colors = "#820a16#3bca5a" /obj/item/encryptionkey/headset_srvmed name = "psychology radio encryption key" - icon_state = "srvmed_cypherkey" + icon_state = "cypherkey_service" channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SERVICE = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_service + greyscale_colors = "#ebebeb#3bca5a" /obj/item/encryptionkey/headset_com name = "command radio encryption key" - icon_state = "com_cypherkey" + icon_state = "cypherkey_cube" channels = list(RADIO_CHANNEL_COMMAND = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_cube + greyscale_colors = "#2b2793#67a552" /obj/item/encryptionkey/heads/captain name = "\proper the captain's encryption key" - icon_state = "cap_cypherkey" + icon_state = "cypherkey_cube" channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_ENGINEERING = 0, RADIO_CHANNEL_SCIENCE = 0, RADIO_CHANNEL_MEDICAL = 0, RADIO_CHANNEL_SUPPLY = 0, RADIO_CHANNEL_SERVICE = 0) + greyscale_config = /datum/greyscale_config/encryptionkey_cube + greyscale_colors = "#2b2793#dca01b" /obj/item/encryptionkey/heads/rd name = "\proper the research director's encryption key" - icon_state = "rd_cypherkey" + icon_state = "cypherkey_research" channels = list(RADIO_CHANNEL_SCIENCE = 1, RADIO_CHANNEL_COMMAND = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_research + greyscale_colors = "#bc4a9b#793a80" /obj/item/encryptionkey/heads/hos name = "\proper the head of security's encryption key" - icon_state = "hos_cypherkey" + icon_state = "cypherkey_security" channels = list(RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_COMMAND = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_security + greyscale_colors = "#280b1a#820a16" /obj/item/encryptionkey/heads/ce name = "\proper the chief engineer's encryption key" - icon_state = "ce_cypherkey" + icon_state = "cypherkey_engineering" channels = list(RADIO_CHANNEL_ENGINEERING = 1, RADIO_CHANNEL_COMMAND = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_engineering + greyscale_colors = "#dca01b#f8d860" /obj/item/encryptionkey/heads/cmo name = "\proper the chief medical officer's encryption key" - icon_state = "cmo_cypherkey" + icon_state = "cypherkey_medical" channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_COMMAND = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_medical + greyscale_colors = "#ebebeb#2b2793" /obj/item/encryptionkey/heads/hop name = "\proper the head of personnel's encryption key" - icon_state = "hop_cypherkey" + icon_state = "cypherkey_cube" channels = list(RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_COMMAND = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_cube + greyscale_colors = "#2b2793#c2c1c9" /obj/item/encryptionkey/heads/qm name = "\proper the quartermaster's encryption key" - icon_state = "cargo_cypherkey" + icon_state = "cypherkey_cargo" channels = list(RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_COMMAND = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_cargo + greyscale_colors = "#49241a#dca01b" /obj/item/encryptionkey/headset_cargo name = "supply radio encryption key" - icon_state = "cargo_cypherkey" + icon_state = "cypherkey_cargo" channels = list(RADIO_CHANNEL_SUPPLY = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_cargo + greyscale_colors = "#49241a#7b3f2e" /obj/item/encryptionkey/headset_mining name = "mining radio encryption key" - icon_state = "cargo_cypherkey" + icon_state = "cypherkey_cargo" channels = list(RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_SCIENCE = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_cargo + greyscale_colors = "#49241a#bc4a9b" /obj/item/encryptionkey/headset_service name = "service radio encryption key" - icon_state = "srv_cypherkey" + icon_state = "cypherkey_service" channels = list(RADIO_CHANNEL_SERVICE = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_service + greyscale_colors = "#3758c4#3bca5a" /obj/item/encryptionkey/headset_cent name = "\improper CentCom radio encryption key" - icon_state = "cent_cypherkey" + icon_state = "cypherkey_centcom" independent = TRUE channels = list(RADIO_CHANNEL_CENTCOM = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_centcom + greyscale_colors = "#24a157#dca01b" /obj/item/encryptionkey/ai //ported from NT, this goes 'inside' the AI. channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_ENGINEERING = 1, RADIO_CHANNEL_SCIENCE = 1, RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_AI_PRIVATE = 1) @@ -155,27 +201,37 @@ desc = "An encryption key that automatically encodes moffic heard through the radio into common. The signal's a little fuzzy." icon_state = "translation_cypherkey" translated_language = /datum/language/moffic + greyscale_config = null + greyscale_colors = null /obj/item/encryptionkey/tiziran name = "\improper Tiziran translation key" desc = "An encryption key that automatically encodes draconic heard through the radio into common. The signal's not quite to scale." icon_state = "translation_cypherkey" translated_language = /datum/language/draconic + greyscale_config = null + greyscale_colors = null /obj/item/encryptionkey/plasmaman name = "\improper Calcic translation key" desc = "An encryption key that automatically encodes calcic heard through the radio into common. The signal lacks a bit of teeth." icon_state = "translation_cypherkey" translated_language = /datum/language/calcic + greyscale_config = null + greyscale_colors = null /obj/item/encryptionkey/ethereal name = "\improper Ethereal translation key" desc = "An encryption key that automatically encodes ethereal heard through the radio into common. The signal's overpowering." icon_state = "translation_cypherkey" translated_language = /datum/language/voltaic + greyscale_config = null + greyscale_colors = null /obj/item/encryptionkey/felinid name = "\improper Felinid translation key" desc = "An encryption key that automatically encodes nekomimetic heard through the radio into common. The signal's rather scratchy." icon_state = "translation_cypherkey" translated_language = /datum/language/nekomimetic + greyscale_config = null + greyscale_colors = null diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index 37b810f332f..86db5b00487 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ diff --git a/modular_skyrat/master_files/code/game/objects/items/encryptionkey.dm b/modular_skyrat/master_files/code/game/objects/items/encryptionkey.dm index 2d6ddbec7d0..b1e96044fab 100644 --- a/modular_skyrat/master_files/code/game/objects/items/encryptionkey.dm +++ b/modular_skyrat/master_files/code/game/objects/items/encryptionkey.dm @@ -1,95 +1,86 @@ -/obj/item/encryptionkey/beach_bum - name = "\improper Beachtongue translation key" - desc = "An encryption key that automatically encodes heard through the radio into common." +/obj/item/encryptionkey/translation + name = "translation key" + desc = "An encryption key that automatically encodes nothing. You shouldn't be seeing this." icon_state = "translation_cypherkey" + greyscale_config = null + greyscale_colors = null + +/obj/item/encryptionkey/translation/beach_bum + name = "\improper Beachtongue translation key" + desc = "An encryption key that automatically encodes Beachtongue heard through the radio into common." translated_language = /datum/language/beachbum -/obj/item/encryptionkey/buzzwords +/obj/item/encryptionkey/translation/buzzwords name = "\improper Buzzwords translation key" desc = "An encryption key that automatically encodes Buzzwords heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/buzzwords -/obj/item/encryptionkey/machine +/obj/item/encryptionkey/translation/machine name = "\improper Encoded Audio Language translation key" desc = "An encryption key that automatically encodes Encoded Audio Language heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/machine -/obj/item/encryptionkey/mushroom +/obj/item/encryptionkey/translation/mushroom name = "\improper Mushroom translation key" desc = "An encryption key that automatically encodes Mushroom heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/mushroom -/obj/item/encryptionkey/shadow +/obj/item/encryptionkey/translation/shadow name = "\improper Shadowtongue translation key" desc = "An encryption key that automatically encodes Shadowtongue heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/shadowtongue -/obj/item/encryptionkey/slime +/obj/item/encryptionkey/translation/slime name = "\improper Slime translation key" desc = "An encryption key that automatically encodes Slime heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/slime -/obj/item/encryptionkey/sylvan +/obj/item/encryptionkey/translation/sylvan name = "\improper Sylvan translation key" desc = "An encryption key that automatically encodes Sylvan heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/sylvan -/obj/item/encryptionkey/terrum +/obj/item/encryptionkey/translation/terrum name = "\improper Terrum translation key" desc = "An encryption key that automatically encodes Terrum heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/terrum -/obj/item/encryptionkey/uncommon +/obj/item/encryptionkey/translation/uncommon name = "\improper Galactic Uncommon translation key" desc = "An encryption key that automatically encodes Galactic Uncommon heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/uncommon -/obj/item/encryptionkey/gutter +/obj/item/encryptionkey/translation/gutter name = "\improper Gutter translation key" desc = "An encryption key that automatically encodes Gutter heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/gutter -/obj/item/encryptionkey/yangyu +/obj/item/encryptionkey/translation/yangyu name = "\improper Yangyu translation key" desc = "An encryption key that automatically encodes Yangyu heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/yangyu /obj/item/encryptionkey/pan_slavic name = "\improper Pan-Slavic translation key" desc = "An encryption key that automatically encodes Pan-Slavic heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/panslavic -/obj/item/encryptionkey/skrellian +/obj/item/encryptionkey/translation/skrellian name = "\improper Skrellian translation key" desc = "An encryption key that automatically encodes Skrellian heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/skrell -/obj/item/encryptionkey/spacer +/obj/item/encryptionkey/translation/spacer name = "\improper Spacer translation key" desc = "An encryption key that automatically encodes Spacer heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/spacer -/obj/item/encryptionkey/vox +/obj/item/encryptionkey/translation/vox name = "\improper Vox-pidgin translation key" desc = "An encryption key that automatically encodes Vox-pidgin heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/vox -/obj/item/encryptionkey/teshari +/obj/item/encryptionkey/translation/teshari name = "\improper Schechi translation key" desc = "An encryption key that automatically encodes Schechi heard through the radio into common." - icon_state = "translation_cypherkey" translated_language = /datum/language/schechi diff --git a/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm b/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm index 0d7e36bf93f..8b6f5213ecf 100644 --- a/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm +++ b/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm @@ -89,7 +89,7 @@ icon_state = "syndie_headset" inhand_icon_state = "syndie_headset" radiosound = 'modular_skyrat/modules/radiosound/sound/radio/syndie.ogg' - keyslot = new /obj/item/encryptionkey/headset_interdyne + keyslot = new /obj/item/encryptionkey/headset_syndicate/interdyne /obj/item/radio/headset/interdyne/Initialize(mapload) . = ..() @@ -101,5 +101,5 @@ command = TRUE /obj/item/radio/headset/interdyne/comms - keyslot = new /obj/item/encryptionkey/headset_interdyne + keyslot = new /obj/item/encryptionkey/headset_syndicate/interdyne keyslot2 = new /obj/item/encryptionkey/syndicate diff --git a/modular_skyrat/modules/mapping/code/mob_spawns.dm b/modular_skyrat/modules/mapping/code/mob_spawns.dm index 3d3e6134eca..819e610da34 100644 --- a/modular_skyrat/modules/mapping/code/mob_spawns.dm +++ b/modular_skyrat/modules/mapping/code/mob_spawns.dm @@ -420,7 +420,7 @@ //ITEMS// /obj/item/radio/headset/cybersun - keyslot = new /obj/item/encryptionkey/headset_cybersun + keyslot = new /obj/item/encryptionkey/headset_syndicate/cybersun /obj/item/radio/headset/cybersun/captain name = "cybersun captain headset" @@ -431,7 +431,7 @@ name = "tarkon headset" freerange = TRUE freqlock = TRUE - keyslot = new /obj/item/encryptionkey/headset_tarkon + keyslot = new /obj/item/encryptionkey/headset_cargo/tarkon /obj/item/radio/headset/tarkon/ensign //spoiler for upcoming update name = "tarkon ensign headset" diff --git a/modular_skyrat/modules/mapping/code/radio.dm b/modular_skyrat/modules/mapping/code/radio.dm index 970ef39683a..a65f1baff24 100644 --- a/modular_skyrat/modules/mapping/code/radio.dm +++ b/modular_skyrat/modules/mapping/code/radio.dm @@ -1,23 +1,19 @@ -/obj/item/encryptionkey/headset_cybersun +/obj/item/encryptionkey/headset_syndicate/cybersun name = "cybersun radio encryption key" - icon_state = "syn_cypherkey" channels = list(RADIO_CHANNEL_CYBERSUN = 1) independent = TRUE -/obj/item/encryptionkey/headset_interdyne +/obj/item/encryptionkey/headset_syndicate/interdyne name = "interdyne radio encryption key" - icon_state = "syn_cypherkey" channels = list(RADIO_CHANNEL_INTERDYNE = 1) independent = TRUE -/obj/item/encryptionkey/headset_guild +/obj/item/encryptionkey/headset_syndicate/guild name = "private radio encryption key" - icon_state = "syn_cypherkey" channels = list(RADIO_CHANNEL_GUILD = 1) independent = TRUE -/obj/item/encryptionkey/headset_tarkon +/obj/item/encryptionkey/headset_cargo/tarkon name = "tarkon industry radio encryption key" - icon_state = "cargo_cypherkey" channels = list(RADIO_CHANNEL_TARKON = 1) independent = TRUE diff --git a/modular_skyrat/modules/mapping/code/shuttles.dm b/modular_skyrat/modules/mapping/code/shuttles.dm index 8d0c485ba26..999266ed676 100644 --- a/modular_skyrat/modules/mapping/code/shuttles.dm +++ b/modular_skyrat/modules/mapping/code/shuttles.dm @@ -99,7 +99,7 @@ outfit = /datum/outfit/guild/slaver/captain /obj/item/radio/headset/guild - keyslot = new /obj/item/encryptionkey/headset_guild + keyslot = new /obj/item/encryptionkey/headset_syndicate/guild /obj/item/radio/headset/guild/command command = TRUE