Fax Machine Changes

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

@@ -45,12 +45,6 @@
 
 //MARINE ENCRYPTION KEYS
 
-/obj/item/device/encryptionkey/ai_integrated
-	name = "AI Integrated Encryption Key"
-	desc = "Integrated encryption key"
-	icon_state = "cap_key"
-	channels = list(RADIO_CHANNEL_ALMAYER = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)
-
 /obj/item/device/encryptionkey/sentry_laptop
 	name = "Sentry Network Status Encryption Key"
 	desc = "Automated channel to broadcast sentry gun updates"
@@ -170,8 +164,10 @@
 	icon_state = "req_key"
 	channels = list(RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_COMMAND = FALSE)
 
-/obj/item/device/encryptionkey/mcom/ai //AI only.
-	channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)
+/obj/item/device/encryptionkey/cmpcom/synth/ai //AI only.
+	name = "AI Integrated Radio Encryption Key"
+	channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_WY = TRUE)
+	translate_apollo = TRUE
 
 // MARINE SQUADS
 

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

@@ -399,25 +399,6 @@
 /obj/item/device/radio/headset/binary
 	initial_keys = list(/obj/item/device/encryptionkey/binary)
 
-/obj/item/device/radio/headset/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
-	name = "AI Subspace Transceiver"
-	desc = "Integrated AI radio transceiver."
-	icon = 'icons/obj/items/robot_component.dmi'
-	icon_state = "radio"
-	item_state = "headset"
-	item_icons = list(
-		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_lefthand.dmi',
-		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_righthand.dmi',
-	)
-	initial_keys = list(/obj/item/device/encryptionkey/ai_integrated)
-	var/myAi = null // Atlantis: Reference back to the AI which has this radio.
-	var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
-
-/obj/item/device/radio/headset/ai_integrated/receive_range(freq, level)
-	if (disabledAi)
-		return -1 //Transceiver Disabled.
-	return ..(freq, level, 1)
-
 //MARINE HEADSETS
 
 /obj/item/device/radio/headset/almayer
@@ -640,7 +621,7 @@
 	)
 
 /obj/item/device/radio/headset/almayer/mcom/ai
-	initial_keys = list(/obj/item/device/encryptionkey/mcom/ai)
+	initial_keys = list(/obj/item/device/encryptionkey/cmpcom/synth/ai)
 	volume = RADIO_VOLUME_CRITICAL
 
 /obj/item/device/radio/headset/almayer/marine

maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm

@@ -22613,7 +22613,7 @@
 /area/lv522/indoors/a_block/corpo/glass)
 "mhn" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/faxmachine/uscm/brig,
+/obj/structure/machinery/faxmachine/uscm,
 /obj/structure/machinery/light{
 	dir = 1
 	},

maps/map_files/LV624/standalone/clfship.dmm

@@ -1639,7 +1639,7 @@
 /area/lv624/lazarus/crashed_ship)
 "Yz" = (
 /obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/faxmachine{
+/obj/structure/machinery/faxmachine/clf{
 	department = "CLF - Cell 42"
 	},
 /obj/item/paper/prison_station/pirate_note/clfship,

maps/map_files/USS_Almayer/USS_Almayer.dmm

@@ -1299,7 +1299,10 @@
 /turf/open/floor/plating/almayer/no_build,
 /area/almayer/stair_clone/upper)
 "aiQ" = (
-/obj/structure/machinery/faxmachine,
+/obj/structure/machinery/faxmachine{
+	sub_name = "Combat Correspondent";
+	department = "USS Almayer"
+	},
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/light/small,
 /turf/open/floor/almayer/plate,
@@ -3326,7 +3329,10 @@
 /area/almayer/command/cic)
 "awH" = (
 /obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/faxmachine/uscm/command,
+/obj/structure/machinery/faxmachine/uscm/almayer/command{
+	sub_name = "CIC";
+	radio_alert_tag = ":V"
+	},
 /obj/item/device/megaphone,
 /obj/structure/machinery/computer/cameras/almayer_brig{
 	desc = "Used to access the various cameras in the security brig.";
@@ -9046,7 +9052,9 @@
 "blw" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/lighter,
-/obj/structure/machinery/faxmachine/uscm,
+/obj/structure/machinery/faxmachine/uscm/almayer{
+	sub_name = "Conference Room"
+	},
 /obj/structure/machinery/light{
 	dir = 1
 	},
@@ -20627,10 +20635,11 @@
 /obj/item/paper_bin/uscm{
 	pixel_y = -16
 	},
-/obj/structure/machinery/faxmachine/uscm{
+/obj/structure/machinery/faxmachine/uscm/almayer{
 	desc = "The beloved fax machine of the Requisitions department for all your equipment-requesting needs";
-	department = "Requisitions";
-	gender = "female"
+	sub_name = "Requisitions";
+	gender = "female";
+	radio_alert_tag = ":U"
 	},
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/req)
@@ -20947,7 +20956,9 @@
 /area/almayer/squads/req)
 "eHx" = (
 /obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/faxmachine/uscm/command,
+/obj/structure/machinery/faxmachine/uscm/almayer/command{
+	sub_name = "Conference Room"
+	},
 /turf/open/floor/almayer/bluefull,
 /area/almayer/command/cichallway)
 "eHy" = (
@@ -24045,8 +24056,8 @@
 /area/almayer/command/cichallway)
 "gba" = (
 /obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/faxmachine/uscm/command{
-	department = "AI Core";
+/obj/structure/machinery/faxmachine/uscm/almayer/ai_core{
+	sub_name = "AI Core";
 	pixel_y = 8
 	},
 /obj/structure/transmitter/rotary{
@@ -25951,7 +25962,7 @@
 /obj/structure/sign/safety/terminal{
 	pixel_x = -17
 	},
-/obj/structure/machinery/faxmachine/corporate/liaison,
+/obj/structure/machinery/faxmachine/corporate/liaison/almayer,
 /obj/item/paper/liaison_brief{
 	pixel_y = 8;
 	pixel_x = -4
@@ -32854,7 +32865,7 @@
 /area/almayer/maint/hull/lower/l_f_s)
 "jIT" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/faxmachine/uscm/brig/chief,
+/obj/structure/machinery/faxmachine/uscm/almayer/brig/chief,
 /turf/open/floor/wood/ship,
 /area/almayer/shipboard/brig/chief_mp_office)
 "jIV" = (
@@ -39325,10 +39336,11 @@
 /area/almayer/engineering/lower)
 "muV" = (
 /obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/faxmachine/uscm/command/capt{
+/obj/structure/machinery/faxmachine/uscm/almayer/command/capt{
 	name = "Commanding Officer's Fax Machine";
 	pixel_x = -4;
-	pixel_y = 3
+	pixel_y = 3;
+	radio_alert_tag = ":P"
 	},
 /obj/structure/machinery/light{
 	dir = 1
@@ -47998,7 +48010,9 @@
 /area/almayer/living/briefing)
 "pUD" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/faxmachine/uscm/brig,
+/obj/structure/machinery/faxmachine/uscm/almayer/brig{
+	sub_name = "Processing"
+	},
 /obj/structure/machinery/status_display{
 	pixel_y = 30
 	},
@@ -48913,7 +48927,10 @@
 /area/almayer/shipboard/panic)
 "qmP" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/faxmachine/uscm,
+/obj/structure/machinery/faxmachine/uscm/almayer{
+	sub_name = "Intel Office";
+	radio_alert_tag = ":T"
+	},
 /turf/open/floor/almayer,
 /area/almayer/command/computerlab)
 "qmR" = (
@@ -54324,7 +54341,9 @@
 /area/almayer/maint/hull/upper/u_a_p)
 "stO" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/faxmachine/uscm/brig,
+/obj/structure/machinery/faxmachine/uscm/almayer/brig{
+	sub_name = "Permanent Confinement"
+	},
 /obj/structure/machinery/camera/autoname/almayer{
 	dir = 1;
 	name = "ship-grade camera"
@@ -62987,8 +63006,8 @@
 /obj/structure/sign/prop3{
 	pixel_x = -32
 	},
-/obj/structure/machinery/faxmachine/uscm{
-	department = "SEA"
+/obj/structure/machinery/faxmachine/uscm/almayer{
+	sub_name = "SEA"
 	},
 /turf/open/floor/strata/faux_metal,
 /area/almayer/shipboard/sea_office)
@@ -66234,9 +66253,9 @@
 	density = 0;
 	pixel_y = 16
 	},
-/obj/structure/machinery/faxmachine/uscm/command{
+/obj/structure/machinery/faxmachine/uscm/almayer/ai_core{
 	density = 0;
-	department = "AI Core";
+	sub_name = "Reception";
 	pixel_y = 32
 	},
 /turf/open/floor/almayer/aicore/no_build,

maps/templates/Chinook.dmm

@@ -3442,7 +3442,7 @@
 /obj/structure/sign/prop2{
 	pixel_y = 30
 	},
-/obj/structure/machinery/faxmachine/uscm/command/highcom{
+/obj/structure/machinery/faxmachine/uscm/highcom{
 	name = "Chinook Fax Machine";
 	department = "Chinook 91 GSO Station";
 	pixel_y = 5

maps/templates/lazy_templates/fax_responder_base.dmm

@@ -111,7 +111,7 @@
 /area/adminlevel/ert_station/fax_response_station)
 "ov" = (
 /obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/faxmachine/uscm/command/highcom{
+/obj/structure/machinery/faxmachine/uscm/highcom{
 	pixel_y = 8
 	},
 /turf/open/floor/wood/ship,
@@ -558,7 +558,7 @@
 /area/adminlevel/ert_station/fax_response_station)
 "UB" = (
 /obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/faxmachine/uscm/brig/provost{
+/obj/structure/machinery/faxmachine/uscm/provost{
 	pixel_y = 8
 	},
 /turf/open/floor/wood/ship,

maps/templates/lazy_templates/twe_ert_station.dmm

@@ -2008,7 +2008,7 @@
 "VA" = (
 /obj/structure/surface/table/almayer,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/faxmachine/uscm/brig,
+/obj/structure/machinery/faxmachine/uscm,
 /turf/open/floor/almayer/plate,
 /area/adminlevel/ert_station/royal_marines_station)
 "VG" = (