Skip to content

Commit

Permalink
Improved admin fax behaviour (#3100)
Browse files Browse the repository at this point in the history
  • Loading branch information
UEDCommander authored Jan 12, 2025
1 parent d627b1f commit 8b1c6af
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 25 deletions.
3 changes: 2 additions & 1 deletion maps/sierra/machinery/machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,12 @@
/obj/machinery/photocopier/faxmachine/centcomm
req_access = list(access_cent_general)
department = "Office of Civil Investigation and Enforcement"
is_centcom = TRUE

/obj/machinery/photocopier/faxmachine/centcomm/Initialize()
. = ..()
destination = pick(GLOB.alldepartments)
department = "[GLOB.using_map.boss_name]"
GLOB.admin_departments += src.department

/obj/machinery/photocopier/faxmachine/centcomm/attack_hand(mob/user as mob)
user.set_machine(src)
Expand Down
2 changes: 1 addition & 1 deletion maps/sierra/sierra_define.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
company_name = "NanoTrasen"
company_short = "NT"

map_admin_faxes = list("NanoTrasen Central Office")
map_admin_faxes = list("Kshar'va SDF Headquarters")

evac_controller_type = /datum/evacuation_controller/starship/fast //[SIERRA-EDIT] evac_controller_type = /datum/evacuation_controller/starship/

Expand Down
43 changes: 28 additions & 15 deletions maps/sierra/z1-z5_sierra.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -17167,7 +17167,8 @@
"cBD" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/photocopier/faxmachine{
department = "Captain's reserve fax"
department = "Captain's reserve fax";
destination = "NanoTrasen Central Command"
},
/obj/decal/cleanable/dirt,
/turf/simulated/floor/tiled/techfloor/grid,
Expand Down Expand Up @@ -22050,7 +22051,8 @@
},
/obj/structure/table/reinforced,
/obj/machinery/photocopier/faxmachine{
department = "Quartermaster"
department = "Quartermaster";
destination = "NanoTrasen Central Command"
},
/obj/structure/noticeboard{
dir = 4;
Expand Down Expand Up @@ -22520,7 +22522,8 @@
},
/obj/structure/table/standard,
/obj/machinery/photocopier/faxmachine{
department = "HOP"
department = "HOP";
destination = "NanoTrasen Central Command"
},
/obj/floor_decal/borderfloor{
dir = 10
Expand Down Expand Up @@ -26993,7 +26996,8 @@
/obj/structure/disposalpipe/segment,
/obj/structure/table/steel,
/obj/machinery/photocopier/faxmachine{
department = "HOS"
department = "HOS";
destination = "NanoTrasen Central Command"
},
/obj/floor_decal/borderfloorblack{
dir = 8
Expand Down Expand Up @@ -36344,7 +36348,8 @@
"fmH" = (
/obj/structure/table/standard,
/obj/machinery/photocopier/faxmachine{
department = "IAA Office"
department = "IAA Office";
destination = "NanoTrasen Central Command"
},
/obj/item/documents/nanotrasen/sierra,
/obj/floor_decal/borderfloorblack{
Expand Down Expand Up @@ -42798,7 +42803,8 @@
},
/obj/structure/table/glass,
/obj/machinery/photocopier/faxmachine{
department = "Bridge"
department = "Bridge";
destination = "NanoTrasen Central Command"
},
/obj/floor_decal/borderfloorblack{
dir = 4
Expand Down Expand Up @@ -57308,7 +57314,8 @@
"ivT" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/photocopier/faxmachine{
department = "Warden"
department = "Warden";
destination = "NanoTrasen Central Command"
},
/obj/floor_decal/borderfloor{
dir = 8
Expand Down Expand Up @@ -59536,7 +59543,7 @@
/obj/floor_decal/spline/fancy/black{
dir = 1
},
/obj/random/documents,
/obj/item/reagent_containers/food/drinks/glass2/coffeecup/NT,
/turf/simulated/floor/tiled/dark/monotile,
/area/bridge)
"iMM" = (
Expand Down Expand Up @@ -60110,7 +60117,8 @@
/area/engineering/engine_room)
"iQh" = (
/obj/machinery/photocopier/faxmachine{
department = "Research Director's Office"
department = "Research Director's Office";
destination = "NanoTrasen Central Command"
},
/obj/item/book/manual/nt_regs,
/obj/structure/table/glass/boron,
Expand Down Expand Up @@ -70967,7 +70975,8 @@
/area/hallway/primary/bridgedeck/center)
"kwc" = (
/obj/machinery/photocopier/faxmachine{
department = "Exploration Leader"
department = "Exploration Leader";
destination = "NanoTrasen Central Command"
},
/obj/structure/table/reinforced,
/obj/machinery/light,
Expand Down Expand Up @@ -83899,7 +83908,8 @@
"mrh" = (
/obj/structure/table/woodentable/walnut,
/obj/machinery/photocopier/faxmachine{
department = "Captain"
department = "Captain";
destination = "NanoTrasen Central Command"
},
/obj/item/paper/sierra/captain_fax,
/obj/machinery/recharger/wallcharger{
Expand Down Expand Up @@ -116498,7 +116508,8 @@
"rfp" = (
/obj/structure/table/steel,
/obj/machinery/photocopier/faxmachine{
department = "CE"
department = "CE";
destination = "NanoTrasen Central Command"
},
/obj/machinery/requests_console{
announcementConsole = 1;
Expand Down Expand Up @@ -117138,7 +117149,8 @@
"rkb" = (
/obj/structure/table/standard,
/obj/machinery/photocopier/faxmachine{
department = "CMO"
department = "CMO";
destination = "NanoTrasen Central Command"
},
/obj/floor_decal/corner/blue{
dir = 10
Expand Down Expand Up @@ -128081,7 +128093,7 @@
/obj/floor_decal/corner/darkblue/mono,
/obj/floor_decal/industrial/outline/yellow,
/obj/floor_decal/spline/fancy/black,
/obj/random/documents,
/obj/item/reagent_containers/food/drinks/glass2/coffeecup/NT,
/turf/simulated/floor/tiled/dark/monotile,
/area/bridge)
"sMY" = (
Expand Down Expand Up @@ -152643,7 +152655,8 @@
"wuk" = (
/obj/structure/table/woodentable_reinforced,
/obj/machinery/photocopier/faxmachine{
department = "Chief Steward"
department = "Chief Steward";
destination = "NanoTrasen Central Command"
},
/obj/machinery/light,
/turf/simulated/floor/wood,
Expand Down
2 changes: 1 addition & 1 deletion maps/sierra/z6_admin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -10898,7 +10898,7 @@
},
/obj/structure/table/steel_reinforced,
/obj/machinery/photocopier/faxmachine/centcomm{
department = "Central Command";
department = "NanoTrasen Central Command";
desc = "Fax machine, called in honor of the legendary bureaucrat. It has small keyboard so you can write answers right there!";
name = "fox machine"
},
Expand Down
3 changes: 2 additions & 1 deletion mods/_maps/farfleet/maps/farfleet-1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2949,7 +2949,8 @@
"lU" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/photocopier/faxmachine{
department = "Pioneer Corps Craft"
department = "Pioneer Corps Craft";
destination = "ICCGN PC Konigsberg Command Relay"
},
/obj/structure/sign/iccg{
pixel_y = 32
Expand Down
3 changes: 2 additions & 1 deletion mods/_maps/sentinel/maps/sentinel-1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2014,7 +2014,8 @@
},
/obj/machinery/photocopier/faxmachine{
send_access = list();
department = "Sol 5th Fleet Patrol Craft"
department = "Sol 5th Fleet Patrol Craft";
destination = "SFV Stinger Command Department"
},
/obj/floor_decal/corner/blue{
dir = 5
Expand Down
1 change: 1 addition & 0 deletions mods/utility_items/_utility_items.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "code/colony_random.dm"
#include "code/multimeter.dm"
#include "code/living_adv.dm"
#include "code/faxmachine.dm"
#include "code/noose.dm"
#include "code/wires.dm"
#include "code/reagents.dm"
Expand Down
7 changes: 7 additions & 0 deletions mods/utility_items/code/faxmachine.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/obj/machinery/photocopier/faxmachine
var/is_centcom = FALSE // Determines if the fax is intended for admin use. If so, ignores all restrictions on receiving messages, and will notify admins when a fax is received.

/obj/machinery/photocopier/faxmachine/can_receive_fax()
if(is_centcom == TRUE)
return TRUE
. = ..()
8 changes: 3 additions & 5 deletions mods/utility_items/maps/skrell-sierrabay.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -487,11 +487,9 @@
/area/ship/skrellscoutship/forestorage)
"bQ" = (
/obj/structure/table/glass,
/obj/item/folder/blue{
pixel_x = -8
/obj/machinery/photocopier/faxmachine{
department = "Skrellian Scout Vessel"
},
/obj/machinery/recharger,
/obj/item/folder/red,
/turf/simulated/floor/tiled/skrell/red,
/area/ship/skrellscoutship/command/bridge)
"bR" = (
Expand Down Expand Up @@ -4911,7 +4909,7 @@
icon_state = "tube1"
},
/obj/item/toy/icarus_model{
name = "table-top SDFSV Kshar'vara model";
name = "table-top SDFSV Kshar'va model";
desc = "A model of the Skrell mothership, mounted on a wooden stand. The stand is engraved with the words, 'We remember our home, our guard will be eternal.' The small lights on the hull and the ion engines still glow and flicker.";
color = "#00e1ff";
pixel_y = 12
Expand Down

0 comments on commit 8b1c6af

Please sign in to comment.