From c6f6b2b6d21bfba89f4013d9a60feec4ebf73d3e Mon Sep 17 00:00:00 2001 From: Verm <32827189+Vermidia@users.noreply.github.com> Date: Fri, 14 Jun 2024 22:00:00 -0500 Subject: [PATCH 01/17] Donk co. microwave + microwave tweaks (#28951) * THE syndie microwave * Always burn to explode microwave when copying * Make it so copying ids stop when the microwave is goign to explode * Made explosion destroy the board and spit out the machine parts * Move logic is MicrowaveSystem, make metal cooking use the same logic * Fix passing the wrong malfunction time * Shuttle cannot escape aggressive branding * Always make it explode with an id * Forgot to invert bool, move it after fry chance --- Content.Server/Access/Systems/IdCardSystem.cs | 15 ++++++++ .../Kitchen/Components/MicrowaveComponent.cs | 6 +++ .../Kitchen/EntitySystems/MicrowaveSystem.cs | 30 +++++++++++++-- Resources/Maps/Nonstations/nukieplanet.yml | 2 +- Resources/Maps/Shuttles/infiltrator.yml | 2 +- .../Structures/Machines/microwave.yml | 18 +++++++++ .../Machines/microwave_syndie.rsi/meta.json | 35 ++++++++++++++++++ .../Machines/microwave_syndie.rsi/mw.png | Bin 0 -> 836 bytes .../Machines/microwave_syndie.rsi/mw0.png | Bin 0 -> 825 bytes .../microwave_syndie.rsi/mw_running_unlit.png | Bin 0 -> 617 bytes .../microwave_syndie.rsi/mw_unlit.png | Bin 0 -> 1772 bytes .../Machines/microwave_syndie.rsi/mwb.png | Bin 0 -> 1193 bytes .../microwave_syndie.rsi/mwbloody0.png | Bin 0 -> 268 bytes .../microwave_syndie.rsi/mwbloody1.png | Bin 0 -> 230 bytes .../Machines/microwave_syndie.rsi/mwo.png | Bin 0 -> 947 bytes 15 files changed, 103 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png 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/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(EntityDHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a> zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m= zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq( z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9 zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00DeSL_t(oN9|OxPJ}=ZoikR@SP%+I0|^Nx zhRTB4KhR(BH;kV^>o4FJcr^)D#DatfF(KCx3L82TW$^ZLyV+&%j%c&f4D8O#d;4Z~ zS0Gpr1YhFX(*H$KtXR!cS@FknA3k2!OXI@X!MA!m0U>T{3;s;U~n+qRwb7^k#B0hN)RX5hAMk0ewc<3ticvXwnKQUMAa_Yu5l z8V<>IU2q%+(5sAW0XrE*0>R@rhOX;&SYa4K6h(mk;1=x9z!V7tC`FpTnqMJHL8+jS&(HJpoi^~Th}#} z2GSO6>JqNVR7JpW3pT@+EFagw_qjwVffpg@P%b)8E1(t73TOr9DDVx4p2fh*v9~b* O0000DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a> zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m= zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq( z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9 zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00D7HL_t(oN9|OxYJ@-#oeQb7Ng)=NK|$Ce zSf#MeALJYIKeqV=^94yQm`YLz5+xwliA5T_Kyo8lahF}kyOX5ZX+~#f<~`qxy93D> zW8ZRY>-VxOcf9ANs`=w}2%m2+TjRpj%^f^^R6^g2%~6hQXbAkf0?H-CG2+7fg((R< zzl)o?DG>=#tH6`?gr;-<1)!?OxNM6swr$gBQpPY0Q>27)dS<|sy~rgDf?zCM>yKqj z5~%BX1n;_T(PQ2zMoyZ8yRJKu(0R<0N$6ys6J4bM1&-$k-nOkEg75p_c^;tG8A*VD z8ASrYlO%z@?L6<3OJ0fF6FY+@@)$GEk0S-&Al*mTD3X zf5HB6q^id_grQKVB=9OFoyx`383l|2MggP18U=m;@65t#CE#KB00000NkvXXu0mjf D88&(m literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b751f308a6a25c0884e8c5f8bd83b64e50b7f121 GIT binary patch literal 617 zcmV-v0+#)WP)DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a> zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m= zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq( z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9 zjxqoM010qNS#tmY3ljhU3ljkVnw%H_005y$L_t(oN9~ls4S*mFMd4srg7Mr#25}!( zaR&}aRbq^R+QtMAA3}QIxBWZ<#$bQ|2!KFm0=CtEn1>|w7sq(j4Cct6^0IkK2N?)? zy4Agk55r`jENOGnQ^C^QFMc;si=?X>NGA!Yi9&#DUiLLt*7PJLAUz3gp#UKYk(+we>mi$CDCl^*Y37w-J<>~FBRJZiZuLHOeQ>fhusSU(;g zyp;;V)hF|NOZeo|rv+iV5%dSyziwV77q$w*dg8)#HnRS_UidKP75j-vEhNwTEru#_f2 zoCQ1*b6PUw)2u0h#ic7@yylM5WxODA@|?u7Qp34x1<<2wTs%!Cg#{j!*@T5G%2L28 zYivB`8BfRjKd9Hg|D^yz?7C|m8*K^0wTd+Bo`M_8sBA>1{j-?K$1LU3gtG1_n0YPt zCU)8hBNJ6f46s^GQw!p$J^_$+;~BEUK%V@*lLDn?jGs@+%Wj$%3*q|tCN zE}<^>0{^TEH6Y7-3^DBN1i2PE&&5)Plfse9JP4su5&+ zd65#`Mubog>CCe<4>MCY%$0nH(`jA;xqR6b9;d+Zz&z^vielIp*@o>S+tM)_VqzeQ zbxpTz)6gtq#r8%LKxdLkl{L4@14gQ$f%|KY|Mc4 zAq7-wPr0AXNWxkp2CDLH+(8yCxXXR3b0 zhgUUg4S7?7OI&5>l>@bqhKUL*kXw!Oe6>CjSOi)V82IOJ?)?mhh2874`h)%ZKPpea zk#zan@6K<_PZ=M7IllYRhv>O0!n=3JAAC0b>94`px4S3z#=qR#`t=fsz4BV}{QXPY U-+%t++xd~x>mGLQT)*|+KbGbdxc~qF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8d6462c92e22f0817b4e4a119758369f5022933a GIT binary patch literal 1193 zcmV;a1XlZrP)DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a> zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m= zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq( z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9 zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00QAjL_t(oN9|V6i&9Y(J~qw9&}tO?F$-fx zP!I!KG=br+g{`6)|AJcN%D=_k5cC&Vk&7~#U1U&;qD0WpNQTi7behy6hGM$kozCO> z-u0;v&BgNOsIq&iuWU^Q+c5GhzSMzGM>M;8{t8;#TElP(UcC@@Zzc12_ zrLUH~kLTCv^0%gCo$(k+Bxerd%(U#_SRVdsOpbLJ?=!i&j(y;9-nX(sNX)FTRskk^ zwD+AhNo2J|Mi6kw*<$P-98hzwMYI}{B$xxQs)6;B`I;qPTLm^(&k=&)OgMWu1NrO9 zdr7`7$gu}T|2k+S+F zOe_J&A78yrx8J@ZuXny6kN}9x#)+xxQ+oj5e!o9cnjVj54A*YAsaU*5#k);%gj5_bZU{EfD96{*JQi5KuN82{(fK&}eg@!^Q z8jVKAQaBu@;Ey0V!%k{68q*c<`FzLue4et|>=+nLi28yYBdk)X$OrRuIxR=u&z~D;4KP7qfyFa#&346H`ku)t!8YlKd{^b zPN#D=1-jj?BbUore#y+2%S3Oc4RpTC<(l{f0B&hQ-1{4%5uYmeKj!n;t^jXn4q%;x z!m4Sn;x_<^`(U>rh(#cBej0{*;WT&`oC^gO3M>@(uL}GD)IdW%E4V=z00000NkvXX Hu0mjf{IoPg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a51302a2537666447aab9729ffd9e99629aed1ba GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|3<7*YT(z~e z5ANE!baHbw14CnRW*h^9nVA`bHiIPtgR85nxVX5#zyFFAD;gRaQX&I^n)GFge*-Cj zk|4j}|EPfBfpV-QP%h8Y#WBR9_vr+0t^)=fF3imj&i%f>?b&6wPDhXMrFtqH1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8cfdf34281a32ce8dd087a52b77d1284ec461e3c GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}3p`yMLn2z= zPBP?TG8Ax)f0L4*xbjAoXs&If&h^ztjE-E2jyQgZlTFZ!rRi+FK%JW8Gycg90!|&Q zHYp7$QVQxP4kqRQo@Cw{oFi(NvR-f&DXP8ng^Zl zHO|)h%w51Pm$vU^VP5V7o^>|PCXY?$Yra`KF_BkgwgXGw)R$LHX7D||?ygg~)`>&0 c<;6qR_z=%p$19>CK({h@y85}Sb4q9e0Qr+vJOBUy literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7545ff0035ab035f67ba083c11411ca94b5b8bcc GIT binary patch literal 947 zcmV;k15EshP)DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a> zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m= zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq( z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9 zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00HYsL_t(oN9|TIYr;SjewI!yItbZCN+5;e zQU$yA50vH?L`pYz9ZH9|7AK{cUy#zROS@LE-8uw95tmMZ47xZK?7i5Fm-AwhHt3Qs z%iX(o@B8xI%aI&#P!wg!$I_l#mX)J54@JfA%QDP9Uee};;>kH&P3=J4gVb3P7R&_f z-2q_};xS^w>;ggo&!4MK9n4&~E|${O!7+w9faH&-XK?ZU3Z+sq5trWp4}!`V=MgG^ zO`H$sv0W%M3x2MpTC4F5fO4z|Yit!jj{rG*SGL-#zd)yWay$#p@@2_AA(`a{y z17V1D1W^nqf^~xCE9S55WO>%t(4QLrv@qEe~AVzGdHJ`a=0B)SJANm}-LJ+N&X z`u)DY!Lc0BEgd990vz*T;{{kZVYOQIQ)3ChY$P|$pl2Pe;}sf?hd{?@Ielw3Zr-i; zjz*(MFJtw9Zs=fWhW8~P8INwg>xDE!gCp`#G#U+m%)b;}h$R3m#^MMR!k;%?!#oy$ zazK`4P*pY116Y(6r(`ShtJT{0C1Yu0UTLs|a8zzza;A=vNi4bqT58%D958jM3b0Bjdb6}?q`~YNO VkNCdzgV_K8002ovPDHLkV1mPAuDAdI literal 0 HcmV?d00001 From af0291c9deb37b60731e0cdffe0867881eefa846 Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 15 Jun 2024 17:44:56 +0200 Subject: [PATCH 02/17] MMMMMMMMMM --- .../Devices/Circuitboards/Machine/production.yml | 14 ++++++++++++++ .../Entities/Structures/Machines/microwave.yml | 4 ++-- Resources/Prototypes/tags.yml | 6 ++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 2ff2a1cb683..4c866ff1234 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -1076,6 +1076,20 @@ tags: - MicrowaveMachineBoard +- type: entity + id: SyndicateMicrowaveMachineCircuitboard + parent: BaseMachineCircuitboard + name: donk co. microwave machine board + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: SyndicateMicrowave + 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 17e6b7f0e51..9b4963fe9d2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml @@ -121,5 +121,5 @@ sprite: Structures/Machines/microwave_syndie.rsi drawdepth: SmallObjects snapCardinals: true - - + - type: Machine + board: SyndicateMicrowaveMachineCircuitboard diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index c3dbf0bf09f..0c9766cd33b 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -258,6 +258,12 @@ - type: Tag id: CableCoil +- type: Tag + id: Candle + +- type: Tag + id: Cake + - type: Tag id: CaneBlade From ea368b532d8609b819d9aba3f6d11fa33622e8d7 Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 17 Jun 2024 00:25:33 +0300 Subject: [PATCH 03/17] Update tags.yml --- Resources/Prototypes/tags.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 0c9766cd33b..c3dbf0bf09f 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -258,12 +258,6 @@ - type: Tag id: CableCoil -- type: Tag - id: Candle - -- type: Tag - id: Cake - - type: Tag id: CaneBlade From 781b9f168b2426829a7cb6042a2f8a4f674af848 Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Fri, 17 May 2024 01:48:22 -0700 Subject: [PATCH 04/17] Add data field for id card microwave behaviour (#28087) --- Content.Shared/Access/Components/IdCardComponent.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Access/Components/IdCardComponent.cs b/Content.Shared/Access/Components/IdCardComponent.cs index 9459f6c1910..2e20c584da5 100644 --- a/Content.Shared/Access/Components/IdCardComponent.cs +++ b/Content.Shared/Access/Components/IdCardComponent.cs @@ -42,6 +42,11 @@ public sealed partial class IdCardComponent : Component [DataField, ViewVariables(VVAccess.ReadWrite)] public bool BypassLogging; + [DataField] + public LocId FullNameLocId = "access-id-card-component-owner-full-name-job-title-text"; + + [DataField] + public bool CanMicrowave = true; // Frontier [DataField("soundError")] @@ -57,5 +62,4 @@ public sealed partial class IdCardComponent : Component [DataField("soundInsert")] public SoundSpecifier InsertSound = new SoundPathSpecifier("/Audio/Machines/id_insert.ogg"); - } From 072f6e92ab0e8c36288eaab0d5621d2aadd0a5aa Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 17 Jun 2024 00:35:24 +0300 Subject: [PATCH 05/17] MMMMMM Maps --- Resources/Maps/_NF/POI/cove.yml | 2 +- Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml | 2 +- Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml | 2 +- .../Prototypes/Entities/Structures/Machines/microwave.yml | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) 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 3f0652df212..56c159a36ec 100644 --- a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml +++ b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml @@ -3793,7 +3793,7 @@ entities: - type: Transform pos: 3.5,-3.5 parent: 1 -- proto: KitchenMicrowave +- proto: SyndicateMicrowave entities: - uid: 497 components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml index 9b4963fe9d2..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: @@ -116,7 +118,7 @@ cookTimeMultiplier: 0.5 capacity: 10 canMicrowaveIdsSafely: false - explosionChance: 0.3 + explosionChance: 1 # Frontier 0.3<1 - type: Sprite sprite: Structures/Machines/microwave_syndie.rsi drawdepth: SmallObjects From ade4031e9553857e94fd58a2e78aae9066496883 Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 17 Jun 2024 00:55:44 +0300 Subject: [PATCH 06/17] Update production.yml --- .../Objects/Devices/Circuitboards/Machine/production.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 4c866ff1234..3350ecf98ac 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -1085,10 +1085,15 @@ state: service - type: MachineBoard prototype: SyndicateMicrowave - stackRequirements: + requirements: Capacitor: 1 + materialRequirements: Glass: 2 Cable: 2 + # stackRequirements: + # Capacitor: 1 + # Glass: 2 + # Cable: 2 - type: entity id: FatExtractorMachineCircuitboard From c8b6966f1d973f9b4e2f670600d41d2651158324 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:08:42 +0300 Subject: [PATCH 07/17] Generic Message for FTL Events (#1552) * Initial commit * NT * Update Resources/Locale/en-US/_NF/bluespace-events/events.ftl Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../en-US/_NF/bluespace-events/events.ftl | 3 +++ Resources/Maps/_NF/Bluespace/bloodmoon.yml | 2 +- Resources/Maps/_NF/Bluespace/cargoniaship.yml | 2 +- Resources/Maps/_NF/Bluespace/datacarrier.yml | 2 +- .../Maps/_NF/Bluespace/syndieftlintercept.yml | 2 +- .../Maps/_NF/Bluespace/wizardprobealt.yml | 2 +- .../_NF/Events/events_bluespace.yml | 24 +++++++++---------- 7 files changed, 20 insertions(+), 17 deletions(-) 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/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/Prototypes/_NF/Events/events_bluespace.yml b/Resources/Prototypes/_NF/Events/events_bluespace.yml index 3c7ccb4714f..ebce390b539 100644 --- a/Resources/Prototypes/_NF/Events/events_bluespace.yml +++ b/Resources/Prototypes/_NF/Events/events_bluespace.yml @@ -113,10 +113,10 @@ # noSpawn: true # components: # - type: StationEvent - # startAnnouncement: station-event-bluespace-ship-start-announcement + # startAnnouncement: station-event-bluespace-generic-ftl-start-announcement # startAudio: - # path: /Audio/Announcements/attention.ogg - # endAnnouncement: station-event-bluespace-ship-end-announcement + # path: /Audio/Misc/notice1.ogg + # endAnnouncement: station-event-bluespace-generic-ftl-end-announcement # earliestStart: 100 # minimumPlayers: 15 # weight: 2 @@ -134,10 +134,10 @@ noSpawn: true components: - type: StationEvent - startAnnouncement: station-event-bluespace-ship-start-announcement + startAnnouncement: station-event-bluespace-generic-ftl-start-announcement startAudio: - path: /Audio/Announcements/attention.ogg - endAnnouncement: station-event-bluespace-ship-end-announcement + path: /Audio/Misc/notice1.ogg + endAnnouncement: station-event-bluespace-generic-ftl-end-announcement earliestStart: 100 minimumPlayers: 35 weight: 2 @@ -156,10 +156,10 @@ noSpawn: true components: - type: StationEvent - startAnnouncement: station-event-bluespace-syndicate-ftl-interception-start-announcement + startAnnouncement: station-event-bluespace-generic-ftl-start-announcement startAudio: path: /Audio/Misc/notice1.ogg - endAnnouncement: station-event-bluespace-syndicate-ftl-interception-end-announcement + endAnnouncement: station-event-bluespace-generic-ftl-end-announcement earliestStart: 80 minimumPlayers: 45 weight: 1 @@ -178,10 +178,10 @@ noSpawn: true components: - type: StationEvent - startAnnouncement: station-event-bluespace-wizardfederation-scout-start-announcement + startAnnouncement: station-event-bluespace-generic-ftl-start-announcement startAudio: path: /Audio/Misc/notice1.ogg - endAnnouncement: station-event-bluespace-wizardfederation-scout-end-announcement + endAnnouncement: station-event-bluespace-generic-ftl-end-announcement earliestStart: 100 minimumPlayers: 45 weight: 1 @@ -200,10 +200,10 @@ noSpawn: true components: - type: StationEvent - startAnnouncement: station-event-bluespace-bloodmoon-start-announcement + startAnnouncement: station-event-bluespace-generic-ftl-start-announcement startAudio: path: /Audio/Misc/notice1.ogg - endAnnouncement: station-event-bluespace-bloodmoon-end-announcement + endAnnouncement: station-event-bluespace-generic-ftl-end-announcement earliestStart: 80 minimumPlayers: 45 weight: 1 From ed97f6f75adbbcfcc7645429afb749357cbeb68f Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 21 Jun 2024 14:09:09 +0000 Subject: [PATCH 08/17] Automatic Changelog (#1552) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 475f6a46950..b89b1167277 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5149,3 +5149,12 @@ 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' From 39591e99922a097e53356040908eaaae183d802e Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 21 Jun 2024 13:02:34 -0400 Subject: [PATCH 09/17] Cryogenics: restrict cryo pods to cryo meds, restore limited metabolism (#1533) * Cleanup, revised Solution split * French spacing * cryo pod: only extract cryogenics chems from soln * Add Cryogenic metabolism group, add to organs * Cleanup comments, "PerReagent" soln split & docs * Comment accuracy * SplitSolutionPerReagent: suggested fixes --------- Co-authored-by: Whatstone --- .../Body/Components/MetabolizerComponent.cs | 10 -- .../Body/Systems/MetabolizerSystem.cs | 17 +-- Content.Server/Medical/CryoPodSystem.cs | 13 +- .../Chemistry/Components/Solution.cs | 130 +++++++++++++----- .../SharedSolutionContainerSystem.cs | 26 +++- .../Medical/Cryogenics/CryoPodComponent.cs | 5 +- .../_NF/metabolism/metabolism-groups.ftl | 1 + .../Locale/en-US/reagents/meta/medicine.ftl | 8 +- .../Prototypes/Body/Organs/Animal/animal.yml | 1 + .../Prototypes/Body/Organs/Animal/slimes.yml | 1 + Resources/Prototypes/Body/Organs/arachnid.yml | 1 + Resources/Prototypes/Body/Organs/diona.yml | 1 + Resources/Prototypes/Body/Organs/human.yml | 1 + Resources/Prototypes/Body/Organs/moth.yml | 1 + Resources/Prototypes/Body/Organs/slime.yml | 1 + .../Entities/Mobs/NPCs/behonker.yml | 1 + .../Entities/Mobs/Player/dragon.yml | 1 + Resources/Prototypes/Reagents/medicine.yml | 14 +- .../_NF/Body/Organs/goblin_organs.yml | 1 + .../_NF/Body/Organs/synthetic_organs.yml | 1 + .../_NF/Chemistry/metabolism_groups.yml | 4 + .../_NF/Entities/Mobs/NPCs/baby_dragon.yml | 1 + .../_NF/Entities/Mobs/Player/jerma.yml | 1 + .../Prototypes/_NF/Reagents/medicine.yml | 6 +- .../Guidebook/Medical/Cryogenics.xml | 2 +- 25 files changed, 173 insertions(+), 76 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/metabolism/metabolism-groups.ftl create mode 100644 Resources/Prototypes/_NF/Chemistry/metabolism_groups.yml 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/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs index 88dc5176f18..f73b22c26f6 100644 --- a/Content.Server/Medical/CryoPodSystem.cs +++ b/Content.Server/Medical/CryoPodSystem.cs @@ -55,6 +55,9 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + // Frontier: keep a list of cryogenics reagents. The pod will only filter these out from the provided solution. + private static readonly string[] CryogenicsReagents = ["Cryoxadone", "Aloxadone", "Doxarubixadone", "Opporozidone", "Necrosol", "Traumoxadone", "Stelloxadone"]; + public override void Initialize() { base.Initialize(); @@ -115,14 +118,14 @@ public override void Update(float frameTime) continue; } - // frontier + // Frontier // Filter out a fixed amount of each reagent from the cryo pod's beaker - var solutionToInject = _solutionContainerSystem.SplitSolutionReagentsEvenly(containerSolution.Value, cryoPod.BeakerTransferAmount); - // for every .25 units used, .5 units per second are added to the body, making cryo-pod more efficient than injections - solutionToInject.ScaleSolution(cryoPod.PotencyMultiplier); + var solutionToInject = _solutionContainerSystem.SplitSolutionPerReagentWithOnly(containerSolution.Value, cryoPod.BeakerTransferAmount, CryogenicsReagents); - // End frontier + // For every .25 units used, .5 units per second are added to the body, making cryo-pod more efficient than injections. + solutionToInject.ScaleSolution(cryoPod.PotencyMultiplier); + // End Frontier _bloodstreamSystem.TryAddToChemicals(patient.Value, solutionToInject, bloodstream); _reactiveSystem.DoEntityReaction(patient.Value, solutionToInject, ReactionMethod.Injection); diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs index 3a3400ca591..6e2e0305e8e 100644 --- a/Content.Shared/Chemistry/Components/Solution.cs +++ b/Content.Shared/Chemistry/Components/Solution.cs @@ -606,11 +606,12 @@ public Solution SplitSolutionWithOnly(FixedPoint2 toTake, params string[] includ return sol; } + /// - /// 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/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/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/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 4d44dbad42f..64d7690ef24 100644 --- a/Resources/Prototypes/Body/Organs/moth.yml +++ b/Resources/Prototypes/Body/Organs/moth.yml @@ -27,6 +27,7 @@ - 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/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 51e41e26077..926bbd5eead 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/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 4d4af6d931e..ea18fa64df0 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -168,7 +168,7 @@ physicalDesc: reagent-physical-desc-fizzy flavor: medicine color: "#0091ff" - worksOnTheDead: true # Frontier + worksOnTheDead: true # Frontier plantMetabolism: - !type:PlantAdjustToxins amount: -5 @@ -176,7 +176,7 @@ amount: 5 - !type:PlantCryoxadone {} metabolisms: - Medicine: + Cryogenic: # Frontier: Medicine From c8bb112e8728af952fa97187133ff14143f71477 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 21 Jun 2024 17:03:01 +0000 Subject: [PATCH 10/17] Automatic Changelog (#1533) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b89b1167277..afcfeb8dd63 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5158,3 +5158,11 @@ Entries: 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' From d350bf2ffdfbe7fc0840e5af36d5ba8a4f239747 Mon Sep 17 00:00:00 2001 From: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Sun, 23 Jun 2024 04:19:20 -0400 Subject: [PATCH 11/17] fix reptilian helmets (#1554) --- .../_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json | 4 ++-- ...lizard.png => off-equipped-HELMET-reptilian.png} | Bin ...-lizard.png => on-equipped-HELMET-reptilian.png} | Bin .../Head/Hardsuits/nfsd_combat.rsi/meta.json | 4 ++-- ...lizard.png => off-equipped-HELMET-reptilian.png} | Bin ...-lizard.png => on-equipped-HELMET-reptilian.png} | Bin .../Head/Hardsuits/nfsd_command.rsi/meta.json | 4 ++-- ...lizard.png => off-equipped-HELMET-reptilian.png} | Bin ...-lizard.png => on-equipped-HELMET-reptilian.png} | Bin .../Head/Hardsuits/nfsd_experimental.rsi/meta.json | 4 ++-- ...lizard.png => off-equipped-HELMET-reptilian.png} | Bin ...-lizard.png => on-equipped-HELMET-reptilian.png} | Bin .../Head/Hardsuits/nfsd_sheriff.rsi/meta.json | 4 ++-- ...lizard.png => off-equipped-HELMET-reptilian.png} | Bin ...-lizard.png => on-equipped-HELMET-reptilian.png} | Bin 15 files changed, 10 insertions(+), 10 deletions(-) rename Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/{off-equipped-HELMET-lizard.png => off-equipped-HELMET-reptilian.png} (100%) rename Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/{on-equipped-HELMET-lizard.png => on-equipped-HELMET-reptilian.png} (100%) rename Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/{off-equipped-HELMET-lizard.png => off-equipped-HELMET-reptilian.png} (100%) rename Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/{on-equipped-HELMET-lizard.png => on-equipped-HELMET-reptilian.png} (100%) rename Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/{off-equipped-HELMET-lizard.png => off-equipped-HELMET-reptilian.png} (100%) rename Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/{on-equipped-HELMET-lizard.png => on-equipped-HELMET-reptilian.png} (100%) rename Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/{off-equipped-HELMET-lizard.png => off-equipped-HELMET-reptilian.png} (100%) rename Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/{on-equipped-HELMET-lizard.png => on-equipped-HELMET-reptilian.png} (100%) rename Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/{off-equipped-HELMET-lizard.png => off-equipped-HELMET-reptilian.png} (100%) rename Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/{on-equipped-HELMET-lizard.png => on-equipped-HELMET-reptilian.png} (100%) diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json index c1850cf5215..04dcf4b3c0b 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json @@ -21,7 +21,7 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-lizard", + "name": "off-equipped-HELMET-reptilian", "directions": 4 }, { @@ -41,7 +41,7 @@ "directions": 4 }, { - "name": "on-equipped-HELMET-lizard", + "name": "on-equipped-HELMET-reptilian", "directions": 4 }, { diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-reptilian.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-reptilian.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-reptilian.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-reptilian.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json index 7ff43c2de33..15cd65040c2 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json @@ -22,7 +22,7 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-lizard", + "name": "off-equipped-HELMET-reptilian", "directions": 4 }, { @@ -42,7 +42,7 @@ "directions": 4 }, { - "name": "on-equipped-HELMET-lizard", + "name": "on-equipped-HELMET-reptilian", "directions": 4 }, { diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-reptilian.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-reptilian.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-reptilian.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-reptilian.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json index 7ff43c2de33..15cd65040c2 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json @@ -22,7 +22,7 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-lizard", + "name": "off-equipped-HELMET-reptilian", "directions": 4 }, { @@ -42,7 +42,7 @@ "directions": 4 }, { - "name": "on-equipped-HELMET-lizard", + "name": "on-equipped-HELMET-reptilian", "directions": 4 }, { diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-reptilian.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-reptilian.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-reptilian.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-reptilian.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json index 1d1e66d4e05..b37a49af42b 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json @@ -21,7 +21,7 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-lizard", + "name": "off-equipped-HELMET-reptilian", "directions": 4 }, { @@ -41,7 +41,7 @@ "directions": 4 }, { - "name": "on-equipped-HELMET-lizard", + "name": "on-equipped-HELMET-reptilian", "directions": 4 }, { diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-reptilian.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-reptilian.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-reptilian.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-reptilian.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/meta.json index c1850cf5215..04dcf4b3c0b 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/meta.json @@ -21,7 +21,7 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-lizard", + "name": "off-equipped-HELMET-reptilian", "directions": 4 }, { @@ -41,7 +41,7 @@ "directions": 4 }, { - "name": "on-equipped-HELMET-lizard", + "name": "on-equipped-HELMET-reptilian", "directions": 4 }, { diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-reptilian.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-reptilian.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-reptilian.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-reptilian.png From 7e38e7d278569b65f4bf6463a70444ee2fc86cbd Mon Sep 17 00:00:00 2001 From: Actualcatmoment Date: Mon, 24 Jun 2024 14:09:00 +0800 Subject: [PATCH 12/17] Ship guide reworks (#1534) * Ship Guide Reworks Moved the repetitive piloting/hiring sections to their own entries. Changed some wording to be less ambiguous, tweaked some grammar. * Update Resources/ServerInfo/_NF/Guidebook/Hiring.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/Hiring.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/Piloting.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/Piloting.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/Shipyard/Spirit.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/Hiring.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Spirit.xml * Update Resources/ServerInfo/_NF/Guidebook/Piloting.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update guides.ftl * Update Resources/ServerInfo/_NF/Guidebook/Piloting.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Ceres.xml * Update Kilderkin.xml * Update Legman.xml * Update Liquidator.xml * Added Expeditions guidebook entry Also removed the expedition info from brigand and gasbender guides. * Update Lantern.xml * Guidebook rewrite * Guidebook revisions * Restructured hiring guidebook page --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone --- .../Locale/en-US/_NF/guidebook/guides.ftl | 20 +++++- Resources/Prototypes/_NF/Guidebook/bank.yml | 3 +- .../Prototypes/_NF/Guidebook/expeditions.yml | 67 +++++++++++++++++++ Resources/Prototypes/_NF/Guidebook/hiring.yml | 5 ++ Resources/Prototypes/_NF/Guidebook/nf14.yml | 3 + .../Prototypes/_NF/Guidebook/piloting.yml | 5 ++ .../Prototypes/_NF/Guidebook/shipyard.yml | 1 + Resources/ServerInfo/_NF/Guidebook/Bank.xml | 34 +++++----- .../_NF/Guidebook/ExpeditionFactions/Carp.xml | 5 ++ .../Guidebook/ExpeditionFactions/Cultists.xml | 5 ++ .../ExpeditionFactions/Dinosaurs.xml | 5 ++ .../ExpeditionFactions/Explorers.xml | 5 ++ .../Guidebook/ExpeditionFactions/Flesh.xml | 5 ++ .../Guidebook/ExpeditionFactions/Gangers.xml | 5 ++ .../ExpeditionFactions/Mercenaries.xml | 5 ++ .../Guidebook/ExpeditionFactions/Silicons.xml | 5 ++ .../ExpeditionFactions/Syndicate.xml | 5 ++ .../Guidebook/ExpeditionFactions/Xenos.xml | 5 ++ .../ServerInfo/_NF/Guidebook/Expeditions.xml | 33 +++++++++ Resources/ServerInfo/_NF/Guidebook/Hiring.xml | 21 ++++++ .../_NF/Guidebook/NewFrontier14.xml | 44 ++++++------ .../ServerInfo/_NF/Guidebook/Piloting.xml | 35 ++++++++++ .../ServerInfo/_NF/Guidebook/Shipyard.xml | 53 ++++++++++----- .../_NF/Guidebook/Shipyard/Ambition.xml | 47 ++++--------- .../_NF/Guidebook/Shipyard/Brigand.xml | 54 ++++----------- .../_NF/Guidebook/Shipyard/Ceres.xml | 23 +------ .../_NF/Guidebook/Shipyard/Gasbender.xml | 61 +++++------------ .../_NF/Guidebook/Shipyard/Harbormaster.xml | 43 ++++-------- .../_NF/Guidebook/Shipyard/Kilderkin.xml | 41 +++--------- .../_NF/Guidebook/Shipyard/Lantern.xml | 43 ++++-------- .../_NF/Guidebook/Shipyard/Legman.xml | 39 +++-------- .../_NF/Guidebook/Shipyard/Liquidator.xml | 59 ++++++---------- .../_NF/Guidebook/Shipyard/Pioneer.xml | 43 ++++-------- .../_NF/Guidebook/Shipyard/Searchlight.xml | 46 +++++-------- .../_NF/Guidebook/Shipyard/Spirit.xml | 46 +++---------- 35 files changed, 469 insertions(+), 450 deletions(-) create mode 100644 Resources/Prototypes/_NF/Guidebook/expeditions.yml create mode 100644 Resources/Prototypes/_NF/Guidebook/hiring.yml create mode 100644 Resources/Prototypes/_NF/Guidebook/piloting.yml create mode 100644 Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Carp.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Cultists.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Dinosaurs.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Explorers.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Flesh.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Gangers.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Mercenaries.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Silicons.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Syndicate.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/ExpeditionFactions/Xenos.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/Expeditions.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/Hiring.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/Piloting.xml 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/Prototypes/_NF/Guidebook/bank.yml b/Resources/Prototypes/_NF/Guidebook/bank.yml index de7d49acdc3..8d1ed470400 100644 --- a/Resources/Prototypes/_NF/Guidebook/bank.yml +++ b/Resources/Prototypes/_NF/Guidebook/bank.yml @@ -1,4 +1,5 @@ - type: guideEntry id: Bank name: guide-entry-bank - text: "/ServerInfo/_NF/Guidebook/Bank.xml" \ No newline at end of file + text: "/ServerInfo/_NF/Guidebook/Bank.xml" + priority: 0 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Guidebook/expeditions.yml b/Resources/Prototypes/_NF/Guidebook/expeditions.yml new file mode 100644 index 00000000000..872e9f9691f --- /dev/null +++ b/Resources/Prototypes/_NF/Guidebook/expeditions.yml @@ -0,0 +1,67 @@ +- type: guideEntry + id: Expeditions + name: guide-entry-expeditions + text: "/ServerInfo/_NF/Guidebook/Expeditions.xml" + priority: 3 + # children: # TODO: flesh these out + # - ExpeditionFactionCarp + # - ExpeditionFactionCultists + # - ExpeditionFactionDinosaurs + # - ExpeditionFactionExplorers + # - ExpeditionFactionFlesh + # - ExpeditionFactionGangers + # - ExpeditionFactionMercenaries + # - ExpeditionFactionSilicons + # - ExpeditionFactionSyndicate + # - ExpeditionFactionXenos + +# TODO: flesh these out +# - type: guideEntry +# id: ExpeditionFactionCarp +# name: guide-entry-expedition-faction-carp +# text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Carp.xml" + +# - type: guideEntry +# id: ExpeditionFactionCultists +# name: guide-entry-expedition-faction-cultists +# text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Cultists.xml" + +# - type: guideEntry +# id: ExpeditionFactionDinosaurs +# name: guide-entry-expedition-faction-dinosaurs +# text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Dinosaurs.xml" + +# - type: guideEntry +# id: ExpeditionFactionExplorers +# name: guide-entry-expedition-faction-explorers +# text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Explorers.xml" + +# - type: guideEntry +# id: ExpeditionFactionFlesh +# name: guide-entry-expedition-faction-flesh +# text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Flesh.xml" + +# - type: guideEntry +# id: ExpeditionFactionGangers +# name: guide-entry-expedition-faction-gangers +# text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Gangers.xml" + +# - type: guideEntry +# id: ExpeditionFactionMercenaries +# name: guide-entry-expedition-faction-mercenaries +# text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Mercenaries.xml" + +# - type: guideEntry +# id: ExpeditionFactionSilicons +# name: guide-entry-expedition-faction-silicons +# text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Silicons.xml" + +# - type: guideEntry +# id: ExpeditionFactionSyndicate +# name: guide-entry-expedition-faction-syndicate +# text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Syndicate.xml" + +# - type: guideEntry +# id: ExpeditionFactionXenos +# name: guide-entry-expedition-faction-xenos +# text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Xenos.xml" diff --git a/Resources/Prototypes/_NF/Guidebook/hiring.yml b/Resources/Prototypes/_NF/Guidebook/hiring.yml new file mode 100644 index 00000000000..38b679e7172 --- /dev/null +++ b/Resources/Prototypes/_NF/Guidebook/hiring.yml @@ -0,0 +1,5 @@ +- type: guideEntry + id: Hiring + name: guide-entry-hiring + text: "/ServerInfo/_NF/Guidebook/Hiring.xml" + priority: 1 diff --git a/Resources/Prototypes/_NF/Guidebook/nf14.yml b/Resources/Prototypes/_NF/Guidebook/nf14.yml index 6c3e7853b80..723dd95f289 100644 --- a/Resources/Prototypes/_NF/Guidebook/nf14.yml +++ b/Resources/Prototypes/_NF/Guidebook/nf14.yml @@ -5,4 +5,7 @@ priority: -1 children: - Bank + - Hiring + - Piloting + - Expeditions - Shipyard diff --git a/Resources/Prototypes/_NF/Guidebook/piloting.yml b/Resources/Prototypes/_NF/Guidebook/piloting.yml new file mode 100644 index 00000000000..915418da943 --- /dev/null +++ b/Resources/Prototypes/_NF/Guidebook/piloting.yml @@ -0,0 +1,5 @@ +- type: guideEntry + id: Piloting + name: guide-entry-piloting + text: "/ServerInfo/_NF/Guidebook/Piloting.xml" + priority: 2 diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index b774c91f041..52043f3c2e2 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -2,6 +2,7 @@ id: Shipyard name: guide-entry-shipyard text: "/ServerInfo/_NF/Guidebook/Shipyard.xml" + priority: 4 children: - ShipyardAmbition - ShipyardBrigand diff --git a/Resources/ServerInfo/_NF/Guidebook/Bank.xml b/Resources/ServerInfo/_NF/Guidebook/Bank.xml index a77aa103ac4..bd8aa049455 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Bank.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Bank.xml @@ -1,23 +1,27 @@ -# NT Galactic Bank + # NT Galactic Bank + +As a contractor with Nanotrasen, you have a persistent bank account. +Money that you [bold]deposit[/bold] at an [color=#44cc00]ATM[/color] on Frontier Outpost or Tinnia's rest will be stored in your account. -NT has opened up it's banking industry to regular citizens, guaranteeing up to (int32.MAX)! - ## ATMs - - - - -You can access your personal bank account at any time to withdraw or deposit funds at any [color=#44cc00]Galactic Bank ATM[/color] + + + + + You can access your personal bank account at any time to withdraw your hard-earned [color=#44cc00]Spesos[/color] at any [color=#44cc00]Galactic Bank ATM[/color]. -NT currently only recognizes [color=#44cc00]Spesos[/color] or "SpaceBucks" as legal tender. +Only ATMs on Frontier Outpost and Tinnia's Rest allow you to deposit money. +Make sure you deposit your cash and sell off your ship before ending your shift! ## Account Access - - - - -Access to your bank account is restricted to [color=#44cc00]Galactic Bank ATMs[/color] and a regulated variety of [color=#44cc00]Vending machines[/color] + + + + + + Your bank account can be used through [color=#44cc00]Galactic Bank ATMs[/color], [color=#44cc00]cargo computers[/color], and [color=#44cc00]vending machines[/color]. -Most in-person transactions you will deal in will be directly with [color=#44cc00]Spesos[/color] +When trading with other people, you'll usually deal in stacks of [color=#44cc00]Spesos[/color]. +Be sure to deposit these at an [color=#44cc00]ATM[/color] before ending your shift. 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 252d056f041..a02975882ba 100644 --- a/Resources/ServerInfo/_NF/Guidebook/NewFrontier14.xml +++ b/Resources/ServerInfo/_NF/Guidebook/NewFrontier14.xml @@ -1,28 +1,34 @@ -# NT New Frontiers Program + # NT New Frontiers Program -Thank you for signing up for the New Frontiers Program! +Thank you for signing up for the New Frontiers Program! As a Nanotrasen employee, you're helping to develop the furthest reaches of space! -After countless hours of research and number crunching, the top NT insurance agents have found it more profitable to offload the logistics cost on to you! Our dedicated employees! +[color=#33bbff]If you'd like a hand, ask on the radio, or talk to somebody.[/color] +The [color=#dd0000]Valet[/color] or [color=#009933]Station Representative[/color] should be able to help, they're to the right of medbay. -## Profit Avenues - - - - - -You can access your personal bank account at any time to withdraw or deposit funds at any [color=#44cc00]Galactic Bank ATM[/color] +## Economy + + + + + + Any money that you make is [bold]yours[/bold], and will be available in future shifts if deposited at a [color=#44cc00]Galactic Bank ATM[/color] on Frontier Outpost or Tinnia's Rest. -Join a ship's crew to help make as much money and deliver as much value to NT as possible, or use the [color=#cccc00]Shipyard Console[/color] to purchase your own. +To make money, why not: +- Join a ship's crew? Ask on the radio if anyone needs extra crew, and work to help your captain. +- Get a job on station? Ask the [color=#009933]Station Representative[/color] (follow the SR signs) if anything needs doing. +- Use a [color=#cccc00]shipyard console[/color] to purchase your own ship? -## Provisions - - - - - -NT has opened up back stock of many machine boards taken from excess station construction projects, along with many other amenities to assist in taming the frontier. +## Amenities + + + + + + Some provisions (e.g. air tanks, salvage equipment) are available from vendors on Frontier Outpost, but most amenities (medical services, food) should be offered by players on shuttles or at the Trade Depot. -Frontier stations typically run longer shifts, so if you need to end early or take a break for a while, you can always return to a [color=##33bbff]Cryopod[/color] early. +Be sure to stock up at the Trade Depot if going out on an extended voyage, and take advantage of the [color=#33bbff]medical insurance tracker[/color] in your loadout, or from the NanoMed vendor in medbay. +Shifts on the Frontier typically last for [color=#33bbff]six hours[/color]. +If you need to end your shift early or take a break, use the [color=#33bbff]cryo sleep chambers[/color] in the medbay on Frontier Outpost. 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 4df806b39ff..1c2f3be5dfc 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard.xml @@ -1,26 +1,47 @@ -# New Frontiers Shipyards + # New Frontiers Shipyards -Shuttle insurance technology has been standardized to allow all citizens to purchase, pilot, and operate space-faring craft throughout the Frontier regions. +To assist in developing the Frontier, shuttles from Nanotrasen and its subsidiaries can be rented for use. +All rentals last for one shift. Rented shuttles return to Nanotrasen at the end of shift. +The value of shuttles is returned to the purchaser when ended through a ship console. +To avoid losses, [bold]make sure you end your rental before ending your shift[/bold]. ## Shipyard Console - - - - - -Purchasing a ship will register it onto a personal ID card inserted into the [color=#cccc00]Shipyard Console[/color]. + + + + + + To rent a ship: +- Eject the ID card from your PDA. +- Insert the ID card into an unused [color=#cccc00]shipyard console[/color]. +- Use the shipyard console to bring up its interface. +- Select the ship you would like to rent. +- Press the Purchase button on the console. +- Press the Eject button to remove your ID from the console. +- Reinsert your ID card into your PDA. -This ID card can then be used to sell the ship back to the shipyard, for the resulting value of the ship. +Congratulations, you're now the Captain of your own ship! + +To end your rental: +- Make sure your rented ship is docked with Frontier Outpost. +- Make sure nobody is aboard the ship. +- Eject the ID card [bold]used to purchase the ship[/bold] from your PDA. +- Insert the ID card into an unused [color=#cccc00]shipyard console[/color]. +- Use the shipyard console to bring up its interface. +- Press the Sell button on the console. The value will be deposited into your bank account. +- Press the Eject button to remove your ID from the console. +- Reinsert your ID card into your PDA. ## Provisions - - - - - -Ships come fully equipped with the tools and supplies needed to perform at least one profitable task in the frontier. + + + + + + Ships come equipped with the tools and supplies needed to perform one or more tasks in the Frontier (e.g. mining, research, medical, food services). -Each ship will also come with additional crew roles and supplies to assist. Space is a dangerous place, and your chances of survival increase dramatically when you work as a team. +Ships, especially larger ones, work best with a crew. Refer to the [bold]Hiring[/bold] section for more info. +Space is a lonely, dangerous place, and you'll have a much better time when you work with a crew. 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. From 20d5eb3357af6cfc90cc75205c68c516da921dba Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 24 Jun 2024 06:09:35 +0000 Subject: [PATCH 13/17] Automatic Changelog (#1534) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index afcfeb8dd63..0dc12e10c06 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5166,3 +5166,11 @@ Entries: 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' From 03db84c91208735d21ac9ba9a5d85fd08d75c5bf Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Mon, 24 Jun 2024 02:11:31 -0400 Subject: [PATCH 14/17] Check outer clothing for footstep noise (#1553) * Check outer clothing for footstep noise * SharedMoverController Reorder outer clothes comparison --- .../Movement/Systems/SharedMoverController.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 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; From 0bd4a29109354aaa8074bb5eb882d234c62df121 Mon Sep 17 00:00:00 2001 From: Iocanthos <50127380+Iocanthos@users.noreply.github.com> Date: Mon, 24 Jun 2024 08:13:34 +0200 Subject: [PATCH 15/17] Ports coffee arabica plant from SS13. (#1546) * Ports coffee arabica plant from SS13. TG sprites used. Includes seeds, plant, coffee grounds chemicals, new reaction to brew coffee. * Coffee PR suggestions * dark coffee beans: inherit from light coffee beans * Coffee grounds recognizable, author in meta.json * Coffee bean/fruit sprites by Stagnation * Fix coffee.rsi license, attribute produce to stag * hyphenate * cleanup: ingredients.yml (heatCapacity, comments) * Updated produce-beans from Stagnation --------- Co-authored-by: Whatstone --- .../meta/consumable/food/ingredients.ftl | 2 + Resources/Locale/en-US/_NF/seeds/seeds.ftl | 2 + .../VendingMachines/Inventories/seeds.yml | 1 + .../Random/Food_Drinks/food_produce.yml | 1 + .../Objects/Specific/Hydroponics/seeds.yml | 11 ++ .../Prototypes/_NF/Hydroponics/seeds.yml | 28 +++++ .../Objects/Consumable/Food/ingredients.yml | 98 ++++++++++++++++++ .../_NF/Objects/Consumable/Food/produce.yml | 31 ++++++ .../_NF/Reagents/Consumables/ingredients.yml | 17 +++ .../Construction/Graphs/food/coffee.yml | 40 +++++++ .../_NF/Recipes/Reactions/drinks.yml | 10 ++ .../Specific/Hydroponics/coffee.rsi/dead.png | Bin 0 -> 370 bytes .../Hydroponics/coffee.rsi/harvest.png | Bin 0 -> 381 bytes .../Specific/Hydroponics/coffee.rsi/meta.json | 50 +++++++++ .../coffee.rsi/produce-beans-dark.png | Bin 0 -> 421 bytes .../coffee.rsi/produce-beans-light.png | Bin 0 -> 471 bytes .../coffee.rsi/produce-beans-medium.png | Bin 0 -> 442 bytes .../Hydroponics/coffee.rsi/produce-beans.png | Bin 0 -> 592 bytes .../Hydroponics/coffee.rsi/produce.png | Bin 0 -> 448 bytes .../Specific/Hydroponics/coffee.rsi/seed.png | Bin 0 -> 195 bytes .../Hydroponics/coffee.rsi/stage-1.png | Bin 0 -> 311 bytes .../Hydroponics/coffee.rsi/stage-2.png | Bin 0 -> 321 bytes .../Hydroponics/coffee.rsi/stage-3.png | Bin 0 -> 325 bytes .../Hydroponics/coffee.rsi/stage-4.png | Bin 0 -> 355 bytes .../Hydroponics/coffee.rsi/stage-5.png | Bin 0 -> 377 bytes 25 files changed, 291 insertions(+) create mode 100644 Resources/Locale/en-US/_NF/reagents/meta/consumable/food/ingredients.ftl create mode 100644 Resources/Prototypes/_NF/Objects/Consumable/Food/ingredients.yml create mode 100644 Resources/Prototypes/_NF/Objects/Consumable/Food/produce.yml create mode 100644 Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/coffee.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/dead.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/harvest.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-dark.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-light.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-medium.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/seed.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-2.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-3.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-4.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-5.png 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/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/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml index d3d2b5f4719..6731bee0421 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -19,3 +19,14 @@ seedId: pear - type: Sprite sprite: _NF/Objects/Specific/Hydroponics/pear.rsi + +- type: entity + parent: SeedBase + name: packet of coffee seeds + description: Perfect for any self-respecting coffee roaster. + id: CoffeeSeeds + components: + - type: Seed + seedId: coffee + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi diff --git a/Resources/Prototypes/_NF/Hydroponics/seeds.yml b/Resources/Prototypes/_NF/Hydroponics/seeds.yml index dbb0b633deb..45dd6e089af 100644 --- a/Resources/Prototypes/_NF/Hydroponics/seeds.yml +++ b/Resources/Prototypes/_NF/Hydroponics/seeds.yml @@ -41,3 +41,31 @@ Min: 1 Max: 4 PotencyDivisor: 25 + +- type: seed + id: coffee + name: seeds-coffee-name + noun: seeds-noun-seeds + displayName: seeds-coffee-display-name + plantRsi: _NF/Objects/Specific/Hydroponics/coffee.rsi + packetPrototype: CoffeeSeeds + productPrototypes: + - FoodCoffee + lifespan: 25 + maturation: 9 + production: 1 + yield: 2 + potency: 5 + idealLight: 8 + growthStages: 5 + harvestRepeat: Repeat + waterConsumption: 0.60 + chemicals: + Nutriment: + Min: 2 + Max: 8 + PotencyDivisor: 16 + Theobromine: + Min: 1 + Max: 4 + PotencyDivisor: 25 diff --git a/Resources/Prototypes/_NF/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/_NF/Objects/Consumable/Food/ingredients.yml new file mode 100644 index 00000000000..29e840ffe42 --- /dev/null +++ b/Resources/Prototypes/_NF/Objects/Consumable/Food/ingredients.yml @@ -0,0 +1,98 @@ +- type: entity + name: raw coffee beans + parent: FoodProduceBase + id: FoodCoffeeBeansRaw + description: Green coffee beans, just waiting to be roasted. + components: + - type: FlavorProfile + flavors: + - bitter + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Theobromine # Caffeine + Quantity: 1 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans + - type: Tag + tags: + - Fruit + - type: Construction + graph: Coffee + node: start + defaultTarget: light roasted coffee + - type: AtmosExposed # Expose the beans to atmosphere - heats and cools them + - type: Temperature # Temperature components needed to cook the beans + currentTemperature: 290 + - type: InternalTemperature + thickness: 0.008 # 8mm (roughly bean sized) + area: .2 # essentially a giant sheet of beans + +- type: entity + name: light roasted coffee beans + parent: FoodProduceBase + id: FoodCoffeeBeansRoastedLight + description: Cinnamon roast coffee beans. Bright and fruity. + components: + - type: FlavorProfile + flavors: + - bitter + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: CoffeeGrounds + Quantity: 5 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans-light + - type: Tag + tags: + - Fruit + - type: Construction + graph: Coffee + node: light roasted coffee + defaultTarget: medium roasted coffee + - type: AtmosExposed # Expose the beans to atmosphere - heats and cools them + - type: Temperature # Temperature components needed to cook the beans + - type: InternalTemperature + thickness: 0.008 # 8mm (roughly bean sized) + area: .2 # essentially a giant sheet of beans + conductivity: 1.5 # Arbitrarily chosen + - type: Extractable + grindableSolutionName: food + +- type: entity + name: medium roasted coffee beans + parent: FoodCoffeeBeansRoastedLight + id: FoodCoffeeBeansRoastedMedium + description: City roast coffee beans. Smooth and nutty. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans-medium + - type: Construction + graph: Coffee + node: medium roasted coffee + defaultTarget: dark roasted coffee + +- type: entity + name: dark roasted coffee beans + parent: FoodCoffeeBeansRoastedLight + id: FoodCoffeeBeansRoastedDark + description: Viennese roast coffee beans. Smoky and spicy. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans-dark + - type: Construction + graph: Coffee + node: dark roasted coffee diff --git a/Resources/Prototypes/_NF/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_NF/Objects/Consumable/Food/produce.yml new file mode 100644 index 00000000000..1b2862aa610 --- /dev/null +++ b/Resources/Prototypes/_NF/Objects/Consumable/Food/produce.yml @@ -0,0 +1,31 @@ +- type: entity + name: coffee berries + parent: FoodProduceBase + id: FoodCoffee + description: Red berries encasing coffee beans. + components: + - type: FlavorProfile + flavors: + - bitter + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Theobromine + Quantity: 1 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + - type: Produce + seedId: coffee + - type: Tag + tags: + - Fruit + - type: SpawnItemsOnUse + items: + - id: FoodCoffeeBeansRaw + sound: + path: /Audio/Effects/packetrip.ogg diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml b/Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml new file mode 100644 index 00000000000..33ebc728ce2 --- /dev/null +++ b/Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml @@ -0,0 +1,17 @@ +- type: reagent + id: CoffeeGrounds + name: reagent-name-coffeegrounds + group: Foods + desc: reagent-desc-coffeegrounds + flavor: bitter + color: "#4B382A" + physicalDesc: reagent-physical-desc-powdery + slippery: false + recognizable: true # "Waiter, there seems to be grounds in my coffee." + metabolisms: + Drink: + effects: + - !type:SatiateHunger + factor: 0.1 + - !type:SatiateThirst + factor: -0.25 diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/coffee.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/coffee.yml new file mode 100644 index 00000000000..068058d6158 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/coffee.yml @@ -0,0 +1,40 @@ +# coffee +- type: constructionGraph + id: Coffee + start: start + graph: + + - node: start + edges: + - to: light roasted coffee + completed: + - !type:PlaySound + sound: /Audio/Effects/sizzle.ogg + steps: + - minTemperature: 365 # ~92 C - arbitrarily set to take a while + # - minTemperature: 453 # 180 C + + - node: light roasted coffee + entity: FoodCoffeeBeansRoastedLight + edges: + - to: medium roasted coffee + completed: + - !type:PlaySound + sound: /Audio/Effects/sizzle.ogg + steps: + - minTemperature: 375 # ~102 C - arbitrarily set to take a while + # - minTemperature: 477 # 204 C + + - node: medium roasted coffee + entity: FoodCoffeeBeansRoastedMedium + edges: + - to: dark roasted coffee + completed: + - !type:PlaySound + sound: /Audio/Effects/sizzle.ogg + steps: + - minTemperature: 385 # ~112 C - arbitrarily set to take a while + #- minTemperature: 493 # 220 C + + - node: dark roasted coffee + entity: FoodCoffeeBeansRoastedDark diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml new file mode 100644 index 00000000000..a781b5fc834 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -0,0 +1,10 @@ +- type: reaction + id: Coffee + minTemp: 353 # ~80 deg C + reactants: + Water: + amount: 3 + CoffeeGrounds: + amount: 1 + products: + Coffee: 4 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 0000000000000000000000000000000000000000..25c664b4e1f0075e9c76b6841e5d1da0e1269f12 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAsyfo;tHfI%j6t1Sf^%M z9$LcSUn1fV$l&TI`v3p`y>FYB0HqmAg8YIR9G=}s196hP-Ca1^?oF)%a@b2eeO=jK zun7xTF&tXpJRKQx5M z12=Tn>PUJv9BgRZ*dTfK5|fEH>*NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgArasc;tJAJub{A2L1Cf7 ze+C9uN72eMx&QzFzexXH1(ahf3GxeOaCmkj4a7lFz(Kw%+Ao0n;gK_Hllr;@ni&7S?=~#5Y^MnV>Q5Hp2byXF+&66i> z*ffcGQpdusi4!L?PGVTRs8gwHAPx$Ur9tkR9J=WRWWXZFcf`Motcmb6O|>l3?w&z14PPzasZCdLv-v3I009vh?Kbl zyCqbnfaHk_(4qR4p>1qO-RdVHVH^0*@4asT2M34$4$tP{O_0oVKM3y8co5v`J1QP* zinBBW0Qg~yO_0of7$Yyr1uw*^%EcTN&x;cGSYkwg{0}0Armpb(@(KX>;2r!h1_12#TTEk*-F|CY8-T_F z-A>k-5Z6wQO>Ov90X5~6eqbr}H1;xxYH<_tS^@y1TBE}$FG@6ZC0q5D9gnvN41#-TG1Cs!F-tQ%B}}%VT0{+}4%#jl1o!Bo zIhJNPo(^d03PHray+e5r*G@~o`t+i3k{v%uy#8nWDFNF84h{|u4mx}S85g_nFmpE@ P00000NkvXXu0mjfu!*fv literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9558a63ca99fea7ef9a5558926b42d127be34480 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6DOJzX3_BHZ6j-mB;8DAL;A##-_7 zm;Kuel8%V7JKtVkh6lj842Te}1r4MU~g zy)Buw!pLCf9-}}dk0-yLUFZoER5Ea@sDAzCcu3cyK2_!;f=>%}*`DdLJhJk{&!da2 zZ^RoHD}68j62>4X#}_b7h=0Aq%;VRO+?r!iBIUrs*plM(XiE4Z1;JS1rR>*kDL4o6 zD@@5!X?aoC$oZAA_|3~KhZm*-|KpV2RW0<&;B#KJK)2(C=>#FC7M-bUU7WY{YcEkO zPMPi8axU1(@=;IrH#4bT`y)H^Yacww-c$2!BQOg1QX@Rme0>?TfNTyR27yb#lR=cH LtDnm{r-UW|eoVoJ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..751b30d35e40c1ac154ad31e663a864555f2ece1 GIT binary patch literal 442 zcmV;r0Y(0aP)Px$bV)=(R9J=Wm91{WFcgJPrb$I%S4z=9r6|CKt*So3(4L?HVP#e6-Xa<+D@dQ9 zv^*dKB?eJmAd$?1iaK9N%j@fWcreJQ-_D(3IRew{w+Q+|N}u zc)gb~;>V4EM>dWdQR`QY{fPkwLl~lJhHKLCc2%fQh%Ag=b={#md*shNn*cU!xw~9l{N9> zMgV~R4ml5<26B~IkyP*nVX-?SDQcg$y^S&BX;9;T^n0WL{!l6uS+grvCD%D@|V zq|uszDYrb7j`=0!T!lvI6BEc)B=-M7SqQur5vz>1k?Y>j{{Z5|EVtQ~p%S3(JZ*ImI1p3fzg)nqGv5 zhyAs`GK+KBL|JDog;P%zxKAw;GrDtQ$Na?0>$n2~-!xpgkkE9=g>k}DRnd(JW+xo$ z^4JojSQ2uAoSQS)|5X2B%i-kd$ZBtrWm)9NV4LE=r+CcpOn{Vr!c&p#3*yPC0mhe7 zca**}I(&AwzQh;RI>U|vL&Jia+9L&TPN;5p+_IzcV9tbJo!s7%E&u-{2>d&JtKiMU z$!;qGB^q7`tcb0dq`0Sm@6K{t+3tgUOcxbSC-yNj1{anY@OB&3C^niORLHjZ`$_#q z!h}YjO-dhFIEC67C)k`Yl=|1l6MOS-L3^W2r*`2Z9-s#ln0N8ZFn>;*)?J;_#LF(p z!_1yPC%NUM@^aRQ6$;iuvJZNhZm-JZX}`Vc09!K;qh#2t1lDKGiPx$dPzhZXC`mz*8@N`$9)msB( zQ>Qiq^aFtv&go)j!ue>5Vklg~R&PxdJ9M#W%7kXUu{HJh_H$1>A5GCh7BD_oQZH9pG>A`_d1Q-rsCe3R qnQK`3>C~OUkE literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d598a71786b346a25947b0ba56dd7cfd3fe0d784 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*GF@ngqpIt>98~hu`f#D zJTo)xR4w=a|NrY57#=-(bne`__vhZN04ioI3GxeOaCmkj4af=bba4#Pn3$X(;p1?E zgM&q&#%;QQLV=5rM=5KQOG;yafE&};@zS3j3^P6NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!4u#U;tJAJsKAp9q!~8y zUjUlLz*rLG7tG-B>_!@hljQC0!qCAg>jC7jmw5WRvcF&x7O=FAX!}_J6q5FIaSV~T zoSYyL)F3$dAw#l>gQO3yi=?Xz14Fh4qx=57Ngy*-OI#yLQW8s2t&)pUffR$0fsu)> zftjwMWr(4fm8rRvsj;?!ft7)QL+CP56b-rgDVb@NxHTAZ$gKowVDNPHb6Mw<&;$V8 C%}4_P literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f75059755f0689215ea809817e676befd056a82f GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!5`og;tJAJsNj>s?GVWD z|Ns99`!f50LX0Ire!&b5&u*lFI7!~_E-d{SHv@qj_7YEDSN0cd!UC4o5p6#UfI>>1 zE{-7@=aUm8SX~(1N*L967+FggnVp!tj%6?%d%?ua%WzYa(e>81r)@yhswJ)wB`Jv| zsaDBFsX&Us$iT=%*T78I&@#l(%*xc<%G6lfz`)ADz#(**D2j&M{FKbJO57R@IpkIX PH86O(`njxgN@xNAkwQ?m literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0a2428d8cf48d7602ed3a37b1ad0c5d75df9eb02 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@mUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!4u#U;tHfI%j8@gMgRZ* zpXm_>GJ~-s$S;_|;n|He5GTpo-Gy0@$LAA}!(QU)>&pIuO<2IvI->1o0Z>TO)5S4F z;&O6=gv|j)uhj=6R`mw3JvY&4E@bVw*l;c(mLau3H(`Ms1B1|YmM57)DMdg{swJ)w zB`Jv|saDBFsX&Us$iT=%*T78I&@#l(%*xc<%G6lfz`)ADz#(**D2j&M{FKbJO57R@ TIpkIXH86O(`njxgN@xNA#-vjM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2f8611e95147980a5324b4d1046d6eb950c76835 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!5`og;tJAJui)w^T3IId z|NsBns~<`Mg&0eM{DK)Ap4~_Tagw~?NMQuIw+^gas_EBieoz0EJvU zT^vI+&L<~Gd~#rjZ8*u`+i~)SK&ZnF4%gNOhRuw#*b+lzd%BKs9nxUxIn|ZXW~8mT zfOEk|L)Mf=@1<*p-viB4Epd$~Nl7e8wMs5Z1yT$~21X{j24=d3 ymLY~_R;K1wrpDR^237_J4x!6LQ8eV{r(~v8;?`iuA-58!fx*+&&t;ucLK6T7{A14m literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..32bffe340700be1b9a1e64c52834771384189c8c GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAsXNl;tJAJub{A2L1CeS ztD|UTncV;X|36O2%m+#^mIV0)GdMiEkp|)ztwkwI)^sd7;Bmr(<0y-ws;a7r-R4P?HW+PU zXkNHz;=~DzlNc5+nyA#Zkmt;?b8H$+JZt!PSXi85FR;X1U}ckHU}!(Uc6A!tlb1mA zRZCnWN>UO_QmvAUQh^kMk%5tku7R1Zp=F4nnU$%zm8r3|fq|8QfkWsrQ4|fi`6-!c XmAEw+a>%U&YGCkm^>bP0l+XkKgR^SG literal 0 HcmV?d00001 From fb70c84a27c1408e682fa306fe970bb229a9813e Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 24 Jun 2024 06:13:59 +0000 Subject: [PATCH 16/17] Automatic Changelog (#1546) --- Resources/Changelog/Changelog.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0dc12e10c06..e2c290a40f4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5174,3 +5174,13 @@ Entries: 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' From d79811a6cb952a83789e102bbaa7051884f02fd1 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:58:42 +0300 Subject: [PATCH 17/17] =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=B8=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=D1=86=D0=B8=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/_NF/bluespace-events/events.ftl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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, неидентифицированный шаттл был уничтожен для избежания столкновения.