cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11691 from TDSSS/lavaland-fax

Browse Source 
Gives lavaland syndie base a fax (+some small other changes)
This commit is contained in:
variableundefined
2019-08-23 08:33:04 -04:00
committed by GitHub
parent 70ab02e1f9 40de73d0ee
commit a42226c112
4 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+1 -1
View File
@@ -2171,7 +2171,7 @@
var/obj/item/paper/P = new /obj/item/paper(null) //hopefully the null loc won't cause trouble for us
if(!fax)
var/list/departmentoptions = alldepartments + "All Departments"
var/list/departmentoptions = alldepartments + hidden_departments + "All Departments"
destination = input(usr, "To which department?", "Choose a department", "") as null|anything in departmentoptions
if(!destination)
qdel(P)
code/modules/paperwork/faxmachine.dm
+23 -2
View File
@@ -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
@@ -10,6 +11,7 @@ var/global/list/fax_blacklist = list()
icon_state = "fax"
insert_anim = "faxsend"
var/fax_network = "Local Fax Network"
var/syndie_restricted = FALSE //is it a syndicate base fax restricted from contacting NT assets?
var/long_range_enabled = 0 // Can we send messages off the station?
req_one_access = list(access_lawyer, access_heads, access_armory)
@@ -35,7 +37,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 +45,17 @@ 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
syndie_restricted = 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 +132,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 +168,14 @@ var/global/list/fax_blacklist = list()
if(emagged)
combineddepartments += hidden_admin_departments.Copy()
combineddepartments += hidden_departments.Copy()
if(syndie_restricted)
combineddepartments = hidden_admin_departments.Copy()
combineddepartments += hidden_departments.Copy()
for(var/obj/machinery/photocopier/faxmachine/F in allfaxes)
if(F.emagged)//we can contact emagged faxes on the station
combineddepartments |= F.department
destination = input(usr, "To which department?", "Choose a department", "") as null|anything in combineddepartments
if(!destination)