diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 13850af5db7..8152e90fe45 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -1611,15 +1611,6 @@ pixel_x = 1; pixel_y = -1 }, -/obj/item/radio/headset/syndicate/alt{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/radio/headset/syndicate/alt, -/obj/item/radio/headset/syndicate/alt{ - pixel_x = 3; - pixel_y = -3 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) @@ -3538,6 +3529,10 @@ /obj/machinery/alarm/syndicate{ pixel_y = 24 }, +/obj/item/radio/headset/syndicate/alt{ + pixel_x = -3; + pixel_y = 3 + }, /turf/simulated/floor/plasteel/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) "hN" = ( @@ -3563,6 +3558,10 @@ /obj/machinery/alarm/syndicate{ pixel_y = 24 }, +/obj/item/radio/headset/syndicate/alt{ + pixel_x = -3; + pixel_y = 3 + }, /turf/simulated/floor/plasteel/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) "hR" = ( @@ -4480,6 +4479,10 @@ /obj/structure/table/wood, /obj/item/ammo_box/magazine/m10mm, /obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/radio/headset/syndicate/alt{ + pixel_x = -3; + pixel_y = 3 + }, /turf/simulated/floor/plasteel/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) "jB" = ( @@ -6824,6 +6827,10 @@ "Au" = ( /turf/simulated/wall/mineral/plastitanium/explosive, /area/ruin/unpowered/syndicate_lava_base/engineering) +"Bj" = ( +/obj/machinery/porta_turret/syndicate, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/main) "BF" = ( /obj/structure/grille, /obj/structure/window/plastitanium, @@ -6866,6 +6873,13 @@ }, /turf/simulated/floor/engine, /area/ruin/unpowered/syndicate_lava_base/testlab) +"Ln" = ( +/obj/structure/table, +/obj/machinery/photocopier/faxmachine/longrange/syndie{ + department = "Syndicate Bioweapon Research Outpost" + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) "LQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7333,7 +7347,7 @@ ab ab ab mp -mP +Ln nk nI oi @@ -8821,7 +8835,7 @@ hV ha ha ha -ha +Bj ha ju jJ diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 13d85941a79..1d92888800d 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -2,6 +2,7 @@ var/list/obj/machinery/photocopier/faxmachine/allfaxes = list() var/list/admin_departments = list("Central Command") var/list/hidden_admin_departments = list("Syndicate") var/list/alldepartments = list() +var/list/hidden_departments = list() var/global/list/fax_blacklist = list() /obj/machinery/photocopier/faxmachine @@ -35,7 +36,7 @@ var/global/list/fax_blacklist = list() /obj/machinery/photocopier/faxmachine/proc/update_network() if(department != "Unknown") - if(!(("[department]" in alldepartments) || ("[department]" in admin_departments) || ("[department]" in hidden_admin_departments))) + if(!(("[department]" in alldepartments) || ("[department]" in hidden_departments) || ("[department]" in admin_departments) || ("[department]" in hidden_admin_departments))) alldepartments |= department /obj/machinery/photocopier/faxmachine/longrange @@ -43,6 +44,16 @@ var/global/list/fax_blacklist = list() fax_network = "Central Command Quantum Entanglement Network" long_range_enabled = 1 +/obj/machinery/photocopier/faxmachine/longrange/syndie + name = "syndicate long range fax machine" + emagged = TRUE + req_one_access = list(access_syndicate) + //No point setting fax network, being emagged overrides that anyway. + +/obj/machinery/photocopier/faxmachine/longrange/syndie/update_network() + if(department != "Unknown") + hidden_departments |= department + /obj/machinery/photocopier/faxmachine/attack_hand(mob/user) ui_interact(user) @@ -119,7 +130,7 @@ var/global/list/fax_blacklist = list() if((destination in admin_departments) || (destination in hidden_admin_departments)) send_admin_fax(usr, destination) else - sendfax(destination,usr) + sendfax(destination, usr) if(sendcooldown) spawn(sendcooldown) // cooldown time @@ -155,6 +166,7 @@ var/global/list/fax_blacklist = list() if(emagged) combineddepartments += hidden_admin_departments.Copy() + combineddepartments += hidden_departments.Copy() destination = input(usr, "To which department?", "Choose a department", "") as null|anything in combineddepartments if(!destination)