diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index 04b47377dd6..353090efede 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 + //VOREStation Edit/Add + else if(logo == "NanoTrasen") logo = "ntlogo.png" + else + logo = "trader.png" + //VOREStation Edit/Add End //TODO change logo based on who you're contacting. text = "

" text += "[origin] Quantum Uplink Signed Message
" @@ -152,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 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 00000000000..d093e604cb3 Binary files /dev/null and b/html/images/trader.png differ diff --git a/maps/tether/submaps/offmap/talon.dm b/maps/tether/submaps/offmap/talon.dm index edcaee81b4f..239f4c47b6d 100644 --- a/maps/tether/submaps/offmap/talon.dm +++ b/maps/tether/submaps/offmap/talon.dm @@ -193,6 +193,9 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/machinery/camera/network/talon network = list(NETWORK_TALON_SHIP) +/obj/machinery/photocopier/faxmachine/talon + department = "ITV Talon" + desc = "The ship's fax machine! It's a safe assumption that most of the departments listed aren't on your ship, since the ship only has one." /obj/item/clothing/head/helmet/space/void/captain/talon name = "talon captain's voidsuit helmet" diff --git a/maps/tether/submaps/offmap/talon1.dmm b/maps/tether/submaps/offmap/talon1.dmm index ecdb0f15969..628fd16f610 100644 --- a/maps/tether/submaps/offmap/talon1.dmm +++ b/maps/tether/submaps/offmap/talon1.dmm @@ -3522,6 +3522,7 @@ }, /obj/structure/table/standard, /obj/effect/floor_decal/borderfloor, +/obj/machinery/photocopier/faxmachine/talon, /turf/simulated/floor/tiled/steel, /area/talon/deckone/workroom) "gA" = ( @@ -3541,6 +3542,8 @@ }, /obj/structure/table/standard, /obj/effect/floor_decal/borderfloor, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, /turf/simulated/floor/tiled/steel, /area/talon/deckone/workroom) "gC" = (