diff --git a/code/WorkInProgress/kilakk/fax.dm b/code/WorkInProgress/kilakk/fax.dm index 2934d2ed746..5c0e8c15979 100644 --- a/code/WorkInProgress/kilakk/fax.dm +++ b/code/WorkInProgress/kilakk/fax.dm @@ -23,12 +23,14 @@ var/list/alldepartments = list("Central Command") var/dpt = "Central Command" // the department we're sending to + /obj/machinery/faxmachine/New() ..() allfaxes += src if( !("[department]" in alldepartments) ) alldepartments += department + alldepartments += "Sol Government" /obj/machinery/faxmachine/process() return 0 @@ -95,9 +97,12 @@ var/list/alldepartments = list("Central Command") if(tofax) if(dpt == "Central Command") - Centcomm_fax(tofax.info, tofax.name, usr) + Centcomm_fax(src, tofax.info, tofax.name, usr) sendcooldown = 1800 + else if(dpt == "Sol Government") + Solgov_fax(src, tofax.info, tofax.name, usr) + sendcooldown = 1800 else SendFax(tofax.info, tofax.name, usr, dpt) sendcooldown = 600 @@ -177,11 +182,18 @@ var/list/alldepartments = list("Central Command") user << "You [anchored ? "wrench" : "unwrench"] \the [src]." return -/proc/Centcomm_fax(var/sent, var/sentname, var/mob/Sender) +/proc/Centcomm_fax(var/originfax, var/sent, var/sentname, var/mob/Sender) + + var/msg = "\blue CENTCOMM FAX: [key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (RPLY): Receiving '[sentname]' via secure connection ... view message" - var/msg = "\blue CENTCOMM FAX: [key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (RPLY): Receiving '[sentname]' via secure connection ... view message" admins << msg +/proc/Solgov_fax(var/originfax, var/sent, var/sentname, var/mob/Sender) + var/msg = "\blue SOL GOVERNMENT FAX: [key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (RPLY): Receiving '[sentname]' via secure connection ... view message" + + admins << msg + + proc/SendFax(var/sent, var/sentname, var/mob/Sender, var/dpt) for(var/obj/machinery/faxmachine/F in allfaxes) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 6b1e1d2b018..1493751ab10 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1492,6 +1492,7 @@ else if(href_list["CentcommFaxReply"]) var/mob/living/carbon/human/H = locate(href_list["CentcommFaxReply"]) + var/obj/machinery/faxmachine/fax = locate(href_list["originfax"]) var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via secure connection. NOTE: BBCode does not work, but HTML tags do! Use
for line breaks.", "Outgoing message from Centcomm", "") as message|null if(!input) return @@ -1499,32 +1500,76 @@ var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null for(var/obj/machinery/faxmachine/F in machines) - if(! (F.stat & (BROKEN|NOPOWER) ) ) + if(F == fax) + if(! (F.stat & (BROKEN|NOPOWER) ) ) - // animate! it's alive! - flick("faxreceive", F) + // animate! it's alive! + flick("faxreceive", F) - // give the sprite some time to flick - spawn(20) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( F.loc ) - P.name = "[command_name()]- [customname]" - P.info = input - P.update_icon() + // give the sprite some time to flick + spawn(20) + var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( F.loc ) + P.name = "[command_name()]- [customname]" + P.info = input + P.update_icon() - playsound(F.loc, "sound/items/polaroid1.ogg", 50, 1) + playsound(F.loc, "sound/items/polaroid1.ogg", 50, 1) - // Stamps - var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') - stampoverlay.icon_state = "paper_stamp-cent" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/weapon/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped by the Central Command Quantum Relay." + // Stamps + var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') + stampoverlay.icon_state = "paper_stamp-cent" + if(!P.stamped) + P.stamped = new + P.stamped += /obj/item/weapon/stamp + P.overlays += stampoverlay + P.stamps += "
This paper has been stamped by the Central Command Quantum Relay." + + src.owner << "Message reply to transmitted successfully." + log_admin("[key_name(src.owner)] replied to a fax message from [key_name(H)]: [input]") + message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) + return + src.owner << "/red Unable to locate fax!" + + else if(href_list["SolGovFaxReply"]) + var/mob/living/carbon/human/H = locate(href_list["SolGovFaxReply"]) + var/obj/machinery/faxmachine/fax = locate(href_list["originfax"]) + + var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via secure connection. NOTE: BBCode does not work, but HTML tags do! Use
for line breaks.", "Outgoing message from Centcomm", "") as message|null + if(!input) return + + var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null + + for(var/obj/machinery/faxmachine/F in machines) + if(F == fax) + if(! (F.stat & (BROKEN|NOPOWER) ) ) + + // animate! it's alive! + flick("faxreceive", F) + + // give the sprite some time to flick + spawn(20) + var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( F.loc ) + P.name = "Sol Government- [customname]" + P.info = input + P.update_icon() + + playsound(F.loc, "sound/items/polaroid1.ogg", 50, 1) + + // Stamps + var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') + stampoverlay.icon_state = "paper_stamp-cap" + if(!P.stamped) + P.stamped = new + P.stamped += /obj/item/weapon/stamp + P.overlays += stampoverlay + P.stamps += "
This paper has been stamped and encrypted by the Sol Government Quantum Relay." + + src.owner << "Message reply to transmitted successfully." + log_admin("[key_name(src.owner)] replied to a fax message from [key_name(H)]: [input]") + message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) + return + src.owner << "/red Unable to locate fax!" - src.owner << "Message reply to transmitted successfully." - log_admin("[key_name(src.owner)] replied to a fax message from [key_name(H)]: [input]") - message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) else if(href_list["jumpto"])