diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 612cb658016..ad5f9483a8f 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -657,9 +657,9 @@ var/list/ghostteleportlocs = list() L.update_icon() on_peaceful = newvalue if(newvalue) - announce_here("Depot Code WHITE","Depot access granted to visitors. Defenses deactivated. Any attempt to steal depot supplies will result in revocation of access and summary execution!") + announce_here("Depot Visitor","A Syndicate agent is visiting the depot.") else - announce_here("Depot Alert","Depot access revoked. Defenses active! Shoot all visitors on sight.") + announce_here("Depot Alert","A visiting agent has betrayed the Syndicate. Shoot all visitors on sight!") if(bycomputer) message_admins("Syndicate Depot visitor mode deactivated. Visitors:") else diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm index 2a7ea9f6a4f..cc6abff95b4 100644 --- a/code/game/machinery/computer/depot.dm +++ b/code/game/machinery/computer/depot.dm @@ -50,7 +50,7 @@ /obj/machinery/computer/syndicate_depot/proc/has_security_lockout(var/mob/user) if(security_lockout) playsound(user, 'sound/machines/buzz-sigh.ogg', 50, 0) - to_chat(user, "[src] is under security lockout.") + to_chat(user, "[src] is under security lockout.") return TRUE return FALSE @@ -167,7 +167,7 @@ return playsound(user, sound_click, 20, 1) if(depotarea) - depotarea.activate_self_destruct("Fusion reactor containment failure. All hands, evacuate. All hands, evacuate. Core breach imminent!", TRUE, user) + depotarea.activate_self_destruct("Fusion reactor containment field disengaged. All hands, evacuate. All hands, evacuate!", TRUE, user) @@ -181,19 +181,18 @@ /obj/machinery/computer/syndicate_depot/syndiecomms/get_menu(var/mob/user) var/menu = "Syndicate Communications Relay
" - if(message_sent) - menu += "

Communications quota used. Unable to transmit messages at this time." - else - menu += "

Contact Syndicate Command (one-time use)" + menu += "

One-Time Uplink to Syndicate HQ: [message_sent ? "ALREADY USED" : "AVAILABLE (Open Channel)"]" if(depotarea.on_peaceful) + menu += "

Visiting Agents: VISIT IN PROGRESS. " if(user in depotarea.peaceful_visitors) - menu += "

[user] is recognized as a friendly visitor to the depot." + menu += "[user] IS RECOGNIZED AS VISITING AGENT" else - menu += "

(SYNDIE AGENT) Request visitor access (in addition to existing visitors)" + menu += "[user] NOT RECOGNIZED. (Sign-in as Agent)" if(check_rights(R_ADMIN, 0, user)) - menu += "

(ADMIN/DEBUG) End visit. Re-power defense grid." + menu += "
ADMIN: (End Visitor Mode)" + else - menu += "

(SYNDIE AGENT) Request visitor access" + menu += "

Visiting Agents: NONE (Sign-in as Agent)" return menu /obj/machinery/computer/syndicate_depot/syndiecomms/primary(var/mob/user) @@ -204,7 +203,7 @@ return if(message_sent) playsound(user, 'sound/machines/buzz-sigh.ogg', 50, 0) - to_chat(user, "[src] has already been used to transmit a message to the Syndicate.") + to_chat(user, "[src] has already been used to transmit a message to the Syndicate.") return message_sent = TRUE if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR) @@ -214,10 +213,11 @@ return Syndicate_announce(input, user) to_chat(user, "Message transmitted.") - log_say("[key_name(user)] has made a Syndicate announcement from the depot: [input]") + log_say("[key_name(user)] has sent a Syndicate comms message from the depot: [input]", user) else - to_chat(user, "[src] requires authentication with syndicate codewords, which you do not know.") + to_chat(user, "[src] requires authentication with syndicate codewords, which you do not know.") raise_alert("Detected unauthorized access to [src]!") + updateUsrDialog() /obj/machinery/computer/syndicate_depot/syndiecomms/secondary(var/mob/user, var/subcommand) if(..()) @@ -226,7 +226,7 @@ return if(depotarea) if(depotarea.local_alarm || depotarea.called_backup || depotarea.used_self_destruct) - to_chat(user, "[src]: Request denied. Depot under security alert. No visitors permitted.") + to_chat(user, "Visitor sign-in is not possible while the depot is on security alert.") else if(depotarea.on_peaceful) if(subcommand == DEPOT_VISITOR_END) if(check_rights(R_ADMIN, 0, user)) @@ -234,29 +234,38 @@ else if (subcommand == DEPOT_VISITOR_ADD) if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR) if(user in depotarea.peaceful_visitors) - to_chat(user, "[src]: [user], you are already recognized as a depot visitor.") + to_chat(user, "[user] is already signed in as a visiting agent.") else grant_syndie_faction(user) else - to_chat(user, "[src]: Request denied. You are not recognized as an Agent of the Syndicate.") + to_chat(user, "Only verified agents of the Syndicate may sign in as visitors. Everyone else will be shot on sight.") else if(subcommand == DEPOT_VISITOR_START) if(depotarea.something_looted) - to_chat(user, "[src]: Request denied. You have already stolen from us, and NOW you want to claim you are a friend? Die, scum!") + to_chat(user, "Visitor sign-in is not possible after supplies have been taken from the depot.") raise_alert("Thieving con-men detected!") else if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR) grant_syndie_faction(user) depotarea.peaceful_mode(TRUE, TRUE) else - to_chat(user, "[src]: Request denied. You are not recognized as an Agent of the Syndicate.") + to_chat(user, "Only verified agents of the Syndicate may sign in as visitors. Everyone else will be shot on sight.") else - to_chat(user, "[src]: Unrecognized subcommand: [subcommand]") + to_chat(user, "Unrecognized subcommand: [subcommand]") else - to_chat(user, "[src]: Request denied. Unable to uplink to depot network.") + to_chat(user, "ERROR: [src] is unable to uplink to depot network.") + updateUsrDialog() /obj/machinery/computer/syndicate_depot/syndiecomms/proc/grant_syndie_faction(var/mob/user) user.faction += "syndicate" depotarea.peaceful_visitors += user - to_chat(user, "[src]: Depot access granted for: [user]") + to_chat(user, {"
Welcome, Agent. + You are now signed-in as a depot visitor. + Any other agents with you MUST sign in themselves. + You may explore all rooms here, except for bolted ones. + Your agent ID will give you access to most doors and computers. + Standard Syndicate regulations apply to your visit. + This means if ANY of you attack facility staff, break into anything, sabotage the facility, or bring non-agents here, then ALL of you will be summarily executed. + Enjoy your stay. + "}) /obj/machinery/computer/syndicate_depot/syndiecomms/power_change() . = ..() @@ -331,11 +340,12 @@ var/menutext = "Syndicate Teleporter Control
" findbeacon() if(mybeacon) - menutext += {"

(SYNDIE AGENT) Syndicate Teleporter Beacon: [mybeacon.enabled ? "ON" : "OFF"]
"} + menutext += {"

Incoming Teleport Beacon: [mybeacon.enabled ? "ON" : "OFF"] ([mybeacon.enabled ? "Disable" : "Enable"])
"} else - menutext += {"

Status: Reconnecting to beacon..."} - if(check_rights(R_ADMIN, 0, user)) - menutext += {"

(ADMIN/DEBUG) Syndicate Agent Insertion Portal: [portal_enabled ? "ON" : "OFF"]
"} + menutext += {"

Incoming Teleport Beacon: Reconnecting to beacon..."} + menutext += {"

Outgoing Teleport Portal: [portal_enabled ? "ON" : "OFF"]"} + if(depotarea.on_peaceful || check_rights(R_ADMIN, 0, user)) + menutext += {" ([portal_enabled ? "Disable" : "Enable"])
"} return menutext /obj/machinery/computer/syndicate_depot/teleporter/primary(var/mob/user) @@ -345,18 +355,20 @@ to_chat(user, "Unable to connect to teleport beacon.") return var/bresult = mybeacon.toggle() - to_chat(user, "Syndicate Teleporter Beacon: [bresult ? "ONLINE" : "OFFLINE"]") + to_chat(user, "Syndicate Teleporter Beacon: [bresult ? "ON" : "OFF"]") + updateUsrDialog() /obj/machinery/computer/syndicate_depot/teleporter/secondary(var/mob/user) if(..()) return - if(!check_rights(R_ADMIN, 0, user)) + if(!depotarea.on_peaceful && !check_rights(R_ADMIN, 0, user)) return if(!portal_enabled && myportal) - to_chat(user, "Syndicate Agent Insertion Portal: deactivating... please wait...") + to_chat(user, "Outgoing Teleport Portal: deactivating... please wait...") return toggle_portal() - to_chat(user, "Syndicate Agent Insertion Portal: [portal_enabled ? "ONLINE" : "OFFLINE"]") + to_chat(user, "Outgoing Teleport Portal: [portal_enabled ? "ON" : "OFF"]") + updateUsrDialog() /obj/machinery/computer/syndicate_depot/teleporter/proc/toggle_portal() portal_enabled = !portal_enabled