From a1dcd049b8c990b5e35b73a28e1cb5274ecb251f Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Tue, 14 Apr 2020 16:24:00 -0400 Subject: [PATCH 1/2] Adds a fax machine to the ITV Talon Also adds 'trader' reply fax choice --- code/modules/paperwork/adminpaper.dm | 8 ++++++-- code/modules/paperwork/faxmachine.dm | 2 +- html/images/trader.png | Bin 0 -> 18245 bytes maps/tether/submaps/offmap/talon.dm | 3 +++ maps/tether/submaps/offmap/talon1.dmm | 3 +++ 5 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 html/images/trader.png diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index 04b47377dd6..6dde3e148fd 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -40,11 +40,15 @@ var/originhash = md5("[origin]") var/timehash = copytext(md5("[world.time]"),1,10) var/text = null - var/logo = alert(usr, "Do you want the header of your fax to have a NanoTrasen or SolGov logo?","Fax Logo","NanoTrasen","SolGov") + var/logo = alert(usr, "Do you want the header of your fax to have a NanoTrasen, SolGov, or Trader logo?","Fax Logo","NanoTrasen","SolGov","Trader") //VOREStation Add - Trader if(logo == "SolGov") logo = "sglogo.png" - else + else if(logo == "NanoTrasen") logo = "ntlogo.png" + //VOREStation Add + else + logo = "trader.png" + //VOREStation Add End //TODO change logo based on who you're contacting. text = "

" text += "[origin] Quantum Uplink Signed Message
" diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 706ccda8e05..5353b2cf185 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -1,5 +1,5 @@ var/list/obj/machinery/photocopier/faxmachine/allfaxes = list() -var/list/admin_departments = list("[using_map.boss_name]", "Virgo-Prime Governmental Authority", "Supply") // Vorestation Edit +var/list/admin_departments = list("[using_map.boss_name]", "Virgo-Prime Governmental Authority", "Virgo-Erigonne Job Boards", "Supply") // Vorestation Edit var/list/alldepartments = list() var/list/adminfaxes = list() //cache for faxes that have been sent to admins diff --git a/html/images/trader.png b/html/images/trader.png new file mode 100644 index 0000000000000000000000000000000000000000..d093e604cb3389625e795af04f06752cab9c6ebe GIT binary patch literal 18245 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 Date: Tue, 14 Apr 2020 17:07:21 -0400 Subject: [PATCH 2/2] Update adminpaper.dm --- code/modules/paperwork/adminpaper.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index 6dde3e148fd..353090efede 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -43,12 +43,12 @@ var/logo = alert(usr, "Do you want the header of your fax to have a NanoTrasen, SolGov, or Trader logo?","Fax Logo","NanoTrasen","SolGov","Trader") //VOREStation Add - Trader if(logo == "SolGov") logo = "sglogo.png" + //VOREStation Edit/Add else if(logo == "NanoTrasen") logo = "ntlogo.png" - //VOREStation Add else logo = "trader.png" - //VOREStation Add End + //VOREStation Edit/Add End //TODO change logo based on who you're contacting. text = "

" text += "[origin] Quantum Uplink Signed Message
" @@ -156,4 +156,4 @@ obj/item/weapon/paper/admin/proc/updateDisplay() return /obj/item/weapon/paper/admin/get_signature() - return input(usr, "Enter the name you wish to sign the paper with (will prompt for multiple entries, in order of entry)", "Signature") as text|null \ No newline at end of file + return input(usr, "Enter the name you wish to sign the paper with (will prompt for multiple entries, in order of entry)", "Signature") as text|null