diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm index 301dd5086b2..c1828c53e82 100644 --- a/code/datums/spells/knock.dm +++ b/code/datums/spells/knock.dm @@ -34,7 +34,7 @@ /obj/effect/proc_holder/spell/aoe_turf/knock/greater name = "Greater Knock" - desc = "On first cast, will remove access restrictions on all airlocks on the Cyberiad, and announce this spell's use to the station. On any further cast, will open all doors in sight. Cannot be refunded once bought!" + desc = "On first cast, will remove access restrictions on all airlocks on the station, and announce this spell's use to the station. On any further cast, will open all doors in sight. Cannot be refunded once bought!" charge_max = 200 invocation = "MAIOR OXIN FIERA" @@ -54,4 +54,4 @@ command_announcement.Announce("We have removed all access requirements on your station's airlocks. You can thank us later!", "Greetings!", 'sound/misc/notice2.ogg', , , "Space Wizard Federation Message") else ..() - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 929d7372752..f5aa02d6eb4 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -84,7 +84,7 @@ var/dead_notes = input("Insert any relevant notes") var/obj/item/paper/R = new(user.loc) R.name = "Official Coroner's Report - [dead_name]" - R.info = "NanoTrasen Science Station Cyberiad - Coroner's Report

Name of Deceased: [dead_name]

Rank of Deceased: [dead_rank]

Time of Death: [dead_tod]

Cause of Death: [dead_cause]

Trace Chemicals: [dead_chems]

Additional Coroner's Notes: [dead_notes]

Coroner's Signature: " + R.info = "Nanotrasen Science Station [using_map.station_short] - Coroner's Report

Name of Deceased: [dead_name]

Rank of Deceased: [dead_rank]

Time of Death: [dead_tod]

Cause of Death: [dead_cause]

Trace Chemicals: [dead_chems]

Additional Coroner's Notes: [dead_notes]

Coroner's Signature: " playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) sleep(10) user.put_in_hands(R) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 6c726060312..a83a09d639c 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -1636,7 +1636,7 @@
  • The Chief Engineer is bound to the same rules regarding the axe as Atmospheric Technicians;
  • The Chief Engineer is permitted to carry a telescopic baton and a flash;
  • The Chief Engineer is responsible for maintaining the integrity of the Gravitational Singularity Engine and/or the Supermatter Engine and/or the Tesla Engine. Neglecting this duty is grounds for termination should the Engine malfunction;
    • -
  • The Chief Engineer is responsible for maintaining the integrity of the Cyberiad's Atmospherics System. Failure to maintain this integrity is grounds for termination;
    • +
  • The Chief Engineer is responsible for maintaining the integrity of the station's Atmospherics System. Failure to maintain this integrity is grounds for termination;
  • The Chief Engineer may declare an area "Condemned", if it is damaged to the point where repairs cannot reasonably be completed within an acceptable frame of time;
  • The Chief Engineer is permitted to grant Building Permits to crewmembers, but must keep the Station Blueprints in a safe location at all times.
    • @@ -1652,7 +1652,7 @@
  • Engineers must constantly monitor the Supermatter Engine, if it is the chosen method of power generation, if it is currently active (ie, under Emitter Fire). This is not negotiable;
  • Engineers must respond promptly to breaches, regardless of size. Failure to report within fifteen (15) minutes will be considered a breach of Standard Operating Procedure, unless there are no spare Engineers to report or an Atmospheric Technician has arrived on scene first. All Hazard Zones must be cordoned off with Engineering Tape, for the sake of everyone else;
  • Engineers are permitted to hack doors to gain unauthorized access to locations if said locations happen to require urgent repairs;
    • -
  • Engineers are to maintain the integrity of the Cyberiad's Power Network. In addition, hotwiring the Gravitational Singularity Engine, Supermatter Engine or Tesla Engine is strictly forbidden;
    • +
  • Engineers are to maintain the integrity of the station's Power Network. In addition, hotwiring the Gravitational Singularity Engine, Supermatter Engine or Tesla Engine is strictly forbidden;
  • Engineers must ensure there is at least one (1) engineering hardsuit available on the station at all times, unless there is an emergency that requires the use of all suits.


    • @@ -2063,7 +2063,7 @@
  • The Security Pod Pilot is not permitted to use the Laser Module during arrests, and must switch to the Disabler Module;
  • The Security Pod Pilot must carry around a spare set of tools and energy cell, for their own sake;
  • The Security Pod Pilot may immediately, and without warning, conduct arrests on individuals attempting to perform E.V.A actions near the AI Satellite. Exception is made if the AI Unit is malfunctioning;
    • -
  • The Security Pod Pilot is not permitted to explore the area surrounding the station, and must therefore be confined to the immediate orbital area of the NSS Cyberiad, the NXS Klapaucius (the Telecomms Satellite) and the Mining/Research Asteroid. Exception is made if the Head of Security permits otherwise.
    • +
  • The Security Pod Pilot is not permitted to explore the area surrounding the station, and must therefore be confined to the immediate orbital area of the station, the NXS Klapaucius (the Telecomms Satellite) and the Mining/Research Asteroid. Exception is made if the Head of Security permits otherwise.

    • Code Blue @@ -2506,11 +2506,11 @@
  • The Captain is not permitted to perform regular Security Duty. However, they may still assist Security if they are understaffed, or if they see a crime being committed. However, the Captain is not permitted to take items from the Armory under normal circumstances, unless authorized by the Head of Security. In addition, the Captain may not requisition weaponry for themselves from Cargo and/or Science, unless there's an immediate threat to station and/or crew;
  • If a Department lacks a Head of Staff, the Captain should make reasonable efforts to appoint an Acting Head of Staff, if there are available personnel to fill the position;
  • The Captain is to ensure that Space Law is being correctly applied. This should be done in cooperation with the Head of Security;
    • -
  • The Captain is not to leave the NSS Cyberiad unless given specific permission by Central Command, or it happens to be the end of the shift. This includes via space or via the Gateway. To do so is to be considered abandoning their posts and is grounds for termination;
    • +
  • The Captain is not to leave the station unless given specific permission by Central Command, or it happens to be the end of the shift. This includes via space or via the Gateway. To do so is to be considered abandoning their posts and is grounds for termination;
  • The Captain must keep the Nuclear Authentication Disk on their person at all times or, failing that, in the possession of the Head of Security or Blueshield;
  • The Captain is to attempt to resolve every issue that arises in Command locally before contacting Central Command;
  • The Captain is not permitted to carry their Antique Laser Gun or Space Armor unless there's an immediate emergency that requires attending to;
    • -
  • The Captain, despite being in charge of the Cyberiad, is not independent from Nanotrasen. Any attempts to disregard general company policy are to be considered an instant condition for contract termination;
    • +
  • The Captain, despite being in charge of the station, is not independent from Nanotrasen. Any attempts to disregard general company policy are to be considered an instant condition for contract termination;
  • The Captain may only promote personnel to a Acting Head of Staff position if there is no assigned Head of Staff associated with the Department. Said Acting Head of Staff must be a member of the Department they are to lead. See below for more information on Chain of Command;
  • The Captain may not fire any Head of Staff without reasonable justification (ie, incompetency, criminal activity, or otherwise any action that endangers/compromises the station and/or crew). The Captain may not fire any Central Command VIPs (ie, Blueshield, Magistrate, Nanotrasen Representative) without permission from Central Command, unless they are blatantly acting against the well-being and safety of the crew and station.

    • @@ -2560,4 +2560,4 @@ - "} \ No newline at end of file + "} diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 6a540e65096..6495c8fabfd 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1988,7 +1988,7 @@ P.name = "Central Command - paper" var/stypes = list("Handle it yourselves!","Illegible fax","Fax not signed","Not Right Now","You are wasting our time", "Keep up the good work", "ERT Instructions") var/stype = input(src.owner, "Which type of standard reply do you wish to send to [H]?","Choose your paperwork", "") as null|anything in stypes - var/tmsg = "



    Nanotrasen Science Station Cyberiad


    NAS Trurl Communications Department Report


    " + var/tmsg = "



    Nanotrasen Science Station [using_map.station_short]


    NAS Trurl Communications Department Report


    " if(stype == "Handle it yourselves!") tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.

    Please proceed in accordance with Standard Operating Procedure and/or Space Law. You are fully trained to handle this situation without Central Command intervention.

    This is an automatic message." else if(stype == "Illegible fax") diff --git a/code/modules/events/traders.dm b/code/modules/events/traders.dm index 0b2ee2204c6..cbeceac1696 100644 --- a/code/modules/events/traders.dm +++ b/code/modules/events/traders.dm @@ -65,7 +65,7 @@ var/global/list/unused_trade_stations = list("sol") /datum/event/traders/proc/greet_trader(var/mob/living/carbon/human/M) to_chat(M, "You are a trader!") to_chat(M, "You are currently docked at [get_area(M)].") - to_chat(M, "You are about to trade with NSS Cyberiad.") + to_chat(M, "You are about to trade with [station_name()].") to_chat(M, "Negotiate an agreement, and request docking.") spawn(25) show_objectives(M.mind) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index cd539570219..efb810cae20 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -881,7 +881,7 @@ var/global/trade_dockrequest_timelimit = 0 docking_request = 1 var/possible_destinations_dock var/possible_destinations_nodock - var/docking_request_message = "A trading ship has requested docking aboard the NSS Cyberiad for trading. This request can be accepted or denied using a communications console." + var/docking_request_message = "A trading ship has submitted a request to dock for trading. This request can be accepted or denied using a communications console." /obj/machinery/computer/shuttle/trade/attack_hand(mob/user) if(world.time < trade_dock_timelimit) diff --git a/config/names/dreams.txt b/config/names/dreams.txt index 9dffde8e189..89f559dae88 100644 --- a/config/names/dreams.txt +++ b/config/names/dreams.txt @@ -23,6 +23,8 @@ freezing the sun a hat the Cyberiad +the Cerebron +the Kerberos a ruined station a planet plasma @@ -80,8 +82,8 @@ the pod pilot the barber the mechanic the magistrate -the nanotrasen representative -the blueshield +the nanotrasen representative +the blueshield a mouse an ert member a beach @@ -93,18 +95,18 @@ the bar the rain a skrell an unathi -a tajaran -a vulpkanin -a slime -an ipc -a vox -a plasmaman -a grey -a kidan -a diona -a drask +a tajaran +a vulpkanin +a slime +an ipc +a vox +a plasmaman +a grey +a kidan +a diona +a drask the ai core the mining station -the research station +the research station a beaker of strange liquid -Captain [DREAMER] \ No newline at end of file +Captain [DREAMER] diff --git a/nano/templates/shuttle_console.tmpl b/nano/templates/shuttle_console.tmpl index d16f39a8b20..8277e92eb76 100644 --- a/nano/templates/shuttle_console.tmpl +++ b/nano/templates/shuttle_console.tmpl @@ -1,4 +1,4 @@ - @@ -30,8 +30,8 @@ Used In File(s): /code/modules/shuttle/shuttle.dm
    {{/if}} {{/if}} - + {{if data.docking_request}} -
    {{:helper.link('Request docking at NSS Cyberiad', 'share-square-o', {'request' : 1})}}
    +
    {{:helper.link('Request docking at the station', 'share-square-o', {'request' : 1})}}
    {{/if}} -{{/if}} \ No newline at end of file +{{/if}}