diff --git a/maps/southern_cross/items/headset_sc.dm b/maps/southern_cross/items/headset_sc.dm index a6012ad07e..0691379757 100644 --- a/maps/southern_cross/items/headset_sc.dm +++ b/maps/southern_cross/items/headset_sc.dm @@ -9,6 +9,8 @@ name = "pilot's bowman headset" desc = "A bowman headset used by pilots, has access to supply and explorer channels." icon_state = "pilot_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/pilot /obj/item/radio/headset/explorer name = "explorer's headset" @@ -21,6 +23,8 @@ name = "explorer's bowman headset" desc = "Bowman headset used by explorers for exploring. Access to the explorer channel." icon_state = "exp_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/explorer /obj/item/radio/headset/sar name = "sar radio headset" @@ -33,3 +37,5 @@ name = "sar radio bowman headset" desc = "A bowman headset for search and rescue." icon_state = "sar_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/sar diff --git a/maps/yw/items/encryptionkey_sc.dm b/maps/yw/items/encryptionkey_sc.dm index 5ae09d2c97..47684e5859 100644 --- a/maps/yw/items/encryptionkey_sc.dm +++ b/maps/yw/items/encryptionkey_sc.dm @@ -3,30 +3,30 @@ /obj/item/encryptionkey/pilot name = "pilot's encryption key" icon_state = "com_cypherkey" - channels = list("Supply" = 1, "Explorer" = 1) + channels = list(CHANNEL_SUPPLY = 1, CHANNEL_EXPLORATION = 1) /obj/item/encryptionkey/explorer name = "explorer radio encryption key" icon_state = "com_cypherkey" - channels = list("Explorer" = 1) + channels = list(CHANNEL_EXPLORATION = 1) /obj/item/encryptionkey/sar name = "sar's encryption key" icon_state = "med_cypherkey" - channels = list("Medical" = 1, "Explorer" = 1) + channels = list(CHANNEL_MEDICAL = 1, CHANNEL_EXPLORATION = 1) /obj/item/encryptionkey/heads/hop name = "head of personnel's encryption key" icon_state = "hop_cypherkey" - channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 0, "Explorer" = 0) + channels = list(CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 0, CHANNEL_EXPLORATION = 0) /obj/item/encryptionkey/heads/ai_integrated name = "ai integrated encryption key" desc = "Integrated encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Explorer" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_AI_PRIVATE = 1, CHANNEL_EXPLORATION = 1) /obj/item/encryptionkey/heads/captain name = "colony director's encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0, "Explorer" = 0) \ No newline at end of file + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 0, CHANNEL_SCIENCE = 0, CHANNEL_MEDICAL = 0, CHANNEL_SUPPLY = 0, CHANNEL_SERVICE = 0, CHANNEL_EXPLORATION = 0) diff --git a/maps/yw/items/encryptionkey_vr.dm b/maps/yw/items/encryptionkey_vr.dm index 1020c60893..0541395603 100644 --- a/maps/yw/items/encryptionkey_vr.dm +++ b/maps/yw/items/encryptionkey_vr.dm @@ -2,7 +2,7 @@ /obj/item/encryptionkey/pilot icon_state = "cypherkey" - channels = list("Explorer" = 1) + channels = list(CHANNEL_EXPLORATION = 1) /obj/item/encryptionkey/explorer - channels = list("Explorer" = 1) //YW EDIT: Removes Science to come in line with our chain of Command + channels = list(CHANNEL_EXPLORATION = 1) //YW EDIT: Removes Science to come in line with our chain of Command diff --git a/maps/yw/items/headset_sc.dm b/maps/yw/items/headset_sc.dm index 64f004fe68..9e33613458 100644 --- a/maps/yw/items/headset_sc.dm +++ b/maps/yw/items/headset_sc.dm @@ -11,6 +11,8 @@ name = "pilot's bowman headset" desc = "A bowman headset used by pilots, has access to supply and explorer channels." icon_state = "pilot_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/pilot /obj/item/radio/headset/explorer name = "explorer's headset" @@ -23,6 +25,8 @@ name = "explorer's bowman headset" desc = "Bowman headset used by explorers for exploring. Access to the explorer channel." icon_state = "exp_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/explorer /obj/item/radio/headset/sar name = "sar radio headset" @@ -35,3 +39,5 @@ name = "sar radio bowman headset" desc = "A bowman headset for search and rescue." icon_state = "sar_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/sar diff --git a/maps/yw/job/outfits.dm b/maps/yw/job/outfits.dm index 992c9b7f71..a1438285bf 100644 --- a/maps/yw/job/outfits.dm +++ b/maps/yw/job/outfits.dm @@ -17,7 +17,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1) headset = /obj/item/radio/headset/explorer - headset_alt = /obj/item/radio/headset/explorer + headset_alt = /obj/item/radio/headset/alt/explorer headset_earbud = /obj/item/radio/headset/explorer /decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H) @@ -67,7 +67,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL headset = /obj/item/radio/headset/sar - headset_alt = /obj/item/radio/headset/sar + headset_alt = /obj/item/radio/headset/alt/sar headset_earbud = /obj/item/radio/headset/sar /decl/hierarchy/outfit/job/explorer2 @@ -135,7 +135,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL headset = /obj/item/radio/headset/sar - headset_alt = /obj/item/radio/headset/sar + headset_alt = /obj/item/radio/headset/alt/sar headset_earbud = /obj/item/radio/headset/sar @@ -152,7 +152,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1) headset = /obj/item/radio/headset/explorer - headset_alt = /obj/item/radio/headset/explorer + headset_alt = /obj/item/radio/headset/alt/explorer headset_earbud = /obj/item/radio/headset/explorer /decl/hierarchy/outfit/job/pathfinder/post_equip(mob/living/carbon/human/H) diff --git a/modular_chomp/maps/relic_base/items/encryptionkey_sc.dm b/modular_chomp/maps/relic_base/items/encryptionkey_sc.dm index 79d93fda9b..2d30889275 100644 --- a/modular_chomp/maps/relic_base/items/encryptionkey_sc.dm +++ b/modular_chomp/maps/relic_base/items/encryptionkey_sc.dm @@ -1,30 +1,30 @@ /obj/item/encryptionkey/pilot name = "pilot's encryption key" icon_state = "com_cypherkey" - channels = list("Supply" = 1, "Explorer" = 1) + channels = list(CHANNEL_SUPPLY = 1, CHANNEL_EXPLORATION = 1) /obj/item/encryptionkey/explorer name = "explorer radio encryption key" icon_state = "com_cypherkey" - channels = list("Explorer" = 1) + channels = list(CHANNEL_EXPLORATION = 1) /obj/item/encryptionkey/sar name = "sar's encryption key" icon_state = "med_cypherkey" - channels = list("Medical" = 1, "Explorer" = 1) + channels = list(CHANNEL_MEDICAL = 1, CHANNEL_EXPLORATION = 1) /obj/item/encryptionkey/heads/hop name = "head of personnel's encryption key" icon_state = "hop_cypherkey" - channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1, "Explorer" = 1) + channels = list(CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_EXPLORATION = 1) /obj/item/encryptionkey/heads/ai_integrated name = "ai integrated encryption key" desc = "Integrated encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Explorer" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_AI_PRIVATE = 1, CHANNEL_EXPLORATION = 1) /obj/item/encryptionkey/heads/captain name = "site manager's encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1) diff --git a/modular_chomp/maps/relic_base/items/headset_sc.dm b/modular_chomp/maps/relic_base/items/headset_sc.dm index a6012ad07e..0691379757 100644 --- a/modular_chomp/maps/relic_base/items/headset_sc.dm +++ b/modular_chomp/maps/relic_base/items/headset_sc.dm @@ -9,6 +9,8 @@ name = "pilot's bowman headset" desc = "A bowman headset used by pilots, has access to supply and explorer channels." icon_state = "pilot_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/pilot /obj/item/radio/headset/explorer name = "explorer's headset" @@ -21,6 +23,8 @@ name = "explorer's bowman headset" desc = "Bowman headset used by explorers for exploring. Access to the explorer channel." icon_state = "exp_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/explorer /obj/item/radio/headset/sar name = "sar radio headset" @@ -33,3 +37,5 @@ name = "sar radio bowman headset" desc = "A bowman headset for search and rescue." icon_state = "sar_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/sar diff --git a/modular_chomp/maps/relic_base/job/outfits.dm b/modular_chomp/maps/relic_base/job/outfits.dm index f486226378..990c82784c 100644 --- a/modular_chomp/maps/relic_base/job/outfits.dm +++ b/modular_chomp/maps/relic_base/job/outfits.dm @@ -19,7 +19,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1) headset = /obj/item/radio/headset/explorer - headset_alt = /obj/item/radio/headset/explorer + headset_alt = /obj/item/radio/headset/alt/explorer headset_earbud = /obj/item/radio/headset/explorer /decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H) @@ -54,9 +54,9 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go id_pda_assignment = "Pilot" flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL - headset = /obj/item/radio/headset/alt/pilot + headset = /obj/item/radio/headset/pilot headset_alt = /obj/item/radio/headset/alt/pilot - headset_earbud = /obj/item/radio/headset/alt/pilot + headset_earbud = /obj/item/radio/headset/pilot /decl/hierarchy/outfit/job/medical/sar name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit @@ -72,5 +72,5 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL headset = /obj/item/radio/headset/sar - headset_alt = /obj/item/radio/headset/sar + headset_alt = /obj/item/radio/headset/alt/sar headset_earbud = /obj/item/radio/headset/sar diff --git a/modular_chomp/maps/southern_cross/items/headset_sc.dm b/modular_chomp/maps/southern_cross/items/headset_sc.dm index a6012ad07e..0691379757 100644 --- a/modular_chomp/maps/southern_cross/items/headset_sc.dm +++ b/modular_chomp/maps/southern_cross/items/headset_sc.dm @@ -9,6 +9,8 @@ name = "pilot's bowman headset" desc = "A bowman headset used by pilots, has access to supply and explorer channels." icon_state = "pilot_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/pilot /obj/item/radio/headset/explorer name = "explorer's headset" @@ -21,6 +23,8 @@ name = "explorer's bowman headset" desc = "Bowman headset used by explorers for exploring. Access to the explorer channel." icon_state = "exp_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/explorer /obj/item/radio/headset/sar name = "sar radio headset" @@ -33,3 +37,5 @@ name = "sar radio bowman headset" desc = "A bowman headset for search and rescue." icon_state = "sar_headset_alt" + adhoc_fallback = TRUE + ks2type = /obj/item/encryptionkey/sar diff --git a/modular_chomp/maps/southern_cross/job/outfits.dm b/modular_chomp/maps/southern_cross/job/outfits.dm index 15c6a3f741..75daaa7e2a 100644 --- a/modular_chomp/maps/southern_cross/job/outfits.dm +++ b/modular_chomp/maps/southern_cross/job/outfits.dm @@ -19,7 +19,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1) headset = /obj/item/radio/headset/explorer - headset_alt = /obj/item/radio/headset/explorer + headset_alt = /obj/item/radio/headset/alt/explorer headset_earbud = /obj/item/radio/headset/explorer /decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H) @@ -54,9 +54,9 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go id_pda_assignment = JOB_PILOT flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL - headset = /obj/item/radio/headset/alt/pilot + headset = /obj/item/radio/headset/pilot headset_alt = /obj/item/radio/headset/alt/pilot - headset_earbud = /obj/item/radio/headset/alt/pilot + headset_earbud = /obj/item/radio/headset/pilot /decl/hierarchy/outfit/job/medical/sar name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit @@ -72,5 +72,5 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL headset = /obj/item/radio/headset/sar - headset_alt = /obj/item/radio/headset/sar + headset_alt = /obj/item/radio/headset/alt/sar headset_earbud = /obj/item/radio/headset/sar