diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs index 9cd9976cea9..b49bc55d1be 100644 --- a/Content.Server/Access/Systems/IdCardSystem.cs +++ b/Content.Server/Access/Systems/IdCardSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.Popups; using Robust.Shared.Prototypes; using Robust.Shared.Random; +using Content.Server.Kitchen.EntitySystems; namespace Content.Server.Access.Systems; @@ -18,6 +19,7 @@ public sealed class IdCardSystem : SharedIdCardSystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly MicrowaveSystem _microwave = default!; public override void Initialize() { @@ -27,9 +29,13 @@ public override void Initialize() private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowavedEvent args) { + if (!component.CanMicrowave || !TryComp(args.Microwave, out var micro) || micro.Broken) + return; + if (TryComp(uid, out var access)) { float randomPick = _random.NextFloat(); + // if really unlucky, burn card if (randomPick <= 0.15f) { @@ -46,6 +52,14 @@ private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowa EntityManager.QueueDeleteEntity(uid); return; } + + //Explode if the microwave can't handle it + if (!micro.CanMicrowaveIdsSafely) + { + _microwave.Explode((args.Microwave, micro)); + return; + } + // If they're unlucky, brick their ID if (randomPick <= 0.25f) { @@ -70,6 +84,7 @@ private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowa _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.Microwave)} added {random.ID} access to {ToPrettyString(uid):entity}"); + } } } diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs index 9e91f9f9cbe..90c99df7db2 100644 --- a/Content.Server/Body/Components/MetabolizerComponent.cs +++ b/Content.Server/Body/Components/MetabolizerComponent.cs @@ -62,16 +62,6 @@ public sealed partial class MetabolizerComponent : Component [DataField("maxReagents")] public int MaxReagentsProcessable = 3; - /// - /// Frontier - /// - /// How many poisons can this metabolizer process at once? - /// Used to nerf 'stacked poisons' where having 5+ different poisons in a syringe, even at low - /// quantity, would be muuuuch better than just one poison acting. - /// - [DataField("maxPoisons")] - public int MaxPoisonsProcessable = 3; - /// /// A list of metabolism groups that this metabolizer will act on, in order of precedence. /// diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs index 9a357d300f7..dfdbaf0edc9 100644 --- a/Content.Server/Body/Systems/MetabolizerSystem.cs +++ b/Content.Server/Body/Systems/MetabolizerSystem.cs @@ -142,7 +142,7 @@ private void TryMetabolize(Entity(reagent.Prototype, out var proto)) @@ -158,10 +158,11 @@ private void TryMetabolize(Entity= ent.Comp1.MaxPoisonsProcessable && proto.Metabolisms.ContainsKey("Poison")) + + // Frontier: all cryogenic reagents in the solution should be processed, others should be limited (buff cryo meds) + if (reagents >= ent.Comp1.MaxReagentsProcessable && !proto.Metabolisms.ContainsKey("Cryogenic")) continue; + // End Frontier // loop over all our groups and see which ones apply @@ -219,10 +220,10 @@ private void TryMetabolize(Entity FixedPoint2.Zero) { solution.RemoveReagent(reagent, mostToRemove); - // frontier modified - // We have processed a poison, so count it towards the cap - if (proto.Metabolisms.ContainsKey("Poison")) - poisons++; + // Frontier: do not count cryogenics chems against the reagent limit (to buff cryo meds) + if (!proto.Metabolisms.ContainsKey("Cryogenic")) + reagents++; + // End Frontier } } diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index 3be444bea39..8ddc007858a 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -104,6 +104,12 @@ public sealed partial class MicrowaveComponent : Component /// Chance of lightning occurring when we microwave a metallic object [DataField, ViewVariables(VVAccess.ReadWrite)] public float LightningChance = .75f; + + /// + /// If this microwave can give ids accesses without exploding + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public bool CanMicrowaveIdsSafely = true; } public sealed class BeingMicrowavedEvent : HandledEntityEventArgs diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index 83560b620c6..6ed0b5f0bc4 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -1,3 +1,4 @@ +using Content.Server.Administration.Logs; using Content.Server.Body.Systems; using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.Construction; @@ -15,6 +16,7 @@ using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Construction.EntitySystems; +using Content.Shared.Database; using Content.Shared.Destructible; using Content.Shared.FixedPoint; using Content.Shared.Interaction; @@ -35,7 +37,8 @@ using System.Linq; using Robust.Shared.Prototypes; using Robust.Shared.Timing; -using Content.Shared.Access.Components; +using Content.Shared.Stacks; +using Content.Server.Construction.Components; namespace Content.Server.Kitchen.EntitySystems { @@ -59,6 +62,9 @@ public sealed class MicrowaveSystem : EntitySystem [Dependency] private readonly UserInterfaceSystem _userInterface = default!; [Dependency] private readonly HandsSystem _handsSystem = default!; [Dependency] private readonly SharedItemSystem _item = default!; + [Dependency] private readonly SharedStackSystem _stack = default!; + [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private readonly IAdminLogManager _adminLogger = default!; [ValidatePrototypeId] private const string MalfunctionSpark = "Spark"; @@ -394,6 +400,23 @@ public static bool HasContents(MicrowaveComponent component) return component.Storage.ContainedEntities.Any(); } + /// + /// Explodes the microwave internally, turning it into a broken state, destroying its board, and spitting out its machine parts + /// + /// + public void Explode(Entity ent) + { + ent.Comp.Broken = true; // Make broken so we stop processing stuff + _explosion.TriggerExplosive(ent); + if (TryComp(ent, out var machine)) + { + _container.CleanContainer(machine.BoardContainer); + _container.EmptyContainer(machine.PartContainer); + } + + _adminLogger.Add(LogType.Action, LogImpact.Medium, + $"{ToPrettyString(ent)} exploded from unsafe cooking!"); + } /// /// Handles the attempted cooking of unsafe objects /// @@ -411,7 +434,7 @@ private void RollMalfunction(Entity - /// splits the solution taking the specified amount of reagents proportionally to their quantity. + /// Splits a solution, taking the specified amount of reagents proportionally to their quantity. /// /// The total amount of solution to remove and return. - /// a new solution of equal proportions to the original solution + /// A new solution of equal proportions to the original. public Solution SplitSolution(FixedPoint2 toTake) { if (toTake <= FixedPoint2.Zero) @@ -674,58 +675,123 @@ public Solution SplitSolution(FixedPoint2 toTake) return newSolution; } + // Frontier: cryogenics per-reagent filter function (#1443, #1533) /// - /// Frontier - /// splits the solution taking up to the specified amount of each reagent from the solution. - /// If the solution has less of a reagent than the specified amount, it will take all of that reagent. + /// Splits a solution, taking the specified amount of each reagent from the solution. + /// If any reagent in the solution has less volume than specified, it will all be transferred into the new solution. /// - /// How much of each reagent to take - /// a new solution containing the reagents taken from the original solution - public Solution SplitSolutionReagentsEvenly(FixedPoint2 toTakePer) + /// How much of each reagent to take. + /// A new solution containing the reagents taken from the original solution. + public Solution SplitSolutionPerReagent(FixedPoint2 toTakePer) { - var splitSolution = new Solution(); - if (toTakePer <= FixedPoint2.Zero) - return splitSolution; - var reagentsCount = Contents.Count; - var reagentsToRemove = new List(); - for (var i = 0; i < reagentsCount; i++) + return new Solution(); + + var origVol = Volume; + Solution newSolution = new Solution(Contents.Count) { Temperature = Temperature }; + + for (var i = Contents.Count - 1; i >= 0; i--) // iterate backwards because of remove swap. { - var currentReagent = Contents[i]; + var (reagent, quantity) = Contents[i]; - if (currentReagent.Quantity <= FixedPoint2.Zero) + // If the reagent has more than enough volume to remove, no need to remove it from the list. + if (quantity > toTakePer) { - reagentsToRemove.Add(currentReagent); - continue; + Contents[i] = new ReagentQuantity(reagent, quantity - toTakePer); + newSolution.Contents.Add(new ReagentQuantity(reagent, toTakePer)); + Volume -= toTakePer; + } + else + { + Contents.RemoveSwap(i); + //Only add positive quantities to our new solution. + if (quantity > 0) + { + newSolution.Contents.Add(new ReagentQuantity(reagent, quantity)); + Volume -= quantity; + } } + } + + // If old solution is empty, invalidate old solution and transfer all volume to new. + if (Volume <= 0) + { + RemoveAllSolution(); + newSolution.Volume = origVol; + } + else + { + newSolution.Volume = origVol - Volume; + _heatCapacityDirty = true; + } + newSolution._heatCapacityDirty = true; + + ValidateSolution(); + newSolution.ValidateSolution(); + + return newSolution; + } + + /// + /// Splits a solution, taking the specified amount of each reagent specified in reagents from the solution. + /// If any reagent in the solution has less volume than specified, it will all be transferred into the new solution. + /// + /// How much of each reagent to take. + /// A new solution containing the reagents taken from the original solution. + public Solution SplitSolutionPerReagentWithOnly(FixedPoint2 toTakePer, params string[] reagents) + { + if (toTakePer <= FixedPoint2.Zero) + return new Solution(); + + var origVol = Volume; + Solution newSolution = new Solution(Contents.Count) { Temperature = Temperature }; + + for (var i = Contents.Count - 1; i >= 0; i--) // iterate backwards because of remove swap. + { + var (reagent, quantity) = Contents[i]; + + // Each reagent to split must be in the set given. + if (!reagents.Contains(reagent.Prototype)) + continue; - if (currentReagent.Quantity <= toTakePer) + // If the reagent has more than enough volume to remove, no need to remove it from the list. + if (quantity > toTakePer) { - splitSolution.AddReagent(currentReagent); - reagentsToRemove.Add(currentReagent); + Contents[i] = new ReagentQuantity(reagent, quantity - toTakePer); + newSolution.Contents.Add(new ReagentQuantity(reagent, toTakePer)); + Volume -= toTakePer; } else { - splitSolution.AddReagent(currentReagent.Reagent, toTakePer); - RemoveReagent(currentReagent.Reagent, toTakePer); + Contents.RemoveSwap(i); + //Only add positive quantities to our new solution. + if (quantity > 0) + { + newSolution.Contents.Add(new ReagentQuantity(reagent, quantity)); + Volume -= quantity; + } } } - foreach (var reagent in reagentsToRemove) + // If old solution is empty, invalidate old solution and transfer all volume to new. + if (Volume <= 0) { - RemoveReagent(reagent); - } - if (Volume == FixedPoint2.Zero) RemoveAllSolution(); - - _heatCapacityDirty = true; - splitSolution._heatCapacityDirty = true; + newSolution.Volume = origVol; + } + else + { + newSolution.Volume = origVol - Volume; + _heatCapacityDirty = true; + } + newSolution._heatCapacityDirty = true; ValidateSolution(); - splitSolution.ValidateSolution(); + newSolution.ValidateSolution(); - return splitSolution; + return newSolution; } + // End Frontier /// /// Variant of that doesn't return a new solution containing the removed reagents. diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs index c3283f1e7fb..43565c71838 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs @@ -310,22 +310,40 @@ public Solution SplitSolution(Entity soln, FixedPoint2 quanti return splitSol; } + // Frontier: cryogenics filtering functions (#1443) /// - /// Frontier /// Splits a solution removing a specified amount of each reagent, if available. /// /// The container to split the solution from. /// The amount of each reagent to split. - /// - public Solution SplitSolutionReagentsEvenly(Entity soln, FixedPoint2 quantity) + /// The solution that was removed. + public Solution SplitSolutionPerReagent(Entity soln, FixedPoint2 quantity) + { + var (uid, comp) = soln; + var solution = comp.Solution; + + var splitSol = solution.SplitSolutionPerReagent(quantity); + UpdateChemicals(soln); + return splitSol; + } + + /// + /// Splits a solution removing a specified amount of each reagent, if available. + /// + /// The container to split the solution from. + /// The amount of each reagent to split. + /// The list of reagents to split a fixed amount of, if present. + /// The solution that was removed. + public Solution SplitSolutionPerReagentWithOnly(Entity soln, FixedPoint2 quantity, params string[] reagents) { var (uid, comp) = soln; var solution = comp.Solution; - var splitSol = solution.SplitSolutionReagentsEvenly(quantity); + var splitSol = solution.SplitSolutionPerReagentWithOnly(quantity, reagents); UpdateChemicals(soln); return splitSol; } + // End Frontier public Solution SplitStackSolution(Entity soln, FixedPoint2 quantity, int stackCount) { diff --git a/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs b/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs index afcf072a842..f14d8e63dd5 100644 --- a/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs +++ b/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs @@ -38,15 +38,16 @@ public sealed partial class CryoPodComponent : Component /// [ViewVariables(VVAccess.ReadWrite)] [DataField("beakerTransferAmount")] - public float BeakerTransferAmount = .25f;// Frontier: 1<0.25 + public float BeakerTransferAmount = .25f; // Frontier: 1<0.25 (applied per reagent) + // Frontier: more efficient cryogenics (#1443) /// - /// Frontier /// How potent (multiplier) the reagents are when transferred from the beaker to the mob. /// [ViewVariables(VVAccess.ReadWrite)] [DataField("PotencyAmount")] public float PotencyMultiplier = 2f; + // End Frontier /// /// Delay applied when inserting a mob in the pod. diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 31a05b2004c..5a268afbfae 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -440,9 +440,20 @@ private bool TryGetSound( sound = moverModifier.FootstepSoundCollection; return true; } - + + // Frontier: check outer clothes + // If you have a hardsuit or power armor on that goes around your boots, it's the hardsuit that hits the floor. + // Check should happen before NoShoesSilentFootsteps check - loud power armor should count as wearing shoes. + if (_inventory.TryGetSlotEntity(uid, "outerClothing", out var outerClothing) && + TryComp(outerClothing, out var outerModifier)) + { + sound = outerModifier.FootstepSoundCollection; + return true; + } + // End Frontier + // If got the component in yml and no shoes = no sound. Delta V - if (_entities.TryGetComponent(uid, out NoShoesSilentFootstepsComponent? _) & + if (_entities.TryGetComponent(uid, out NoShoesSilentFootstepsComponent? _) && !_inventory.TryGetSlotEntity(uid, "shoes", out var _)) { return false; diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 475f6a46950..e2c290a40f4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5149,3 +5149,38 @@ Entries: message: IFF strobes now come with more powerful LEDs. id: 5048 time: '2024-06-19T18:45:27.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: >- + The NT Naval Command's database on non-NT vessels was corrupted due to a + coffee spill, affecting NT's ability to classify and recognize non-NT + vessels. + id: 5049 + time: '2024-06-21T14:08:42.0000000+00:00' +- author: whatston3 + changes: + - type: Tweak + message: Organs once again metabolize a limited number of reagents at once. + - type: Tweak + message: Cryo pods now only extract cryogenic medicines from beakers. + id: 5050 + time: '2024-06-21T17:02:34.0000000+00:00' +- author: Actualcatmoment + changes: + - type: Add + message: Added hiring, piloting, expedition entries to the Guidebook. + - type: Tweak + message: All Frontier-specific Guidebook entries have been rewritten. + id: 5051 + time: '2024-06-24T06:09:00.0000000+00:00' +- author: Iocanthos and whatston3 + changes: + - type: Add + message: Coffee seeds are now available for planting. + - type: Add + message: >- + Coffee beans can be removed from fruit, roasted, ground and added to hot + water to make coffee. + id: 5052 + time: '2024-06-24T06:13:34.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/bluespace-events/events.ftl b/Resources/Locale/en-US/_NF/bluespace-events/events.ftl index 45b2e6bf175..2a8b21f54fc 100644 --- a/Resources/Locale/en-US/_NF/bluespace-events/events.ftl +++ b/Resources/Locale/en-US/_NF/bluespace-events/events.ftl @@ -18,3 +18,6 @@ station-event-bluespace-wizardfederation-scout-end-announcement = In compliance station-event-bluespace-bloodmoon-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command detected a Bluespace Anomaly in your sector with the signature indicative of the imminent arrival of a Blood Cult's Vessel. Code: Intercept, Expunge, Exterminate, Cauterise. Expect armed opposition, use of lethal force against enemy combatants is mandatory, take no prisoners. Warning! Materials on the Blood Cult's Vessel possess Level 3 Cognitohazard! Local security force is advised to take steps to limit NT personnel's exposure to hazardous materials. Reminder: NT personnel who are granted security clearance for the engagement are required to surrender any hazardous materials to the local security department for containment and undergo a medical examination afterward. station-event-bluespace-bloodmoon-end-announcement = In compliance with NanoTrasen FTL traffic patterns, the Blood Cult's Vessel has been dissipated to ensure non-collision. + +station-event-bluespace-generic-ftl-start-announcement = Attention all NanoTrasen personnel! NanoTrasen Naval Command has detected an unidentified vessel entering the Frontier Sector. NanoTrasen-affiliated captains should approach with caution. NanoTrasen is not liable for damages sustained or loss of life. +station-event-bluespace-generic-ftl-end-announcement = In compliance with NanoTrasen FTL traffic patterns, the unidentified vessel has been dissipated to ensure non-collision. diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index d3201621513..f5faec57240 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -1,6 +1,24 @@ +# Base entries guide-entry-nf14 = New Frontier guide-entry-bank = NT Galactic Bank +guide-entry-piloting = Piloting +guide-entry-hiring = Hiring Crew +guide-entry-expeditions = Expeditions guide-entry-shipyard = Shipyard + +# Expedition faction entries +guide-entry-expedition-faction-carp = Carp +guide-entry-expedition-faction-cultists = Cultists +guide-entry-expedition-faction-dinosaurs = Dinosaurs +guide-entry-expedition-faction-explorers = Explorers +guide-entry-expedition-faction-flesh = Flesh +guide-entry-expedition-faction-gangers = Gangers +guide-entry-expedition-faction-mercenaries = Mercenaries +guide-entry-expedition-faction-silicons = Silicons +guide-entry-expedition-faction-syndicate = Syndicate +guide-entry-expedition-faction-xenos = Xenos + +# Shipyard entries guide-entry-shipyard-ambition = Ambition guide-entry-shipyard-brigand = Brigand guide-entry-shipyard-ceres = Ceres @@ -12,4 +30,4 @@ guide-entry-shipyard-legman = Legman guide-entry-shipyard-liquidator = Liquidator guide-entry-shipyard-pioneer = Pioneer guide-entry-shipyard-searchlight = Searchlight -guide-entry-shipyard-spirit = Spirit \ No newline at end of file +guide-entry-shipyard-spirit = Spirit diff --git a/Resources/Locale/en-US/_NF/metabolism/metabolism-groups.ftl b/Resources/Locale/en-US/_NF/metabolism/metabolism-groups.ftl new file mode 100644 index 00000000000..af1fb19a2a4 --- /dev/null +++ b/Resources/Locale/en-US/_NF/metabolism/metabolism-groups.ftl @@ -0,0 +1 @@ +metabolism-group-cryogenic = Cryogenic diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/ingredients.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/ingredients.ftl new file mode 100644 index 00000000000..4223e13b783 --- /dev/null +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/ingredients.ftl @@ -0,0 +1,2 @@ +reagent-name-coffeegrounds = coffee grounds +reagent-desc-coffeegrounds = Aromatic and richly textured, these grounds exude a robust scent that promises a flavorful brew. diff --git a/Resources/Locale/en-US/_NF/seeds/seeds.ftl b/Resources/Locale/en-US/_NF/seeds/seeds.ftl index bb29d32495d..622f846cabb 100644 --- a/Resources/Locale/en-US/_NF/seeds/seeds.ftl +++ b/Resources/Locale/en-US/_NF/seeds/seeds.ftl @@ -3,3 +3,5 @@ seeds-spesos-name = spesos seeds-spesos-display-name = spesos seeds-pear-name = pear seeds-pear-display-name = pear +seeds-coffee-name = coffee +seeds-coffee-display-name = coffee plant diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl index 08b184fcd7d..6d001253042 100644 --- a/Resources/Locale/en-US/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl @@ -14,13 +14,11 @@ reagent-name-bicaridine = bicaridine reagent-desc-bicaridine = An analgesic which is highly effective at treating brute damage. It's useful for stabilizing people who have been severely beaten, as well as treating less life-threatening injuries. # Frontier: consistent cryogenics descriptors - reagent-name-cryoxadone = cryoxadone -reagent-desc-cryoxadone = Required for the proper function of cryogenics. Useful in treating asphyxiation and bloodloss, but only works in temperatures under 213K. It can treat and rejuvenate plants when applied in small doses. Works regardless of the patient being alive or dead. +reagent-desc-cryoxadone = A cryogenics chemical. Useful in treating asphyxiation and bloodloss, but only works in temperatures under 213K. It can treat and rejuvenate plants when applied in small doses. Works regardless of the patient being alive or dead. reagent-name-doxarubixadone = doxarubixadone reagent-desc-doxarubixadone = A cryogenics chemical. Heals certain types of cellular damage done by Slimes and improper use of other chemicals. Works regardless of the patient being alive or dead. - # End Frontier reagent-name-dermaline = dermaline @@ -134,8 +132,10 @@ reagent-desc-insuzine = Rapidly repairs dead tissue caused by electrocution, but reagent-name-opporozidone = opporozidone reagent-desc-opporozidone= A difficult to synthesize cryogenic drug used to regenerate rotting tissue and brain matter. +# Frontier: consistent cryogenics descriptors reagent-name-necrosol = necrosol -reagent-desc-necrosol = A necrotic substance that seems to be able to heal frozen corpses. It can treat and rejuvenate plants when applied in small doses. +reagent-desc-necrosol = A cryogenics chemical. Heals most organic damage, a true panacea. It can treat and rejuvenate plants when applied in small doses. Works regardless of the patient being alive or dead. +# End Frontier reagent-name-aloxadone = aloxadone reagent-desc-aloxadone = A cryogenics chemical. Used to treat severe third degree burns via regeneration of the burnt tissue. Works regardless of the patient being alive or dead. diff --git a/Resources/Locale/ru-RU/_NF/bluespace-events/events.ftl b/Resources/Locale/ru-RU/_NF/bluespace-events/events.ftl index 329af400108..15f36c1d8eb 100644 --- a/Resources/Locale/ru-RU/_NF/bluespace-events/events.ftl +++ b/Resources/Locale/ru-RU/_NF/bluespace-events/events.ftl @@ -11,4 +11,7 @@ station-event-bluespace-syndicate-ftl-interception-end-announcement = В соо station-event-bluespace-wizardfederation-scout-start-announcement = Внимание всему доступному персоналу NanoTrasen! Командование флота NanoTrasen обнаружило блюспейс-аномалию в вашем секторе с сигнатурой, указывающей на скорое прибытие шаттла Федерации Волшебников. Код: Перехватить, Задержать, Заключить. Арестуйте нарушителей и подготовьте их к передаче подразделению ДСБФ NanoTrasen для проведения допроса. station-event-bluespace-wizardfederation-scout-end-announcement = В соответствии с протоколами блюспейс-передвижений NanoTrasen, шаттл Федерации Волшебников был уничтожен. Слава NT! station-event-bluespace-bloodmoon-start-announcement = Вн̵и̴м̴а̴н̴и̴е̴ ̴в̴с̴е̴м̴у̴ ̴п̴е̴р̴с̴о̴н̴а̴л̴у̴ ̴с̴л̴у̴ж̴б̴ы̴ ̴б̴е̴з̴о̴п̴а̴с̴н̴о̴с̴т̴и̴!̴ ̴К̴о̴м̴а̴н̴д̴о̴в̴а̴н̴и̴е̴ ̴ф̴л̴о̴т̴а̴ ̴N̴a̴n̴o̴T̴r̴a̴s̴e̴n̴ ̴о̴б̴н̴а̴р̴у̴ж̴и̴л̴о̴ ̴б̴л̴ю̴с̴п̴е̴й̴с̴-̴а̴н̴о̴м̴а̴л̴и̴ю̴ ̴в̴ ̴в̴а̴ш̴е̴м̴ ̴с̴е̴к̴т̴о̴р̴е̴ ̴с̴ ̴с̴и̴г̴н̴а̴т̴у̴р̴о̴й̴,̴ ̴у̴к̴а̴з̴ы̴в̴а̴ю̴щ̴е̴й̴ ̴н̴а̴ ̴с̴к̴о̴р̴о̴е̴ ̴п̴р̴и̴б̴ы̴т̴и̴е̴ ̴ш̴а̴т̴т̴л̴а̴ ̴к̴у̴л̴ь̴т̴и̴с̴т̴о̴в̴ ̴К̴р̴о̴в̴а̴в̴о̴й̴ ̴Л̴у̴н̴ы̴.̴ ̴К̴о̴д̴:̴ ̴П̴е̴р̴ех̴в̴а̴т̴,̴ ̴У̴н̴и̴ч̴т̴о̴ж̴е̴н̴и̴е̴,̴ ̴И̴с̴т̴р̴е̴б̴л̴е̴н̴и̴е̴,̴ ̴П̴р̴и̴ж̴и̴г̴а̴н̴и̴е̴.̴ ̴О̴ж̴и̴д̴а̴й̴т̴е̴ ̴в̴о̴о̴р̴у̴ж̴ё̴н̴н̴о̴г̴о̴ ̴с̴о̴п̴р̴о̴т̴и̴в̴л̴е̴н̴и̴я̴,̴ ̴п̴р̴и̴м̴е̴н̴е̴н̴и̴е̴ ̴с̴м̴е̴р̴т̴е̴л̴ь̴н̴о̴й̴ ̴с̴и̴л̴ы̴ ̴п̴р̴о̴т̴и̴в̴ ̴в̴р̴а̴ж̴е̴с̴к̴и̴х̴ ̴а̴г̴е̴н̴т̴о̴в̴ ̴р̴а̴з̴р̴е̴ш̴е̴н̴о̴.̴ ̴П̴р̴е̴д̴о̴т̴в̴р̴а̴т̴и̴т̴е̴ ̴д̴о̴с̴т̴у̴п̴ ̴к̴а̴п̴и̴т̴а̴н̴о̴в̴,̴ ̴а̴ф̴ф̴и̴л̴и̴р̴о̴в̴а̴н̴н̴ы̴х̴ ̴с̴ ̴N̴T̴,̴ ̴б̴е̴з̴ ̴д̴о̴п̴у̴с̴к̴а̴ ̴б̴е̴з̴о̴п̴а̴с̴н̴о̴с̴т̴и̴ ̴к̴ ̴в̴р̴а̴ж̴е̴с̴к̴о̴м̴у̴ ̴к̴о̴р̴а̴б̴л̴ю̴ ̴и̴ ̴е̴г̴о̴ ̴с̴о̴д̴е̴р̴ж̴и̴м̴о̴м̴у̴.̴ ̴И̴ ̴п̴о̴м̴н̴и̴т̴е̴:̴ ̴Н̴а̴р̴'̴С̴и̴ ̴н̴е̴р̴е̴а̴л̴е̴н̴ ̴и̴ ̴н̴е̴ ̴м̴о̴ж̴е̴т̴ ̴п̴р̴и̴ч̴и̴н̴и̴т̴ь̴ ̴в̴а̴м̴ ̴в̴р̴е̴д̴а̴. -station-event-bluespace-bloodmoon-end-announcement = В̴ ̴с̴о̴о̴т̴в̴е̴т̴с̴т̴в̴и̴и̴ ̴с̴ ̴п̴р̴о̴т̴о̴к̴о̴л̴а̴м̴и̴ ̴б̴л̴ю̴с̴п̴е̴й̴с̴-̴п̴е̴р̴е̴д̴в̴и̴ж̴е̴н̴и̴й̴ ̴N̴a̴n̴o̴T̴r̴a̴s̴e̴n̴,̴ ̴к̴о̴р̴а̴б̴л̴ь̴ ̴Ф̴е̴д̴е̴р̴а̴ц̴и̴и̴ ̴В̴о̴л̴ш̴е̴б̴н̴и̴к̴о̴в̴ ̴б̴ы̴л̴ ̴у̴н̴и̴ч̴т̴о̴ж̴е̴н̴. ̴С̴л̴а̴в̴а̴ ̴N̴T̴!̴ \ No newline at end of file +station-event-bluespace-bloodmoon-end-announcement = В̴ ̴с̴о̴о̴т̴в̴е̴т̴с̴т̴в̴и̴и̴ ̴с̴ ̴п̴р̴о̴т̴о̴к̴о̴л̴а̴м̴и̴ ̴б̴л̴ю̴с̴п̴е̴й̴с̴-̴п̴е̴р̴е̴д̴в̴и̴ж̴е̴н̴и̴й̴ ̴N̴a̴n̴o̴T̴r̴a̴s̴e̴n̴,̴ ̴к̴о̴р̴а̴б̴л̴ь̴ ̴Ф̴е̴д̴е̴р̴а̴ц̴и̴и̴ ̴В̴о̴л̴ш̴е̴б̴н̴и̴к̴о̴в̴ ̴б̴ы̴л̴ ̴у̴н̴и̴ч̴т̴о̴ж̴е̴н̴. ̴С̴л̴а̴в̴а̴ ̴N̴T̴!̴ + +station-event-bluespace-generic-ftl-start-announcement = Внимание всему персоналу NanoTrasen! Командование флота NanoTrasen обнаружило неидентифицированный шаттл, входящией в сектор Фронтира. Капитаны, аффилированные с NanoTrasen, должны проявлять осторожность. NanoTrasen не несет ответственности за полученные повреждения или потерю жизни. +station-event-bluespace-generic-ftl-end-announcement = В соответствии с протоколами блюспейс-передвижений NanoTrasen, неидентифицированный шаттл был уничтожен для избежания столкновения. diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml index 4d1172198ca..35e00358ec5 100644 --- a/Resources/Maps/Nonstations/nukieplanet.yml +++ b/Resources/Maps/Nonstations/nukieplanet.yml @@ -10994,7 +10994,7 @@ entities: - type: Transform pos: 18.918644,6.663283 parent: 104 -- proto: KitchenMicrowave +- proto: SyndicateMicrowave entities: - uid: 10 components: diff --git a/Resources/Maps/Shuttles/infiltrator.yml b/Resources/Maps/Shuttles/infiltrator.yml index 55955bfeeac..fb2045d7018 100644 --- a/Resources/Maps/Shuttles/infiltrator.yml +++ b/Resources/Maps/Shuttles/infiltrator.yml @@ -3607,7 +3607,7 @@ entities: - type: Transform pos: 3.5,-3.5 parent: 1 -- proto: KitchenMicrowave +- proto: SyndicateMicrowave entities: - uid: 497 components: diff --git a/Resources/Maps/_NF/Bluespace/bloodmoon.yml b/Resources/Maps/_NF/Bluespace/bloodmoon.yml index e82dd172540..8e88927bf15 100644 --- a/Resources/Maps/_NF/Bluespace/bloodmoon.yml +++ b/Resources/Maps/_NF/Bluespace/bloodmoon.yml @@ -21,7 +21,7 @@ entities: - uid: 1 components: - type: MetaData - name: Blood Moon + name: Unidentified Vessel - type: Transform pos: -0.5156249,-0.5312496 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/cargoniaship.yml b/Resources/Maps/_NF/Bluespace/cargoniaship.yml index 8b38e5dab2a..ad6afee701e 100644 --- a/Resources/Maps/_NF/Bluespace/cargoniaship.yml +++ b/Resources/Maps/_NF/Bluespace/cargoniaship.yml @@ -17,7 +17,7 @@ entities: - uid: 1 components: - type: MetaData - name: Unknown Ship + name: Unidentified Vessel - type: Transform pos: -1.9114699,-0.171875 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/datacarrier.yml b/Resources/Maps/_NF/Bluespace/datacarrier.yml index 42037823d27..fbdf2070092 100644 --- a/Resources/Maps/_NF/Bluespace/datacarrier.yml +++ b/Resources/Maps/_NF/Bluespace/datacarrier.yml @@ -25,7 +25,7 @@ entities: - uid: 1 components: - type: MetaData - name: Unknown Ship + name: Unidentified Vessel - type: Transform pos: -0.984375,22.872152 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml b/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml index 93655a1a9cd..b85efeb38b4 100644 --- a/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml +++ b/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml @@ -22,7 +22,7 @@ entities: - uid: 1 components: - type: MetaData - name: Intercepted Syndicate Vessel + name: Unidentified Vessel - type: Transform pos: -0.484375,-0.49998474 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/wizardprobealt.yml b/Resources/Maps/_NF/Bluespace/wizardprobealt.yml index 6ded9ede7a2..010882ed53b 100644 --- a/Resources/Maps/_NF/Bluespace/wizardprobealt.yml +++ b/Resources/Maps/_NF/Bluespace/wizardprobealt.yml @@ -13,7 +13,7 @@ entities: - uid: 1 components: - type: MetaData - name: Wizard Federation Probe + name: Unidentified Vessel - type: Transform pos: -0.5,-0.50708264 parent: invalid diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml index 00654063fa1..6c333de3c1e 100644 --- a/Resources/Maps/_NF/POI/cove.yml +++ b/Resources/Maps/_NF/POI/cove.yml @@ -7873,7 +7873,7 @@ entities: - type: Transform pos: 1.4792413,5.5648255 parent: 1 -- proto: KitchenMicrowave +- proto: SyndicateMicrowave entities: - uid: 149 components: diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml index 8db6365aebf..2c8dc1ade76 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml @@ -2608,7 +2608,7 @@ entities: - type: Transform pos: 6.464443,-9.590082 parent: 3 -- proto: KitchenMicrowave +- proto: SyndicateMicrowave entities: - uid: 109 components: diff --git a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml index f141877379b..d425eff2134 100644 --- a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml +++ b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml @@ -3798,7 +3798,7 @@ entities: - type: Transform pos: 3.5,-3.5 parent: 1 -- proto: KitchenMicrowave +- proto: SyndicateMicrowave entities: - uid: 497 components: diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml index 89acef82927..e7444d1c3f9 100644 --- a/Resources/Prototypes/Body/Organs/Animal/animal.yml +++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml @@ -129,6 +129,7 @@ metabolizerTypes: [ Animal ] groups: - id: Medicine + - id: Cryogenic # Frontier - id: Poison - id: Narcotic diff --git a/Resources/Prototypes/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/Body/Organs/Animal/slimes.yml index f1a3d47e667..72578ca1c7a 100644 --- a/Resources/Prototypes/Body/Organs/Animal/slimes.yml +++ b/Resources/Prototypes/Body/Organs/Animal/slimes.yml @@ -16,6 +16,7 @@ - id: Food - id: Drink - id: Medicine + - id: Cryogenic # Frontier - id: Poison - id: Narcotic - id: Alcohol diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index 1d0a5db996c..411b8de4e83 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/Resources/Prototypes/Body/Organs/arachnid.yml @@ -104,6 +104,7 @@ metabolizerTypes: [Arachnid] groups: - id: Medicine + - id: Cryogenic # Frontier - id: Poison - id: Narcotic diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index 69fc630b9e4..a00889f4cf2 100644 --- a/Resources/Prototypes/Body/Organs/diona.yml +++ b/Resources/Prototypes/Body/Organs/diona.yml @@ -86,6 +86,7 @@ - id: Food - id: Drink - id: Medicine + - id: Cryogenic # Frontier - id: Poison - id: Narcotic - id: Alcohol diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml index 6cd4996926a..879cf04af27 100644 --- a/Resources/Prototypes/Body/Organs/human.yml +++ b/Resources/Prototypes/Body/Organs/human.yml @@ -159,6 +159,7 @@ metabolizerTypes: [Human] groups: - id: Medicine + - id: Cryogenic # Frontier - id: Poison - id: Narcotic diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml index a2c5a054dc1..607169b0589 100644 --- a/Resources/Prototypes/Body/Organs/moth.yml +++ b/Resources/Prototypes/Body/Organs/moth.yml @@ -24,3 +24,8 @@ groups: - id: Food - id: Drink + - id: Medicine + - id: Cryogenic # Frontier + - id: Poison + - id: Narcotic + - id: Alcohol diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml index 3da76c5d4aa..74cb8fab789 100644 --- a/Resources/Prototypes/Body/Organs/slime.yml +++ b/Resources/Prototypes/Body/Organs/slime.yml @@ -16,6 +16,7 @@ - id: Food - id: Drink - id: Medicine + - id: Cryogenic # Frontier - id: Poison - id: Narcotic - id: Alcohol diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 0dbb54bc5bb..936d839f21f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -38,5 +38,6 @@ BerrySeeds: 5 PeaSeeds: 5 CottonSeeds: 5 + CoffeeSeeds: 5 # Frontier emaggedInventory: FlyAmanitaSeeds: 1 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml index a889b939bde..fca26746618 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml @@ -49,6 +49,7 @@ - FoodPeaPod - FoodPumpkin - CottonBol + - FoodCoffee # Frontier chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml index 6aea0e89b01..3ac8b70007f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml @@ -88,6 +88,7 @@ metabolizerTypes: [ Dragon ] groups: - id: Medicine + - id: Cryogenic # Frontier - id: Poison - type: Butcherable spawned: diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index ae2749902fc..de09a37a23b 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -101,6 +101,7 @@ metabolizerTypes: [ Dragon ] groups: - id: Medicine + - id: Cryogenic # Frontier - id: Poison - type: Butcherable spawned: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 2ff2a1cb683..3350ecf98ac 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -1076,6 +1076,25 @@ tags: - MicrowaveMachineBoard +- type: entity + id: SyndicateMicrowaveMachineCircuitboard + parent: BaseMachineCircuitboard + name: donk co. microwave machine board + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: SyndicateMicrowave + requirements: + Capacitor: 1 + materialRequirements: + Glass: 2 + Cable: 2 + # stackRequirements: + # Capacitor: 1 + # Glass: 2 + # Cable: 2 + - type: entity id: FatExtractorMachineCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml index fe4eb145183..47b1a0a76a5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml @@ -6,6 +6,8 @@ components: - type: Microwave capacity: 10 + canMicrowaveIdsSafely: false # Frontier + explosionChance: 1 # Frontier - type: Appearance - type: GenericVisualizer visuals: @@ -105,3 +107,21 @@ - type: GuideHelp guides: - Chef + +- type: entity + id: SyndicateMicrowave + parent: KitchenMicrowave + name: donk co. microwave + description: So advanced, it can cook donk-pockets in a mere 2.5 seconds! + components: + - type: Microwave + cookTimeMultiplier: 0.5 + capacity: 10 + canMicrowaveIdsSafely: false + explosionChance: 1 # Frontier 0.3<1 + - type: Sprite + sprite: Structures/Machines/microwave_syndie.rsi + drawdepth: SmallObjects + snapCardinals: true + - type: Machine + board: SyndicateMicrowaveMachineCircuitboard diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index edc03e8ba9b..aa46054787c 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -173,7 +173,7 @@ physicalDesc: reagent-physical-desc-fizzy flavor: medicine color: "#0091ff" - worksOnTheDead: true # Frontier + worksOnTheDead: true # Frontier plantMetabolism: - !type:PlantAdjustToxins amount: -5 @@ -181,7 +181,7 @@ amount: 5 - !type:PlantCryoxadone {} metabolisms: - Medicine: + Cryogenic: # Frontier: Medicine diff --git a/Resources/ServerInfo/_NF/Guidebook/Bank.xml b/Resources/ServerInfo/_NF/Guidebook/Bank.xml index 5308425a8d1..f8893ae1b4f 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Bank.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Bank.xml @@ -1,23 +1,28 @@ # Галактический банк NT -NT открыл свою банковскую отрасль для обычных граждан, гарантируя до (int32.MAX)! - +Как подрядчик с Nanotrasen, вы имеете постоянный. +Деньги, которые вы [bold]вносите[/bold] в [color=#44cc00]банкомат[/color] на Аванпосте Фронтира или Ресторане Тринньки, будут храниться на вашем счете. + ## Банкоматы - - + + -Вы можете в любое время получить доступ к своему личному банковскому счету, чтобы снять или внести средства в любое удобное для вас время в [color=#44cc00]банкоматах Галактического банка[/color] +Вы можете в любое время получить доступ к своему личному банковскому счету, чтобы снять заработанные [color=#44cc00]кредиты[/color] в любом [color=#44cc00]банкомате Галактического банка[/color]. -В настоящее время NT признает только [color=#44cc00]Кредиты[/color] или "Космические баксы" в качестве законного платежного средства. +Только банкоматы на Аванпосте Фронтира или Ресторане Тринньки позволяют вам вносить деньги. +Убедитесь, что вы внесли наличные и продали свой корабль до окончания смены! -## Доступ к счёту +## Доступ к счету - - + + + -Доступ к вашему банковскому счету ограничен банкоматами [color=#44cc00]Галактического банка[/color] и регулируемое разнообразие [color=#44cc00]Торговых автоматов[/color] +Ваш банковский счет можно использовать через [color=#44cc00]банкоматы Галактического банка[/color], [color=#44cc00]грузовые компьютеры[/color] и [color=#44cc00]торговые автоматы[/color]. + +При торговле с другими людьми вы обычно имеете дело с пачками [color=#44cc00]Кредитов[/color]. +Не забудьте внести их в [color=#44cc00]банкомат[/color] до окончания смены. -Большинство личных сделок, с которыми вы будете иметь дело, будут заключаться непосредственно [color=#44cc00]Кредитами[/color] diff --git a/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Carp.xml b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Carp.xml new file mode 100644 index 00000000000..4a35446a2b9 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Carp.xml @@ -0,0 +1,5 @@ + + # Carp + +A land-dwelling version of the hostile space fauna, these carp have adapted to life under gravity. + diff --git a/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Cultists.xml b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Cultists.xml new file mode 100644 index 00000000000..e02407bae93 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Cultists.xml @@ -0,0 +1,5 @@ + + # Cultists + +Servants of Nar'Sie, these fanatics will stop at nothing to raise their sleeping goddess. + diff --git a/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Dinosaurs.xml b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Dinosaurs.xml new file mode 100644 index 00000000000..92b92875289 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Dinosaurs.xml @@ -0,0 +1,5 @@ + + # Dinosaurs + +Megafauna from our more savage worlds, these behemoths pose a risk to corporate property. + diff --git a/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Explorers.xml b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Explorers.xml new file mode 100644 index 00000000000..711413f4a17 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Explorers.xml @@ -0,0 +1,5 @@ + + # Explorers + +An independent group of scavengers squatting on corporate land. Help enforce our claim over their little nest. + diff --git a/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Flesh.xml b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Flesh.xml new file mode 100644 index 00000000000..d67fe0f5436 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Flesh.xml @@ -0,0 +1,5 @@ + + # Flesh + +Biological abominations from experiments gone awry, these shambling freaks are a menace. + diff --git a/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Gangers.xml b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Gangers.xml new file mode 100644 index 00000000000..ada566e5d29 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Gangers.xml @@ -0,0 +1,5 @@ + + # Gangers + +Urchins, miscreants, and other social detritus banded together. Disorganized and chaotic, they're a nuisance. + diff --git a/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Mercenaries.xml b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Mercenaries.xml new file mode 100644 index 00000000000..fc1a0615e26 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Mercenaries.xml @@ -0,0 +1,5 @@ + + # Mercenaries + +Death squads for hire from the various fringes of space. Shouldn't have contracted work in Nanotrasen's territory. + diff --git a/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Silicons.xml b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Silicons.xml new file mode 100644 index 00000000000..d48fd3db44d --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Silicons.xml @@ -0,0 +1,5 @@ + + # Silicons + +Rogue robots, drones, and other silicon intelligences. Valuable scrap, if nothing else. + diff --git a/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Syndicate.xml b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Syndicate.xml new file mode 100644 index 00000000000..42f5dbcad0b --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Syndicate.xml @@ -0,0 +1,5 @@ + + # Syndicate + +Agents from hostile corporations. Handle with extreme prejudice. + diff --git a/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Xenos.xml b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Xenos.xml new file mode 100644 index 00000000000..4f7388a3107 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Xenos.xml @@ -0,0 +1,5 @@ + + # Xenos + +Various nests of highly territorial alien bioweapons. Smoke 'em out. + diff --git a/Resources/ServerInfo/_NF/Guidebook/Expeditions.xml b/Resources/ServerInfo/_NF/Guidebook/Expeditions.xml new file mode 100644 index 00000000000..71ae15720a1 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Expeditions.xml @@ -0,0 +1,33 @@ + + # Salvage Expeditions + + + + + Expeditions are adventures that you can go on with your crew.[br][/br] +Your ship will jump to a planet and you need to complete an objective in a limited time.[br][/br] +When that time runs out, the ship jumps back, [bold]whether you're on it or not[/bold]. + +Ships purchased at Frontier Outpost [bold]cannot[/bold] go on expedition, but [italic]any purchased at [bold]Expeditionary Lodge[/bold] can[/italic]. +You will need to use the [color=#a4885c]salvage console[/color] onboard. + +To go on an expedition: +- Pilot your ship so there is 200 m of empty space in each direction. +- Use the [color=#a4885c]salvage console[/color]. +- Pick one of the five missions offered to you. +- Note the enemy, conditions, total time, and objectives for the mission. +- Buckle into a seat to avoid falling down. + +Tips for expeditions: +- Start with easier missions and progress to harder ones as you get better equipped. +- Different enemy types have different strengths and weaknesses. Vary your loadout to best deal with each. +- If you don't think you can win a fight, don't take it. + +When you arrive on-site, you'll be told which direction the objective is in. +There'll be a building in that direction; break in and complete your objective. +Note: North is towards the top of the screen in default rotation (NUMPAD 8). + +While planetside, you can't communicate via radio with the wider Frontier Sector. +If you don't have a [color=#a4885c]telecommunication server[/color] on your ship, your headset won't work. +Note that [color=#a4885c]handheld radios[/color] work without a server. + diff --git a/Resources/ServerInfo/_NF/Guidebook/Hiring.xml b/Resources/ServerInfo/_NF/Guidebook/Hiring.xml new file mode 100644 index 00000000000..115edc4b890 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Hiring.xml @@ -0,0 +1,21 @@ + + # Hiring Crew + + + + + + As the Captain of a Nanotrasen vessel, you have the authority to hire and fire crew members, and to delegate work. +There are two ways to hire crew: +- Use the [color=#a4885c]station records computer[/color] on your ship to open crew slots. Players that join later can spawn in on your ship. +- Invite other players to join your crew through in-game communications. + +Crew membership is informal - you don't need to sign any forms, but feel free to roleplay! +It's a good idea to make sure your crew understand: +- What you expect of them (What tasks should they do? Who do they report to or work with?) +- What they can expect from you (An hourly wage? A split of rewards? The promise of adventure?). + +As a Captain, remember: +- You're responsible for the well-being of your crew. +- A Captain's only as good as their word! + diff --git a/Resources/ServerInfo/_NF/Guidebook/NewFrontier14.xml b/Resources/ServerInfo/_NF/Guidebook/NewFrontier14.xml index 42b0cb2d6f1..70c552864b9 100644 --- a/Resources/ServerInfo/_NF/Guidebook/NewFrontier14.xml +++ b/Resources/ServerInfo/_NF/Guidebook/NewFrontier14.xml @@ -1,28 +1,34 @@ -# Программа "Новый Фронтир" +# Программа NT "Новые рубежи" -Благодарим вас за то, что вы подписались на программу Новый Фронтир! +Спасибо за участие в программе "Новые рубежи"! Как сотрудник NanoTrasen, вы помогаете осваивать самые дальние уголки космоса! -После бесчисленных часов исследований и подсчета цифр ведущие страховые агенты Новой Фронтира сочли более выгодным переложить расходы на вас! Наши преданные своему делу сотрудники! +[color=#33bbff]Если вам нужна помощь, обратитесь по радио или поговорите с кем-нибудь.[/color] +[color=#dd0000]Диспетчер[/color] или [color=#009933]Представитель Фронтира[/color] могут вам помочь, они находятся в центре аванпоста. -## Способы получения прибыли +## Экономика - - - + + + -Вы можете в любое время получить доступ к своему личному банковскому счету, чтобы снять или внести средства в любое удобное для вас время в [color=#44cc00]банкоматах Галактического банка[/color] +Любые деньги, которые вы зарабатываете, [bold]ваши[/bold], и будут доступны в будущих сменах, если их внести в [color=#44cc00]банкомат Галактического банка[/color] на Аванпосте Фронтира или Ресторане Тринньки. -Присоединяйтесь к команде корабля, чтобы заработать как можно больше денег и принести как можно больше пользы NT, или используйте консоль [color=#cccc00]Верфи[/color] чтобы приобрести свой собственный. +Чтобы заработать деньги, вы можете: +- Присоединиться к экипажу корабля. Спросите по радио, если кому-то нужна дополнительная команда, и помогайте капитану. +- Устроиться на работу на станциию Спросите у [color=#009933]Представителя Фронтира[/color], нужно ли что-то сделать. +- Использовать [color=#cccc00]консоль верфи[/color] для покупки собственного корабля. -## Обеспечение +## Удобства - - - + + + -Компания NT открыла запас многих машинных плат, взятых из проектов по строительству избыточных станций, а также многих других приспособлений, которые помогут приручить Фронтир. +Некоторые припасы (например, воздушные баллоны, оборудование) доступны у торговых автоматов на Аванпосте Фронтира, но большинство удобств (медицинские услуги, еда) должны быть получены игроками на шаттлах или на Торговом депо. -На пограничных станциях обычно работают более длительные смены, поэтому, если вам нужно закончить работу пораньше или сделать перерыв на некоторое время, вы всегда можете вернуться к [color=##33bbff]Криокапсуле[/color] раньше. +Обязательно запаситесь на Торговом Аванпости, если отправляетесь в длительное путешествие, и воспользуйтесь [color=#33bbff]трекером медицинской страховки[/color] в вашем снаряжении или у торгового автомата NanoMed в медотсеке. +Смены на Фронтире обычно длятся [color=#33bbff]шесть часов[/color]. +Если вам нужно закончить смену раньше или сделать перерыв, используйте [color=#33bbff]камеры криогенного сна[/color] в медотсеке на Аванпосте Фронтира. diff --git a/Resources/ServerInfo/_NF/Guidebook/Piloting.xml b/Resources/ServerInfo/_NF/Guidebook/Piloting.xml new file mode 100644 index 00000000000..8816e3f33c7 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Piloting.xml @@ -0,0 +1,35 @@ + + # Piloting + + + + To move a shuttle, you first need to click on the [color=#a4885c]shuttle console[/color] in its cockpit. After clicking the shuttle console, you should see a radar view of the space around your shuttle. + +Newly purchased shuttles start docked with Frontier Outpost. To undock, follow these steps: + +- Tell people you are undocking using the traffic radio channel (:d). Include your ship's callsign, which can be found on the NAV screen (e.g. "Pioneer NX-123 undocking.") +- Click on the DOCK tab, disconnect any airlocks that are docked to the station. +- Return to the NAV tab. + +- To move a shuttle, the default controls (for a QWERTY keyboard) are: + +-[color=#028ed9]W & S[/color]: Move forward and backward. +-[color=#028ed9]A & D[/color]: Move left and right. +-[color=#028ed9]Q & E[/color]: Rotate left and right. +-[color=#028ed9]Spacebar[/color]: Slow down. +-[color=#028ed9]Hold Spacebar + any input[/color]: Move and rotate slowly. + +# Docking + + + + [bold]Before docking your ship with:[/bold] +- [bold]Another ship[/color][/bold], it is best practice to announce your intention to dock over the traffic channel (:d). +- [bold][color=#ffd700]Frontier Outpost[/color][/bold], stop 200m out, request permission to dock from the Station Traffic Controller (STC) over the traffic radio channel (:d). +- [bold][color=#ffa500]Another station[/color][/bold], docks are first come, first serve. Be courteous and leave space where possible. + +To dock the ship: +- Pilot towards the target so a set of its airlocks are nearby a set of airlocks of the target. +- When very close, click on the DOCK tab for a closer view. +- When next to the airlock, you can click "Dock" when highlighted to attach to the target. + diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard.xml index 1185aa7270b..b9a963a7319 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard.xml @@ -1,26 +1,48 @@ -# Верфи "Новый Фронтир" +# Верфи "Новые рубежи" -Технология страхования шаттлов была стандартизирована, чтобы позволить всем гражданам приобретать, пилотировать и эксплуатировать космические корабли во всех приграничных регионах. +Для содействия развитию Фронтира, шаттлы от NanoTrasen и его дочерних компаний могут быть арендованы вами для использования. +Все аренды действительны на одну смену. Арендованные шаттлы возвращаются NanoTrasen в конце смены. +Стоимость шаттлов возвращается покупателю при завершении аренды через консоль верфи. +Чтобы избежать потерь, [bold]убедитесь, что вы завершили аренду перед окончанием смены[/bold]. ## Консоль верфи - - - + + + -При покупке судна оно регистрируется на персональную ID карту, вставленную в [color=#cccc00]Консоль верфи[/color]. +Чтобы арендовать шаттл: +- Извлеките ID-карту из вашего PDA. +- Вставьте ID-карту в незанятую [color=#cccc00]консоль верфи[/color]. +- Используйте консоль верфи, чтобы открыть ее интерфейс. +- Выберите шаттл, который хотите арендовать. +- Нажмите кнопку «Купить» на консоли. +- Нажмите кнопку «Извлечь», чтобы удалить вашу ID-карту из консоли. +- Вставьте ID-карту обратно в ваш PDA. -Затем эта ID карта может быть использована для продажи судна обратно на верфь за полученную стоимость судна. +Поздравляем, теперь вы капитан собственного шаттла! -## Обеспечение +Чтобы завершить аренду: +- Убедитесь, что ваш арендованный шаттл пришвартован к Аванпосту Фронтира. +- Убедитесь, что на борту шаттла никого нет. +- Извлеките ID-карту [bold]использованную для покупки шаттла[/bold] из вашего PDA. +- Вставьте ID-карту в незанятую [color=#cccc00]консоль верфи[/color]. +- Используйте консоль верфи, чтобы открыть ее интерфейс. +- Нажмите кнопку «Продать» на консоли. Стоимость будет зачислена на ваш банковский счет. +- Нажмите кнопку «Извлечь», чтобы удалить вашу ID-карту из консоли. +- Вставьте ID-карту обратно в ваш PDA. + +## Снабжение - - - + + + -Корабли поставляются полностью оснащенными инструментами и припасами, необходимыми для выполнения хотя бы одной прибыльной задачи на Фронтире. +Шаттлы оснащены инструментами и припасами, необходимыми для выполнения одной или нескольких задач на Фронтире (например, добыча полезных ископаемых, исследования, медицинская помощь, услуги питания). + +Шаттлы, особенно большие, лучше работают при наличии экипажа. Ознакомьтесь с разделом [bold]Найм[/bold] для получения дополнительной информации. +Космос — одинокое и опасное место, и вам будет намного лучше работать с экипажем. -На каждом корабле также будут дополнительные члены экипажа и припасы для оказания помощи. Космос - опасное место, и ваши шансы на выживание значительно возрастают, когда вы работаете в команде. diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ambition.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ambition.xml index dbd641ced0f..72c00c6be7d 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ambition.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ambition.xml @@ -16,27 +16,8 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Pilot, Chief Engineer, Atmospheric Technician, Station Engineer, Salvage Specialist - "Declassified gas production and distribution platform seized in a hostile takeover of an Atmosian conglomerate. For the ultimate insurgent." - - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - + # PREFLIGHT CHECKLIST ## 1. Power supply @@ -48,9 +29,9 @@ - - Check if the SMES unit is anchored to the floor. - - Check if the substation unit is anchored to the floor. - - Check if the APC unit's Main Breaker is toggled on. + - Check that the SMES unit is anchored to the floor. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. AME generator unit. @@ -59,8 +40,8 @@ - - Check if the AME core is properly shielded. - - Check if the AME controller unit is anchored to the floor. + - Check that the AME core is properly shielded. + - Check that the AME controller unit is anchored to the floor. - Check the AME controller unit Fuel Status. - Check the AME controller unit Injection Amount. - Toggle Injection. @@ -75,14 +56,14 @@ - - Check if the O2 output pump is set to normal pressure. + - Check that the O2 output pump is set to 101kPa. - Enable the O2 output pump. - - Check if the N2 output pump is set to normal pressure. + - Check that the N2 output pump is set to 101kPa. - Enable N2 output pump. - - Check if the gas mixer is set to the correct mixing ratio. - - Check if the gas mixer is set to normal pressure. + - Check that the gas mixer is set to the correct mixing ratio (21% Oxygen, 79% Nitrogen). + - Check that the gas mixer is set to 101kPa. - Enable gas mixer. - - Check if the distribution pump is set to normal pressure. + - Check that the distribution pump is set to 101kPa. - Enable distribution pump. ## 2.2. Waste Loop @@ -114,9 +95,9 @@ - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. - - Check if the blast doors are closed. + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + - Check that the blast doors are closed. ## Sidenotes diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Brigand.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Brigand.xml index 8504e22a487..c496ac88917 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Brigand.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Brigand.xml @@ -16,36 +16,8 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - "Civilian conversion of an old military light frigate from the early days of humanity's expansion to the stars. The original light frigate design was made in pre-FTL era of technology." - - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - - # Salvage expeditions - - - - - Expeditions are adventures that you can do with your fellow crewmates or on your own. You must pick a mission from the [color=#a4885c]salvage console[/color], each of which of varying difficulty and reward, the FTL transition to the location will initiate immediately if your shuttle is far enough away from celestial bodies (other shuttles, asteroids, POIs, etc.). Once you arrive, the chat will tell you in which direction the target dungeon of the expedition is. - - While planetside you will be unable to communicate via radio with the wider Frontier Sector, and unless you have [color=#a4885c]telecommunication server[/color] installed you won't be able to use radio to communicate with your crew in the expedition too. - + # PREFLIGHT CHECKLIST ## 1. Power supply @@ -57,9 +29,9 @@ - - Check if the SMES unit is anchored to the floor. - - Check if the substation unit is anchored to the floor. - - Check if the APC unit's Main Breaker is toggled on. + - Check that the SMES unit is anchored to the floor. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. AME generator unit. @@ -68,8 +40,8 @@ - - Check if the AME core is properly shielded. - - Check if the AME controller unit is anchored to the floor. + - Check that the AME core is properly shielded. + - Check that the AME controller unit is anchored to the floor. - Check the AME controller unit Fuel Status. - Check the AME controller unit Injection Amount. - Toggle Injection. @@ -85,10 +57,10 @@ - - Check if the O2 canister is anchored to connector port. - - Check if the N2 canister is anchored to connector port. - - Check if the gas mixer is set to the correct mixing ratio. - - Check if the gas mixer is set to normal pressure. + - Check that the O2 canister is anchored to connector port. + - Check that the N2 canister is anchored to connector port. + - Check that the gas mixer is set to the correct mixing ratio (21% Oxygen, 79% Nitrogen). + - Check that the gas mixer is set to 101kPa. - Enable gas mixer. ## 2.2. Waste Loop @@ -105,9 +77,9 @@ - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. - - Check if the blast doors are closed. + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + - Check that the blast doors are closed. ## Sidenotes diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml index c80607a7b2e..f77b766c21d 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml @@ -15,29 +15,10 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - "A medium-size, high-class restaurant ship with ample seating, integrated botany and a dining room for VIP guests." [italic]Brought to you by BlueBird Starship Design & Construction.[/italic] - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - # PREFLIGHT CHECKLIST ## 1. Power supply @@ -63,7 +44,7 @@ - Check that P.A.C.M.A.N. generator units are anchored to the floor. - Check that P.A.C.M.A.N. generator units are fueled. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation. - Check that P.A.C.M.A.N. generator units are set to HV output. - - Set Target Power to [bold]12 kW[/bold] on each generator unit. + - Set Target Power to 12 [bold]kW[/bold] on each generator unit. - Start P.A.C.M.A.N. generator units. ## 2. Atmospherics @@ -76,7 +57,7 @@ - Check that the air canister is anchored to connector port. - - Check that the distribution pump is set to normal pressure. + - Check that the distribution pump is set to 101kPa. - Enable the distribution pump. ## 2.2. Waste Loop diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Gasbender.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Gasbender.xml index 9f1415238a3..18b4c11e9c2 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Gasbender.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Gasbender.xml @@ -10,7 +10,6 @@ - [color=#a4885c]Ship Size:[/color] Medium @@ -22,37 +21,9 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - "The Gasbender is a medium-sized engineering vessel outfitted for deep space construction projects and gas collection on planets. Features atmospherics setup with mixing/ignition chamber. Designed to work in pair with smaller salvage ship." - - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - - # Salvage expeditions - - - - - Expeditions are adventures that you can do with your fellow crewmates or on your own. You must pick a mission from the [color=#a4885c]salvage console[/color], each of which of varying difficulty and reward, the FTL transition to the location will initiate immediately if your shuttle is far enough away from celestial bodies (other shuttles, asteroids, POIs, etc.). Once you arrive, the chat will tell you in which direction the target dungeon of the expedition is. - - While planetside you will be unable to communicate via radio with the wider Frontier Sector, and unless you have [color=#a4885c]telecommunication server[/color] installed you won't be able to use radio to communicate with your crew in the expedition too. - - # PREFLIGHT CHECKLIST + + # PREFLIGHT CHECKLIST ## 1. Power supply @@ -63,9 +34,9 @@ - - Check if the SMES unit is anchored to the floor. - - Check if the substation unit is anchored to the floor. - - Check if the APC unit's Main Breaker is toggled on. + - Check that the SMES unit is anchored to the floor. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. AME generator unit. @@ -74,11 +45,11 @@ - - Check if the AME core is properly shielded. - - Check if the AME controller unit is anchored to the floor. + - Check that the AME core is properly shielded. + - Check that the AME controller unit is anchored to the floor. - Check the AME controller unit Fuel Status. - Check the AME controller unit Injection Amount. - - Toggle Injection. + - Enable Injection. ## 2. Atmospherics @@ -90,14 +61,14 @@ - - Check if the O2 output pump is set to normal pressure. + - Check that the O2 output pump is set to 101kPa. - Enable the O2 output pump. - - Check if the N2 output pump is set to normal pressure. + - Check that the N2 output pump is set to 101kPa. - Enable N2 output pump. - - Check if the gas mixer is set to the correct mixing ratio. - - Check if the gas mixer is set to normal pressure. + - Check that the gas mixer is set to the correct mixing ratio (21% Oxygen, 79% Nitrogen). + - Check that the gas mixer is set to 101kPa. - Enable gas mixer. - - Check if the distribution pump is set to normal pressure. + - Check that the distribution pump is set to 101kPa. - Enable distribution pump. ## 2.2. Waste Loop @@ -117,9 +88,9 @@ - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. - - Check if the blast doors are closed. + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + - Check that the blast doors are closed. ## Sidenotes diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Harbormaster.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Harbormaster.xml index 0097c3a1284..348239cc7d9 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Harbormaster.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Harbormaster.xml @@ -18,27 +18,8 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - "An affordable shuttle for towing derelict ships to and from Frontier Station." - - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - + # PREFLIGHT CHECKLIST ## 1. Power supply @@ -50,9 +31,9 @@ - - Check if the SMES unit is anchored to the floor. - - Check if the substation unit is anchored to the floor. - - Check if the APC unit's Main Breaker is toggled on. + - Check that the SMES unit is anchored to the floor. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. P.A.C.M.A.N. generator unit @@ -61,10 +42,10 @@ - - Check if P.A.C.M.A.N. generator units are anchored to the floor. - - Check if P.A.C.M.A.N. generator units are fueled. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation. - - Check if P.A.C.M.A.N. generator units are set to HV output. - - Set Target Power to 15-16** [bold]k[/bold]W on each generator unit. + - Check that P.A.C.M.A.N. generator units are anchored to the floor. + - Check that P.A.C.M.A.N. generator units are fueled. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation. + - Check that P.A.C.M.A.N. generator units are set to HV output. + - Set Target Power to 15-16** [bold]kW[/bold] on each generator unit. - Start P.A.C.M.A.N. generator units. ## 2. Atmospherics @@ -76,8 +57,8 @@ - - Check if the air canister is anchored to connector port. - - Check if the distribution pump is set to normal pressure. + - Check that the air canister is anchored to connector port. + - Check that the distribution pump is set to 101kPa. - Enable the distribution pump. ## 2.2. Waste Loop @@ -96,8 +77,8 @@ - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. ## Sidenotes diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Kilderkin.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Kilderkin.xml index 2f266c74326..b5397c4bbdd 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Kilderkin.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Kilderkin.xml @@ -16,27 +16,8 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - "A medium-sized space bar. In addition to the bar is equipped with hydroponics." - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - # PREFLIGHT CHECKLIST ## 1. Power supply @@ -48,9 +29,9 @@ - - Check if the SMES unit is anchored to the floor. - - Check if the substation unit is anchored to the floor. - - Check if the APC unit's Main Breaker is toggled on. + - Check that the SMES unit is anchored to the floor. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. P.A.C.M.A.N. generator unit @@ -59,10 +40,10 @@ - - Check if P.A.C.M.A.N. generator units are anchored to the floor. - - Check if P.A.C.M.A.N. generator units are fueled. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation. - - Check if P.A.C.M.A.N. generator units are set to HV output. - - Set Target Power to 13** [bold]k[/bold]W on each generator unit. + - Check that P.A.C.M.A.N. generator units are anchored to the floor. + - Check that P.A.C.M.A.N. generator units are fueled. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation. + - Check that P.A.C.M.A.N. generator units are set to HV output. + - Set Target Power to 13** [bold]kW[/bold] on each generator unit. - Start P.A.C.M.A.N. generator units. ## 2. Atmospherics @@ -74,8 +55,8 @@ - - Check if the air canister is anchored to connector port. - - Check if the distribution pump is set to normal pressure. + - Check that the air canister is anchored to connector port. + - Check that the distribution pump is set to 101kPa. - Enable the distribution pump. ## 2.2. Waste Loop @@ -94,8 +75,8 @@ - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. ## Sidenotes diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Lantern.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Lantern.xml index efce9832104..2fd1e28d4a9 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Lantern.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Lantern.xml @@ -23,27 +23,8 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - "A medium-sized shuttle to promote your religion." - - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - + # PREFLIGHT CHECKLIST ## 1. Power supply @@ -55,9 +36,9 @@ - - Check if the SMES unit is anchored to the floor. - - Check if the substation unit is anchored to the floor. - - Check if the APC unit's Main Breaker is toggled on. + - Check that the SMES unit is anchored to the floor. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. P.A.C.M.A.N. generator unit @@ -66,10 +47,10 @@ - - Check if the P.A.C.M.A.N. generator unit is anchored to the floor. - - Check if the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. - - Check if the P.A.C.M.A.N. generator unit is set to HV output. - - Set Target Power for 10-15** [bold]k[/bold]W. + - Check that the P.A.C.M.A.N. generator unit is anchored to the floor. + - Check that the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator unit is set to HV output. + - Set Target Power for 12-14** [bold]kW[/bold]. - Start the P.A.C.M.A.N. generator unit. ## 1.3. Solar panels @@ -91,8 +72,8 @@ - - Check if the air canister is anchored to connector port. - - Check if the distribution pump is set to normal pressure. + - Check that the air canister is anchored to connector port. + - Check that the distribution pump is set to 101kPa. - Enable the distribution pump. ## 2.2. Waste Loop @@ -111,8 +92,8 @@ - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. ## Sidenotes diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Legman.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Legman.xml index ae9abc98d75..04b473811db 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Legman.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Legman.xml @@ -15,27 +15,8 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - "A small maneuverable shuttle with low operational costs for reporters who want to be first on a scene." - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - # PREFLIGHT CHECKLIST ## 1. Power supply @@ -47,7 +28,7 @@ - Check the substation unit. - - Check if the APC unit's Main Breaker is toggled on. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. P.A.C.M.A.N. generator unit @@ -56,10 +37,10 @@ - - Check if the P.A.C.M.A.N. generator unit is anchored to the floor. - - Check if the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. - - Check if the P.A.C.M.A.N. generator unit is set to HV output. - - Set Target Power to 5-6** [bold]k[/bold]W. + - Check that the P.A.C.M.A.N. generator unit is anchored to the floor. + - Check that the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator unit is set to HV output. + - Set Target Power to 5-6** [bold]kW[/bold]. - Start the P.A.C.M.A.N. generator unit. ## 2. Atmospherics @@ -71,8 +52,8 @@ - - Check if the air canister is anchored to connector port. - - Check if the distribution pump is set to normal pressure. + - Check that the air canister is anchored to connector port. + - Check that the distribution pump is set to 101kPa. - Enable the distribution pump. ## 2.2. Waste Loop @@ -92,9 +73,9 @@ - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. - - Check if the bow window shutters are closed. + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + - Check that the bow window shutters are closed. ## Sidenotes diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Liquidator.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Liquidator.xml index 87dd21360c9..1d322e35fbd 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Liquidator.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Liquidator.xml @@ -4,10 +4,12 @@ + + - + [color=#a4885c]Ship Size:[/color] Small [color=#a4885c]Recommended Crew:[/color] 1+ @@ -18,27 +20,8 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - "A small vessel equipped with everything you need to make even the dirtiest ship squeaky clean (ducky slippers included)." - - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - + # PREFLIGHT CHECKLIST ## 1. Power supply @@ -50,9 +33,9 @@ - - Check if the SMES unit is anchored to the floor. - - Check if the substation unit is anchored to the floor. - - Check if the APC unit's Main Breaker is toggled on. + - Check that the SMES unit is anchored to the floor. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. S.U.P.E.R.P.A.C.M.A.N. generator unit @@ -62,10 +45,10 @@ - - Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit is anchored to the floor. - - Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. - - Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit is set to HV output. - - Set Target Power for 18-19** [bold]k[/bold]W. + - Check that the S.U.P.E.R.P.A.C.M.A.N. generator unit is anchored to the floor. + - Check that the S.U.P.E.R.P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the S.U.P.E.R.P.A.C.M.A.N. generator unit is set to HV output. + - Set Target Power for 18-19** [bold]kW[/bold]. - Start the S.U.P.E.R.P.A.C.M.A.N. generator unit. ## 2. Atmospherics @@ -79,16 +62,16 @@ - - Check if the O2 canister is anchored to connector port. - - Check if the O2 output pump is set to normal pressure. + - Check that the O2 canister is anchored to connector port. + - Check that the O2 output pump is set to 101kPa. - Enable the O2 output pump. - - Check if the N2 canister is anchored to connector port. - - Check if the N2 output pump is set to normal pressure. + - Check that the N2 canister is anchored to connector port. + - Check that the N2 output pump is set to 101kPa. - Enable N2 output pump. - - Check if the gas mixer is set to the correct mixing ratio. - - Check if the gas mixer is set to normal pressure. + - Check that the gas mixer is set to the correct mixing ratio (21% Oxygen, 79% Nitrogen). + - Check that the gas mixer is set to 101kPa. - Enable gas mixer. - - Check if the distribution pump is set to normal pressure. + - Check that the distribution pump is set to 101kPa. - Enable distribution pump. ## 2.2. Waste Loop @@ -108,9 +91,9 @@ - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. - - Check if the blast doors are closed. + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + - Check that the blast doors are closed. ## Sidenotes diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Pioneer.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Pioneer.xml index ed8b8558e89..6a739525341 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Pioneer.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Pioneer.xml @@ -14,27 +14,8 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - - "A cargo container outfitted to be space-capable and equipped for salvaging and mining either on its own or as part of a fleet." - - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - + "A cargo container outfitted to be space-capable and equipped for salvaging and mining, either on its own, or as part of a fleet." + # PREFLIGHT CHECKLIST ## 1. Power supply @@ -45,8 +26,8 @@ - - Check if the substation unit is anchored to the floor. - - Check if the APC unit's Main Breaker is toggled on. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. P.A.C.M.A.N. generator unit @@ -55,10 +36,10 @@ - - Check if the P.A.C.M.A.N. generator unit is anchored to the floor. - - Check if the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. - - Check if the P.A.C.M.A.N. generator unit is set to HV output. - - Set Target Power to 5-6** [bold]k[/bold]W. + - Check that the P.A.C.M.A.N. generator unit is anchored to the floor. + - Check that the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator unit is set to HV output. + - Set Target Power to 5-6** [bold]kW[/bold]. - Start the P.A.C.M.A.N. generator unit. ## 2. Atmospherics @@ -69,7 +50,7 @@ - - Check if the air canister is anchored to connector port. + - Check that the air canister is anchored to connector port. ## 2.2. Waste Loop @@ -88,9 +69,9 @@ - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. - - Check if the bow window shutters are closed. + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + - Check that the bow window shutters are closed. ## Sidenotes diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml index 1d6efae155f..dd175d85899 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml @@ -4,9 +4,12 @@ + + + [color=#a4885c]Ship Size:[/color] Small [color=#a4885c]Recommended Crew:[/color] 2-3 @@ -17,27 +20,8 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - "A good small size shuttle to provide medical care throughout the sector." - - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - + # PREFLIGHT CHECKLIST ## 1. Power supply @@ -49,9 +33,9 @@ - - Check if the SMES unit is anchored to the floor. + - Check that the SMES unit is anchored to the floor. - Check the substation unit. - - Check if the APC unit's Main Breaker is toggled on. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. P.A.C.M.A.N. generator unit @@ -60,10 +44,10 @@ - - Check if the P.A.C.M.A.N. generator unit is anchored to the floor. - - Check if the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. - - Check if the P.A.C.M.A.N. generator unit is set to HV output. - - Set Target Power for 15-16** [bold]k[/bold]W. + - Check that the P.A.C.M.A.N. generator unit is anchored to the floor. + - Check that the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator unit is set to HV output. + - Set Target Power for 15-16** [bold]kW[/bold]. - Start the P.A.C.M.A.N. generator unit. ## 2. Atmospherics @@ -75,8 +59,8 @@ - - Check if the air canister is anchored to connector port. - - Check if the distribution pump is set to normal pressure. + - Check that the air canister is anchored to connector port. + - Check that the distribution pump is set to 101kPa. - Enable the distribution pump. ## 2.2. Waste Loop @@ -96,9 +80,9 @@ - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. - - Check if blast doors are closed. + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + - Check that blast doors are closed. ## Sidenotes diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Spirit.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Spirit.xml index 034ec095749..d1d47bd4a48 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Spirit.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Spirit.xml @@ -16,27 +16,8 @@ [color=#a4885c]IFF Console:[/color] None - [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary - "An absolutely tiny shuttle designed for rapid response search and rescue operations on a budget." - # Piloting - - - - After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: - - - First, disconnect any airlocks that are connected to the dock. - - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. - - # Hiring crew - - - - - - As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. - # PREFLIGHT CHECKLIST ## 1. Power supply @@ -47,7 +28,7 @@ - - Check if the APC unit's Main Breaker is toggled on. + - Check that the APC unit's Main Breaker is toggled on. - Check the APC unit's current Load* (W). ## 1.2. P.A.C.M.A.N. generator unit @@ -56,10 +37,10 @@ - - Check if the P.A.C.M.A.N. generator unit is anchored to the floor. - - Check if the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. - - Check if the P.A.C.M.A.N. generator unit is set to HV output. - - Set Target Power for 8** [bold]k[/bold]W. + - Check that the P.A.C.M.A.N. generator unit is anchored to the floor. + - Check that the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator unit is set to HV output. + - Set Target Power for 8** [bold]kW[/bold]. - Start the P.A.C.M.A.N. generator unit. ## 2. Atmospherics @@ -71,8 +52,8 @@ - - Check if the air canister is anchored to connector port. - - Check if the distribution pump is set to normal pressure (101kPa). + - Check that the air canister is anchored to connector port. + - Check that the distribution pump is set to 101kPa (101kPa). - Enable the distribution pump. ## 2.2. Waste Loop @@ -84,19 +65,10 @@ - Enable waste loop pump. - Disable Auto Mode on the Air Alarm in the Engine Room. - Set the Air Alarm in the Engine Room to Filtering (Wide). - - ## 3. Other checks - - - - - - - Check if the gyroscope is anchored, powered, and enabled. - - Check if the mini gravity generator is anchored, powered, and enabled. - + ## Sidenotes - * - Spirit-class SAR ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption (which for the unmodified ship is 7.7 kW). One can check the ship's total power consumption against the P.A.C.M.A.N. generator target power output: to keep substation and APC fully charged, the P.A.C.M.A.N. generator target power should exceed APC's Load. Remember to check the APC Load and adjust the generator unit's target power after connecting new power-consuming machines. + * - Spirit-class SAR ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption (which for the unmodified ship is 7.7 kW). To keep the substation and APC fully charged, the generator target power should exceed APC's Load, but by as little as possible to achieve maximum fuel efficiency. Remember to check the APC Load and adjust the generator unit's target power after adding or removing power-consuming machines. ** - Spirit-class S.A.R. ships have low power demand. A standard P.A.C.M.A.N. generator's target power value can be set to 8 kW. Due to the low mass of the shuttle less power is needed to maintain inertial dampening and the artificial gravity field, 8kW is sufficient even when the gravity generator is spooling. diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json new file mode 100644 index 00000000000..932ea0c4829 --- /dev/null +++ b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14, modified by Vermidia", + "states": [ + { + "name": "mw" + }, + { + "name": "mw_unlit" + }, + { + "name": "mw0" + }, + { + "name": "mw_running_unlit" + }, + { + "name": "mwb" + }, + { + "name": "mwbloody0" + }, + { + "name": "mwbloody1" + }, + { + "name": "mwo" + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png new file mode 100644 index 00000000000..cdad6aaf282 Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png new file mode 100644 index 00000000000..532e4e63acd Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png new file mode 100644 index 00000000000..b751f308a6a Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png new file mode 100644 index 00000000000..11e691d0317 Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png new file mode 100644 index 00000000000..8d6462c92e2 Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png new file mode 100644 index 00000000000..a51302a2537 Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png new file mode 100644 index 00000000000..8cfdf34281a Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png new file mode 100644 index 00000000000..7545ff0035a Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/dead.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/dead.png new file mode 100644 index 00000000000..25c664b4e1f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/dead.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/harvest.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/harvest.png new file mode 100644 index 00000000000..445ba40887e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/harvest.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/meta.json new file mode 100644 index 00000000000..343a09ba631 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/meta.json @@ -0,0 +1,50 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13. produce, produce-beans and variants created by Stagnation (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "produce-beans" + }, + { + "name": "produce-beans-light" + }, + { + "name": "produce-beans-medium" + }, + { + "name": "produce-beans-dark" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-dark.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-dark.png new file mode 100644 index 00000000000..82cefcec1a2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-dark.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-light.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-light.png new file mode 100644 index 00000000000..9558a63ca99 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-light.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-medium.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-medium.png new file mode 100644 index 00000000000..751b30d35e4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-medium.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans.png new file mode 100644 index 00000000000..d1fe1a808aa Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce.png new file mode 100644 index 00000000000..b19fc35b75b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/seed.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/seed.png new file mode 100644 index 00000000000..d598a71786b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/seed.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-1.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-1.png new file mode 100644 index 00000000000..5310c00726f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-2.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-2.png new file mode 100644 index 00000000000..f75059755f0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-3.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-3.png new file mode 100644 index 00000000000..0a2428d8cf4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-4.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-4.png new file mode 100644 index 00000000000..2f8611e9514 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-5.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-5.png new file mode 100644 index 00000000000..32bffe34070 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-5.png differ