From 9b38cee43c537e2cf2bf1ba7f88206fd963c7b1b Mon Sep 17 00:00:00 2001 From: LukeZurg22 <11780262+LukeZurg22@users.noreply.github.com> Date: Sun, 30 Nov 2025 14:12:19 -0600 Subject: [PATCH 1/7] Fixed Svalinn Laser Pistol Sprite Boundary Clipping --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 77be3e30a0..c1acd4749a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -136,6 +136,11 @@ fireRate: 2.5 - type: Item sprite: Objects/Weapons/Guns/Battery/svalinn.rsi + size: Small + shape: + - 0,0,1,0 + - 0,1,0,1 + storedOffset: 0,-8 - type: MagazineVisuals magState: mag steps: 5 From 13ecfe3662343cda366f1ae7d38c163e02c8001e Mon Sep 17 00:00:00 2001 From: LukeZurg22 <11780262+LukeZurg22@users.noreply.github.com> Date: Sun, 30 Nov 2025 14:20:52 -0600 Subject: [PATCH 2/7] Cleaned ReagentDispenserWindow.xaml.cs --- .../Chemistry/UI/ReagentDispenserWindow.xaml.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs index c462dbfc69..40e68d0e59 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs +++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs @@ -42,7 +42,8 @@ public void UpdateReagentsList(List inventory) ReagentList.Children.Clear(); //Sort inventory by reagentLabel - inventory.Sort((x, y) => x.ReagentLabel.CompareTo(y.ReagentLabel)); + inventory.Sort((x, y) + => string.Compare(x.ReagentLabel, y.ReagentLabel, StringComparison.Ordinal)); foreach (var item in inventory) { @@ -59,7 +60,7 @@ public void UpdateReagentsList(List inventory) /// State data sent by the server. public void UpdateState(BoundUserInterfaceState state) { - var castState = (ReagentDispenserBoundUserInterfaceState) state; + var castState = (ReagentDispenserBoundUserInterfaceState)state; UpdateContainerInfo(castState); UpdateReagentsList(castState.Inventory); @@ -77,8 +78,10 @@ public void UpdateState(BoundUserInterfaceState state) /// Update the fill state and list of reagents held by the current reagent container, if applicable. /// Also highlights a reagent if it's dispense button is being mouse hovered. /// - /// State data for the dispenser. - /// or null if no button is being hovered. + /// + /// State data for the dispenser, + /// or null if no button is being hovered. + /// public void UpdateContainerInfo(ReagentDispenserBoundUserInterfaceState state) { ContainerInfo.Children.Clear(); @@ -87,7 +90,8 @@ public void UpdateContainerInfo(ReagentDispenserBoundUserInterfaceState state) { ContainerInfoName.Text = ""; ContainerInfoFill.Text = ""; - ContainerInfo.Children.Add(new Label { Text = Loc.GetString("reagent-dispenser-window-no-container-loaded-text") }); + ContainerInfo.Children.Add(new Label + { Text = Loc.GetString("reagent-dispenser-window-no-container-loaded-text") }); return; } @@ -116,7 +120,7 @@ public void UpdateContainerInfo(ReagentDispenserBoundUserInterfaceState state) { nameLabel, quantityLabel, - } + }, }); } } From 7e7877838f2ab248dfe44384bc33ccb7fe19aa72 Mon Sep 17 00:00:00 2001 From: LukeZurg22 <11780262+LukeZurg22@users.noreply.github.com> Date: Sun, 30 Nov 2025 14:21:25 -0600 Subject: [PATCH 3/7] Added New (10,15) Reagent Buttons to ChemMaster4000 --- .../Chemistry/UI/ChemMasterWindow.xaml.cs | 33 ++++++++++--------- Content.Shared/Chemistry/SharedChemMaster.cs | 2 ++ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs index 807ec4c1e7..acdfe62a50 100644 --- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs +++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs @@ -1,18 +1,18 @@ +using System.Linq; +using System.Numerics; using Content.Client.Stylesheets; using Content.Client.UserInterface.Controls; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Reagent; +using Content.Shared.FixedPoint; using Robust.Client.AutoGenerated; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Client.Utility; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -using System.Linq; -using System.Numerics; -using Content.Shared.FixedPoint; -using Robust.Client.Graphics; using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Chemistry.UI @@ -47,14 +47,15 @@ public ChemMasterWindow() { // For every button decide which stylebase to have // Every row has 10 buttons - String styleBase = StyleBase.ButtonOpenBoth; - uint modulo = i % 10; - if (i > 0 && modulo == 0) - styleBase = StyleBase.ButtonOpenRight; - else if (i > 0 && modulo == 9) - styleBase = StyleBase.ButtonOpenLeft; - else if (i == 0) - styleBase = StyleBase.ButtonOpenRight; + var styleBase = StyleBase.ButtonOpenBoth; + var modulo = i % 10; + styleBase = i switch + { + > 0 when modulo == 0 => StyleBase.ButtonOpenRight, + > 0 when modulo == 9 => StyleBase.ButtonOpenLeft, + 0 => StyleBase.ButtonOpenRight, + _ => styleBase, + }; // Generate buttons PillTypeButtons[i] = new Button @@ -67,7 +68,7 @@ public ChemMasterWindow() // Generate buttons textures var specifier = new SpriteSpecifier.Rsi(resourcePath, "pill" + (i + 1)); - TextureRect pillTypeTexture = new TextureRect + var pillTypeTexture = new TextureRect { Texture = specifier.Frame0(), TextureScale = new Vector2(1.75f, 1.75f), @@ -103,14 +104,16 @@ private ReagentButton MakeReagentButton(string text, ChemMasterReagentAmount amo private List CreateReagentTransferButtons(ReagentId reagent, bool isBuffer, bool addReagentButtons) { if (!addReagentButtons) - return new List(); // Return an empty list if reagentTransferButton creation is disabled. + return []; // Return an empty list if reagentTransferButton creation is disabled. var buttonConfigs = new (string text, ChemMasterReagentAmount amount, string styleClass)[] { ("1", ChemMasterReagentAmount.U1, StyleBase.ButtonOpenBoth), ("5", ChemMasterReagentAmount.U5, StyleBase.ButtonOpenBoth), ("10", ChemMasterReagentAmount.U10, StyleBase.ButtonOpenBoth), + ("15", ChemMasterReagentAmount.U15, StyleBase.ButtonOpenBoth), ("25", ChemMasterReagentAmount.U25, StyleBase.ButtonOpenBoth), + ("30", ChemMasterReagentAmount.U30, StyleBase.ButtonOpenBoth), ("50", ChemMasterReagentAmount.U50, StyleBase.ButtonOpenBoth), ("100", ChemMasterReagentAmount.U100, StyleBase.ButtonOpenBoth), (Loc.GetString("chem-master-window-buffer-all-amount"), ChemMasterReagentAmount.All, StyleBase.ButtonOpenLeft), @@ -392,7 +395,7 @@ private Control BuildReagentRow(Color reagentColor, int rowCount, string name, R { rowContainer.AddChild(reagentTransferButton); } - //Apply panencontainer to allow for striped rows + //Apply PanelContainer to allow for striped rows return new PanelContainer { PanelOverride = new StyleBoxFlat(currentRowColor), diff --git a/Content.Shared/Chemistry/SharedChemMaster.cs b/Content.Shared/Chemistry/SharedChemMaster.cs index 0a1724e54b..c8f87239d9 100644 --- a/Content.Shared/Chemistry/SharedChemMaster.cs +++ b/Content.Shared/Chemistry/SharedChemMaster.cs @@ -112,7 +112,9 @@ public enum ChemMasterReagentAmount U1 = 1, U5 = 5, U10 = 10, + U15 = 15, U25 = 25, + U30 = 30, U50 = 50, U100 = 100, All, From 92effd18546fb0aba8f854fccc26ffab25ceceb3 Mon Sep 17 00:00:00 2001 From: LukeZurg22 <11780262+LukeZurg22@users.noreply.github.com> Date: Sun, 30 Nov 2025 14:34:06 -0600 Subject: [PATCH 4/7] Ported New Glass Floor Tiles [Frontier] --- Resources/Locale/en-US/_Null/tiles.ftl | 6 +- .../Objects/Materials/Sheets/glass.yml | 20 +++++ Resources/Prototypes/_Null/Tiles/floors.yml | 75 +++++++++++++++++- .../Textures/_Null/Tiles/attributions.yml | 12 +++ .../Textures/_Null/Tiles/glass-plasma.png | Bin 0 -> 2261 bytes .../Textures/_Null/Tiles/glass-uranium.png | Bin 0 -> 639 bytes Resources/Textures/_Null/Tiles/meta.json | 14 ---- .../Textures/_Null/Tiles/rglass-plasma.png | Bin 0 -> 3539 bytes .../Textures/_Null/Tiles/rglass-uranium.png | Bin 0 -> 974 bytes 9 files changed, 111 insertions(+), 16 deletions(-) create mode 100644 Resources/Textures/_Null/Tiles/attributions.yml create mode 100644 Resources/Textures/_Null/Tiles/glass-plasma.png create mode 100644 Resources/Textures/_Null/Tiles/glass-uranium.png delete mode 100644 Resources/Textures/_Null/Tiles/meta.json create mode 100644 Resources/Textures/_Null/Tiles/rglass-plasma.png create mode 100644 Resources/Textures/_Null/Tiles/rglass-uranium.png diff --git a/Resources/Locale/en-US/_Null/tiles.ftl b/Resources/Locale/en-US/_Null/tiles.ftl index d50c2af00d..531e2ed4a9 100644 --- a/Resources/Locale/en-US/_Null/tiles.ftl +++ b/Resources/Locale/en-US/_Null/tiles.ftl @@ -1 +1,5 @@ -tiles-wood-parquet = wood parquet \ No newline at end of file +tiles-wood-parquet = wood parquet +tiles-plasma-glass-floor = plasma glass floor +tiles-reinforced-plasma-glass-floor = reinforced plasma glass floor +tiles-uranium-glass-floor = uranium floor +tiles-reinforced-uranium-glass-floor = reinforced uranium floor \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml index 538a707cab..89d5d42e4c 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -226,6 +226,11 @@ - type: Construction graph: Glass node: SheetPGlass + # Frontier : Placable Plasma glass floor tile + - type: FloorTile + outputs: + - FloorPGlass + # End Frontier - type: Destructible thresholds: - trigger: @@ -298,6 +303,11 @@ map: ["base"] - type: Item heldPrefix: rpglass + # Frontier : Placable reinforced plasma glass floor tile + - type: FloorTile + outputs: + - FloorRPGlass + # End Frontier - type: Construction graph: Glass node: SheetRPGlass @@ -353,6 +363,11 @@ map: ["base"] - type: Item heldPrefix: uglass + # Frontier : Placable Uranium glass + - type: FloorTile + outputs: + - FloorUGlass + # End Frontier - type: Construction graph: Glass node: SheetUGlass @@ -427,6 +442,11 @@ map: ["base"] - type: Item heldPrefix: ruglass + # Frontier : Placable Reinforced Uranium Glass + - type: FloorTile + outputs: + - FloorRUGlass + # End Frontier - type: Construction graph: Glass node: SheetRUGlass diff --git a/Resources/Prototypes/_Null/Tiles/floors.yml b/Resources/Prototypes/_Null/Tiles/floors.yml index 631c5293d3..dafdbc328d 100644 --- a/Resources/Prototypes/_Null/Tiles/floors.yml +++ b/Resources/Prototypes/_Null/Tiles/floors.yml @@ -16,4 +16,77 @@ barestepSounds: collection: BarestepWood itemDrop: FloorTileItemWoodParquet - heatCapacity: 10000 \ No newline at end of file + heatCapacity: 10000 + +# Special Glass Floors Ported from Frontier by Karlm4x +- type: tile + id: FloorPGlass + name: tiles-plasma-glass-floor + sprite: /Textures/_Null/Tiles/glass-plasma.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: SheetPGlass1 + heatCapacity: 10000 + +- type: tile + id: FloorRPGlass + name: tiles-reinforced-plasma-glass-floor + sprite: /Textures/_Null/Tiles/rglass-plasma.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: SheetRPGlass1 + heatCapacity: 10000 + +- type: tile + id: FloorUGlass + name: tiles-uranium-glass-floor + sprite: /Textures/_Null/Tiles/glass-uranium.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: SheetUGlass1 + heatCapacity: 10000 + +- type: tile + id: FloorRUGlass + name: tiles-reinforced-uranium-glass-floor + sprite: /Textures/_Null/Tiles/rglass-uranium.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: SheetRUGlass1 + heatCapacity: 10000 diff --git a/Resources/Textures/_Null/Tiles/attributions.yml b/Resources/Textures/_Null/Tiles/attributions.yml new file mode 100644 index 0000000000..355bd27502 --- /dev/null +++ b/Resources/Textures/_Null/Tiles/attributions.yml @@ -0,0 +1,12 @@ +# Attempted to keep the files in alphabetical order so its easier to audit. +# Finding individual authors is an unfeasible task. If you can reference the author please do so. + +- files: ["wood_parquet.png"] + license: "CC-BY-SA-3.0" + copyright: "Made by LukeZurg22 (github) for ss14" + source: "https://github.com/space-wizards/space-station-14/" + +- files: ["glass_plasma.png", "glass_uranium.png", "rglass_plasma.png", rglass_uranium"] + license: "CC-BY-SA-3.0" + copyright: "Recolored from 9f45a0c04fd13aa8de83015aab5b99b599525589 by ghostlostprince" + source: "https://github.com/space-wizards/space-station-14/pull/17948" diff --git a/Resources/Textures/_Null/Tiles/glass-plasma.png b/Resources/Textures/_Null/Tiles/glass-plasma.png new file mode 100644 index 0000000000000000000000000000000000000000..ed93f604e199505e3738ff0b1e556115f171108a GIT binary patch literal 2261 zcmV;`2rBo9P)EX>4Tx04R}tkv&MmKpe$i(~2UMqIM8b$WWc^q9Ts93Pq?8YK2xEOfLO`CJjl7 zi=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT3N2ziIPS;0dyl(!fKV?p%?iW-O}EWd zA}(gKt77*n0tjIM{TP**Wz0!Z5*^3aJ$!t(`8@D`M&FbL25*7hHLthkK29HiG+AO0ufKnO`Ski6JtA7nqet}U z(c0K(5xu|DWqNaVS|j=|Z%>c6kKbN?dVLNW#MklCwJ6Sxy)SQ1kL}~PmrsZM>fADh zP%|gJbZ^}M$Jgg~n!~=CWvQ3(2g#@B*SDvK^YV1*7SZy?5Js2D^PTeP-8$dtq_Szv zor54b@9*SU!>ZvsJH1MhruQHAHG#13N%W_j&Uc|8h=|){#GZb1_&xT<2l(qCt90nR9;V$5tO^TrTyEop$t^;pwkOG0}KW8 z1r<5&|rri&OzjKvV(uOTEahKcRKkH&3l?0?>+!%xNITlUYe9+vKY0m=al~y6roM$ zz!vug()9&B(I~GSysJvufK|vza`b)7t5U4}Lde>2?luuP1s!u&BdrtrK4WbUVVpbZ zBMzhBJjJ!UT=Q)C<13X8m$~TRet)Ncrl-oN`XP00vLgmN_5j~o7pdMU&DCtl5v|Ql zS7ku9MtoIwNyjVj@0@oRPE-dJ>}SGLno$PFC4ecJd^D z#H|droP{~bR(?A~xFW9%;(i@<6d}?X-vnyC(F{{sQus=9lWP){flNn1r94q)zn`aa zr9UC>gT9FXSDRhA+y&ll&jl+5{+03=R06V~s>U6c?)giRD4v-gMZ6j)$-o9@$KM59 zWn2f@Q9HGafq(7Q>F}Z&`sK2se74MHd5Ym z^vW}L_%2&2h|PgX0ja3ggF50uQ z%f2j!LJDJ_z#M(w!mB>-CZ>Eq6<#}ow7;$gv_66uq$%}-Q(SqhejVkUBb8kb%Xpw zNqRgVrUNdE0y2jjAci=+`t(L&ymBo;2A+a&w)oDnx@Km*{n`rNdOyiHC#2O6MzgQoWi8-|-=yI!<@ECIQao z;CDU5F~3cOaX2*#Ab7o6!zvipMu^TjXxE-)@OJuMfqu#w(kUNYkm;E0>_bgnUZ()2 zzpX4Zs*914Xch!m4$>Oc%dE(FIv6I1CC4~8r+TJYzJvQ6JgUJKUKh&W)j`Ol<&uz? zY)$-#k3#@dZZJ{h&hXTk%18mY_~X|Pzf22+5|h%hukQ<8FOlQ%PmsSPL0=uRWL;w& z%RV99pWs^gUMXWPNU^`_@%YEP{D=7R_SEp?caEzK)-hh00000NkvXXu0mjfzKBvH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Null/Tiles/glass-uranium.png b/Resources/Textures/_Null/Tiles/glass-uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..89184fcd02589a3b12130d4304942d8333fdec84 GIT binary patch literal 639 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfg`cIy(n=Iy);A6y>L7=A<$( zXiTh~XzOvE7PXx?;vq-6LE0^mEfvnarSs%T>O=`TJUEPZxL=}8U z-uUXlqcy9WS1WMTHCR|%Xzudp{O`@Bn`CS8?)dKN{@vvb0s6*gxsEXSZa*8Mq?fj7 zb<%fjCXPggzY1}6AvgTR%=!o5l$V?71F@2QzsAJX3Df%fk zVV3!Y*G`3A+oN8eXs~>}PVwAl96}LCgj6~L0$e#$Z**K*H91Mq_4h}as3*a~*43Cw}~=1oN))Mz^zt`}$><7c%{r->AL!>G~^; zH~lYV>*^MNSga*%QR zcwT{pTkyys#XAQTV-DudIVBt8xW(cU+nOMigM$B#R_|xsXZ>#L_MLm*^*evNFOu=N zz;Dv!cQ5KL)`frlv3k|%-S)4wj)$ISc)-JOjxypDQ^kL~>8sv8`ENXZ-~P2$9`pC9 j?%Y;b5%xy^!*Age4-7B-F37q9^Z|pXtDnm{r-UW|BB>w7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Null/Tiles/meta.json b/Resources/Textures/_Null/Tiles/meta.json deleted file mode 100644 index 2413b6d6e0..0000000000 --- a/Resources/Textures/_Null/Tiles/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by LukeZurg22 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "wood_parquet" - } - ] -} diff --git a/Resources/Textures/_Null/Tiles/rglass-plasma.png b/Resources/Textures/_Null/Tiles/rglass-plasma.png new file mode 100644 index 0000000000000000000000000000000000000000..7e804f8cd7dfd7a85b72b56e08e3b5be20826319 GIT binary patch literal 3539 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 N002ovPDHLkV1gvu0v`YX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Null/Tiles/rglass-uranium.png b/Resources/Textures/_Null/Tiles/rglass-uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..cf20c1c8897519913e3992460b0e656f99ceebac GIT binary patch literal 974 zcmV;<12O!GP)EX>4Tx04R}tkv&MmKpe$izpO~r!44u08LE?AREnckp$HX1tY!*hJy!^hXVIM4Dv_vh$W3MK=50`V-<4U2e#II(Hz zocD>NtSl+S=fo2RU6A;Z>$1yloJ$V-d1lneX6A{b#6qcyER!7{35wza#g^{ zv49#>NRA);4}N!R7N;iNq(~A7z1a507!ckCS`FL&KDO=F2@rS&uC$K7)&yogNpEzt z*by+e4P0DzGFbE+&pXgHPaKVq8dcaC9Ig7?Z9J43faW0yyA6u9i|NEzpa( z|1Cg2?tX3arI&u~X|-y3jF8PVEffmbu-)esDx!gDhSy!CCT;EQBjq5I0x)@`Nnf6?7YbQ4N+ST# z-G??xBl|fveYrmC0E+vp11RpZ4xqTtI)LIn>i~-TtOF?S^L+rteZCK%xX(I(;y&vD ziu Date: Sun, 30 Nov 2025 15:51:35 -0600 Subject: [PATCH 5/7] Added Expeditionary Ships to Guidebook Images --- .../Guidebook/ShuttleMaps.rsi/bossman.png | Bin 0 -> 1322 bytes .../_Null/Guidebook/ShuttleMaps.rsi/clam.png | Bin 0 -> 1036 bytes .../Guidebook/ShuttleMaps.rsi/crapbucket.png | Bin 0 -> 1088 bytes .../Guidebook/ShuttleMaps.rsi/littora.png | Bin 0 -> 1089 bytes .../_Null/Guidebook/ShuttleMaps.rsi/meta.json | 17 ++++++++++++++++- .../_Null/Guidebook/ShuttleMaps.rsi/torque.png | Bin 0 -> 1248 bytes 6 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/bossman.png create mode 100644 Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/clam.png create mode 100644 Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/crapbucket.png create mode 100644 Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/littora.png create mode 100644 Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/torque.png diff --git a/Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/bossman.png b/Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/bossman.png new file mode 100644 index 0000000000000000000000000000000000000000..9545594d54efd996176531e84340d9d879edaa3e GIT binary patch literal 1322 zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!3HF+R#kZdDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5`$3q|f;CtLC@4|l8c`CQpH@8!gYQ=D8xNlMxT=^Lmp>B!U3t&;(y@KB(&FD8eO&oT zC%i@A_?fWRSNF{pR?acM9cjMT;&YygUn0Yt!_f^)*Wa&yydy^M@s8VXA6dBFui4jG z+_=4g?WEy;HJ%2hozK)`nb{mV#mlyLlm3AxO6|` z#%^>D3!_5sf|$?!(vGT$3=H@7)`}f3KI{7BV`al6U;qg<#B9!%v|;(qzyNett{@vj zN*B;529Pz;EsP8^7yV>nW|)v&cS$Uf!C_g(z5@&lPiD>E;;MF+UEkJm{j0Jqm4`kR5Sn?cjalEgWB!9s29rK3D+KTn-SzhOt_SJqp7~N1T!SLJw zQ%hE_!j!i~!pHx%ix-Nd&95ujT%QpWzrW_{%F9!7SQKk2*Ok}sR7$Tr#T9Ud z!Q{T!)o%>b&HitE{iJ>sOT)9<3o95h_UW#=%Oqs7UoVu|;q&WYU66twR+hY1IGq0b z%Pjc_430_9_}d;oKA%@qsWXqGiI0!1`TL3P35q_2_l`gNool{2e_zb~|61Rs-<)kL zw9Vm+d^hXolO47PCj9hNzEETBz_{S&W!5;xwln@!IzW2@7?x%I`&ha@btvw zmrrB>3PkWQeE9a>=Euk7v*#~4CAXmEr-t)amAg_MKb=0>HmH6U4mPgm`M_n6@^5GS zw9?O$=V^f~t~<2)r_)s1hJwt`{p-IQhWK9!Uiw4MVM7vF;-jrY_A~XnQV$J3dYZpo zS|NWx%0u2EIQq4wg7$&EH4BbzJ0|hDB__95tC}Hu!Pm@8Zw1B)(GHW3D)yM_hetC< zF-Ga~v99&^j%KRk%GhYpvhmr|tn31Q0f*O@FHLh``k)}ME7opsZBI-tuL{HdXqaNo z1HnJx${pUjw#M7-vtRKy)#B=f@;I&^nhq-~zVC8fBB-K$z)nQCe#QCgi6*Rjm|EiP z`l9{|?a9h^V7#C;@7Ds|gSHNdca`oiYrHa;#T3ctHkWNn{1`B?5dxT%)3+{ws^GU%$TVpdC=`|9l39HUEK(uT8E7K#HRz$S?Rm1Tfrd z-Wv%N<1FxqEM{Qf+YiEw7OcT4KtYKT*NBqf{Irtt#G+J&fW*wa5nAmtPE0&tPG4mmKP99L)jo-XfQH^#hHL?Lq;YB0U#X(#F_0Z zVDT&<8w7gG7#UswJqx4JEM)*nO<-qW0je}GGB#jb05KJ0BkKZ)NmGDq5MTnD%LG;# zWN86pL3J4#fP#QQNA$Jv#9;Q5Ky}TYE{-7?&TprCPI_#>!(u9T{>Oj&yhStah@VWX z>`r^dB;pam%D*>fJNr#HgZs&>Kdv#%kZICpKF2v>$-#m%Tpw&1Z(LKCogue1@$5y0 zH5#4GC5u+nOx%#@8~)}%*CY!M^{!LmoYL1yj`CrXvfpvTdyyO_sfBE@UWWwa|Asd7sHs zf_;hP57Uf}{)@Z{C7YPiC$tng%xa8pZi|r6KJcC8z!t~Dm!cm$_gJgN%$>{{!FY^u z6$?=PXOYfnu+saGeIT`I9sB?6+#jnL4*vhNj^SYa-UC&Q`BjX&zg-i* zu$QHdw`cp?`3r7t`!Bfl;Qw>tCl0J{{215p;D2?z!ogn$lo@BRyzel%Bb(*D!QdDp zi#Wq$hF4r4W;3N6kuRL_%;Wf8N9S$Q+6TA-*e}#{+*A{oEpX{W_ltV*_O=<4)r?-e z=?*nn4PJ*O16 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/crapbucket.png b/Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/crapbucket.png new file mode 100644 index 0000000000000000000000000000000000000000..a0068a626444fe85a5cb4315a39087fbe8bbad80 GIT binary patch literal 1088 zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!3HF+R#kZdDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5`$3q|f;CtLC@4|l8c`CQpH@G+x3>-Rt~iJs`{=8Zk&*Gjg2mJ| zLnC9N$7XE}LGcBPmNDoxTv~Kj&12z`hBl_aA|@>^y$Nh82d3RiD{oI{ueN#ovF?BT z!{VVZ_@q=I4?bc17nzrXp=f1IJy}B#I3??Q` zzfb=oH*SVnYq2+gx311U-R+L|oIGoM5 zv2mg#DeuBc?`pc}G$FnE=;C8wC?W^XmS2tgK ztMt!<8>@KN8|OdT>!tTe^T6&4s&;uwk3|A{8N%1NIBsHHAjMc0+1d0&hOt64X2C^$ zublh|Nr4&X)Gl1UB2ne5(Cq|uKS#q3CF{={8L!l4sD{!pl1-*Y>Y%4ou zmz=`1@82cd5TWw+sS@wfuk9PTb0rudKAYpi5HaP|<0T=lmTlxZu{Eo@E;8T{+vVH) zS90e5dh_=0>)Kua>Ue%?Ce&_P{r2a#>+`nF|0-IS)|I?vAv?#GyQ!M*4g~Zi=O{BY z-cfew5M+oHY-qRziuxbZ&7VByVN?buGmzWBV8x8H|Cmm6X@3($B>G+w|5R^i8u-z`*@e*-k#qY^Y*+r zI638FOxeNfA0%t|ZtivIeDcKcyoeYcwVS-Ypo^`bk0W4H-(LYigJj)%dxSC=mI?_k za5ZTtp2NswI{#CY;9-`6KDL5$sVqFQU(@^JJ*Pf@c0PRNmt%cwY7NCeb?>AfSR{q6 zcQpUze|^%KUpxj+Z-qTN7JZIEQ}rCX3s^~a6m#;#fTUb$Yo>4d{6V%k-*dG?_l1NQ zFwR-bI7gXD$jkk}@#pWCY`W~$SmvC-WZ}*XLdPW)7A`gY&|>V6yleKVy-_YeQ5KaJ z|J*m_TYjZv8^Uz!2o`+&=Co?dY5(a#S6!J^d~Pz_GBr?pe)&*=s|pjyirKC#N8EN# zO++ zE#Cjdx-r;2n1^>kiY?2wK8}KQQOtMt)mJ@tl0E6qe7t7*26@@n{Ps(|vftJ=$gJFP zVITj3yWbDT+P89mqQ=iu?bopmwzpvhsVpsa@&Bit%A5G#`NT(lLszNE#r|yf_dGV) zF;S@Z#7=daz2|10V+dQhx%nxN!O~mV3FnUQtzG%q!I<~LuBB!Sf)DO25l-m1bvgMB zXTrkRuR*isGu-W+UtF>U=%_q1!GKAri>`Dv2qoLKaxS=XchBXmD!>E)M0)2L3{AK9 zZrp6w#tHJTjNpP0CAqBLpCaHi64dRV&uP+dDagM60Z&3gF55YV3_f0Ps_a`6_MhSX WtL)|f&$C*9L_A&nT-G@yGywqg8I(H! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/meta.json b/Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/meta.json index 644c687a2e..7cbb47339e 100644 --- a/Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/meta.json +++ b/Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/meta.json @@ -19,20 +19,32 @@ { "name": "bison" }, + { + "name": "bossman" + }, { "name": "bucket" }, { "name": "camper" }, + { + "name": "clam" + }, { "name": "clemency" }, + { + "name": "coldcap" + }, + { + "name": "crapbucket" + }, { "name": "duran" }, { - "name": "coldcap" + "name": "littora" }, { "name": "moonlight" @@ -42,6 +54,9 @@ }, { "name": "nugget" + }, + { + "name": "torque" } ] } diff --git a/Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/torque.png b/Resources/Textures/_Null/Guidebook/ShuttleMaps.rsi/torque.png new file mode 100644 index 0000000000000000000000000000000000000000..7c775dda6a2d2e7c7b57d737065d12d44970f717 GIT binary patch literal 1248 zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!3HF+R#kZdDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5`$3q|f;CtLC@4|l8c`CQpH@h0lW@8A47{k71WX-g~13mMi6 zJKtDb6RY2+=`drZgWc&Z8|JKG>4^QAU1Zl?G=s_Nx(nkBlL=}33x$Lh6nl2-zxBH+ zR;PHl^`S)hLMQT|R%~O0e?WJNqJ8!qmif9Bb_poXc>l;d#fK8!Quc*Yzwp`0w}j z$7N^U9rfP5{btRdUsvAU{r>N({_g418T5WyZ|!bmIl#$U(D-dV-{Ra=4@4exFOOT^ zu=JJF`@mAs=CUH^Eb)ed zzxMj|JvCxyyLt6)@ojr=-n9LH*K!)m((c6} zOjAt0Pj(0|Vf?YIX{$(sTi2qg(;b6k7II5>yCyuJw2VP|?U+{eIu@?cFvrxtGdQ z7*ylgr8V_i^5);UvDdhK&E~y)X5yyXwjL;dRK59?roz*8K7p&}TdoMS2+fP=I6%jtBXzJ2|mAc#aERHOd1gkdGik!&j{vOn(@5lIfLjCvByG9%-t(*1u*#t zdNoYhuepU=(2JqB=V1Bq;}gzb_hT!+<0^Duj=(pV$P3xr-tB1x6;Qn$6z-F(+kJn}@UsNYK;O&t;ucLK6Uj^ze58 literal 0 HcmV?d00001 From cb98226ccdda543408f5314bdb930e8686b6323f Mon Sep 17 00:00:00 2001 From: LukeZurg22 <11780262+LukeZurg22@users.noreply.github.com> Date: Sun, 30 Nov 2025 15:51:57 -0600 Subject: [PATCH 6/7] Added Bossman to Guidebook --- .../en-US/_Null/guidebook/guides_shipyard.ftl | 1 + .../Prototypes/_Null/Guidebook/shuttle_maps.yml | 8 ++++++++ .../_Null/Shipyard/Expedition/Bossman.yml | 7 ++++++- .../_Null/Guidebook/Shipyard/Bossman.xml | 14 ++++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 Resources/ServerInfo/_Null/Guidebook/Shipyard/Bossman.xml diff --git a/Resources/Locale/en-US/_Null/guidebook/guides_shipyard.ftl b/Resources/Locale/en-US/_Null/guidebook/guides_shipyard.ftl index b263fcb4cf..9f8fabfe51 100644 --- a/Resources/Locale/en-US/_Null/guidebook/guides_shipyard.ftl +++ b/Resources/Locale/en-US/_Null/guidebook/guides_shipyard.ftl @@ -9,6 +9,7 @@ guide-entry-shipyard-framework = The Humble Framework (Civil/Scrap) # Expedition guide-entry-shipyard-archon = Archon (Expedition) +guide-entry-shipyard-bossman = Bossman (Expedition) guide-entry-shipyard-crapbucket = Crapbucket (Expedition) guide-entry-shipyard-foxhunt = Foxhunt (Expedition) guide-entry-shipyard-littora = Littora (Expedition) diff --git a/Resources/Prototypes/_Null/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_Null/Guidebook/shuttle_maps.yml index 6f701ab39b..f208666809 100644 --- a/Resources/Prototypes/_Null/Guidebook/shuttle_maps.yml +++ b/Resources/Prototypes/_Null/Guidebook/shuttle_maps.yml @@ -56,6 +56,14 @@ - type: Sprite state: bison +- type: entity + parent: ShuttleMapBase + id: ShuttleMapBossman + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: bossman + - type: entity parent: ShuttleMapBase id: ShuttleMapBucket diff --git a/Resources/Prototypes/_Null/Shipyard/Expedition/Bossman.yml b/Resources/Prototypes/_Null/Shipyard/Expedition/Bossman.yml index e4b6d57280..ed3b140e14 100644 --- a/Resources/Prototypes/_Null/Shipyard/Expedition/Bossman.yml +++ b/Resources/Prototypes/_Null/Shipyard/Expedition/Bossman.yml @@ -13,12 +13,17 @@ category: small group: Expedition shuttlePath: /Maps/_Null/Shuttles/Expedition/bossman.yml - guidebookPage: null + guidebookPage: ShipyardBossman class: - Expedition engine: - Uranium +- type: guideEntry + id: ShipyardBossman + name: guide-entry-shipyard-bossman + text: "/ServerInfo/_Null/Guidebook/Shipyard/Bossman.xml" + - type: gameMap id: Bossman mapName: 'Bossman' diff --git a/Resources/ServerInfo/_Null/Guidebook/Shipyard/Bossman.xml b/Resources/ServerInfo/_Null/Guidebook/Shipyard/Bossman.xml new file mode 100644 index 0000000000..266d683be7 --- /dev/null +++ b/Resources/ServerInfo/_Null/Guidebook/Shipyard/Bossman.xml @@ -0,0 +1,14 @@ + + # Bossman + + + + + [color=#a4885c]Ship Size:[/color] Small + + [color=#a4885c]Recommended Crew:[/color] 1 + + [color=#a4885c]Initial Generator Type:[/color] Uranium + + A hastily-reintroduced expeditionary vessel designed for quick in-and-out engagements. Its frame is beaten and battered— requiring extensive repair. + From d1d861ae61546e948f109dbe900572d57e1d5d06 Mon Sep 17 00:00:00 2001 From: LukeZurg22 <11780262+LukeZurg22@users.noreply.github.com> Date: Sun, 30 Nov 2025 16:12:52 -0600 Subject: [PATCH 7/7] Added Torque, Littora, Crapbucket, and Clam to Guidebook --- .../en-US/_Null/guidebook/guides_shipyard.ftl | 3 +- .../_Null/Guidebook/shipyard_entries.yml | 5 +++ .../_Null/Guidebook/shuttle_maps.yml | 34 ++++++++++++++++++- .../_Null/Shipyard/Expedition/clam.yml | 7 +++- .../_Null/Shipyard/Expedition/crapbucket.yml | 7 +++- .../_Null/Shipyard/Expedition/littora.yml | 7 +++- .../_Null/Shipyard/Expedition/torque.yml | 7 +++- .../_Null/Guidebook/Shipyard/Clam.xml | 14 ++++++++ .../_Null/Guidebook/Shipyard/Crapbucket.xml | 14 ++++++++ .../_Null/Guidebook/Shipyard/Littora.xml | 14 ++++++++ .../_Null/Guidebook/Shipyard/Torque.xml | 14 ++++++++ 11 files changed, 120 insertions(+), 6 deletions(-) create mode 100644 Resources/ServerInfo/_Null/Guidebook/Shipyard/Clam.xml create mode 100644 Resources/ServerInfo/_Null/Guidebook/Shipyard/Crapbucket.xml create mode 100644 Resources/ServerInfo/_Null/Guidebook/Shipyard/Littora.xml create mode 100644 Resources/ServerInfo/_Null/Guidebook/Shipyard/Torque.xml diff --git a/Resources/Locale/en-US/_Null/guidebook/guides_shipyard.ftl b/Resources/Locale/en-US/_Null/guidebook/guides_shipyard.ftl index 9f8fabfe51..4046a66d75 100644 --- a/Resources/Locale/en-US/_Null/guidebook/guides_shipyard.ftl +++ b/Resources/Locale/en-US/_Null/guidebook/guides_shipyard.ftl @@ -10,7 +10,8 @@ guide-entry-shipyard-framework = The Humble Framework (Civil/Scrap) # Expedition guide-entry-shipyard-archon = Archon (Expedition) guide-entry-shipyard-bossman = Bossman (Expedition) -guide-entry-shipyard-crapbucket = Crapbucket (Expedition) +guide-entry-shipyard-clam = Clam (Piracy) +guide-entry-shipyard-crapbucket = Crapbucket (Piracy) guide-entry-shipyard-foxhunt = Foxhunt (Expedition) guide-entry-shipyard-littora = Littora (Expedition) guide-entry-shipyard-pisces = Pisces (Expedition) diff --git a/Resources/Prototypes/_Null/Guidebook/shipyard_entries.yml b/Resources/Prototypes/_Null/Guidebook/shipyard_entries.yml index 520da1ed50..19de2c04b0 100644 --- a/Resources/Prototypes/_Null/Guidebook/shipyard_entries.yml +++ b/Resources/Prototypes/_Null/Guidebook/shipyard_entries.yml @@ -9,8 +9,11 @@ - ShipyardArachnid - ShipyardArchon - ShipyardBison + - ShipyardBossman - ShipyardBucket - ShipyardCamper + - ShipyardClam + - ShipyardCrapbucket - ShipyardClemency - ShipyardColdcap - ShipyardDuran @@ -18,8 +21,10 @@ - ShipyardIapetus - ShipyardInsight - ShipyardJudiciary + - ShipyardLittora - ShipyardMoonlight - ShipyardNourishment - ShipyardNugget - ShipyardPulse - ShipyardSabine + - ShipyardTorque diff --git a/Resources/Prototypes/_Null/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_Null/Guidebook/shuttle_maps.yml index f208666809..7ce1d67f81 100644 --- a/Resources/Prototypes/_Null/Guidebook/shuttle_maps.yml +++ b/Resources/Prototypes/_Null/Guidebook/shuttle_maps.yml @@ -80,6 +80,22 @@ - type: Sprite state: camper +- type: entity + parent: ShuttleMapBase + id: ShuttleMapClam + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: clam + +- type: entity + parent: ShuttleMapBase + id: ShuttleMapCrapbucket + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: crapbucket + - type: entity parent: ShuttleMapBase id: ShuttleMapClemency @@ -104,6 +120,14 @@ - type: Sprite state: duran +- type: entity + parent: ShuttleMapBase + id: ShuttleMapLittora + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: littora + - type: entity parent: ShuttleMapBase id: ShuttleMapMoonlight @@ -126,4 +150,12 @@ categories: [ HideSpawnMenu ] components: - type: Sprite - state: nugget \ No newline at end of file + state: nugget + +- type: entity + parent: ShuttleMapBase + id: ShuttleMapTorque + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: torque \ No newline at end of file diff --git a/Resources/Prototypes/_Null/Shipyard/Expedition/clam.yml b/Resources/Prototypes/_Null/Shipyard/Expedition/clam.yml index a207915254..9355e8a9ad 100644 --- a/Resources/Prototypes/_Null/Shipyard/Expedition/clam.yml +++ b/Resources/Prototypes/_Null/Shipyard/Expedition/clam.yml @@ -11,12 +11,17 @@ category: Small group: Expedition shuttlePath: /Maps/_Null/Shuttles/Expedition/clam.yml - guidebookPage: null + guidebookPage: ShipyardClam class: - Pirate engine: - Uranium +- type: guideEntry + id: ShipyardClam + name: guide-entry-shipyard-clam + text: "/ServerInfo/_Null/Guidebook/Shipyard/Clam.xml" + - type: gameMap id: Clam mapName: 'Clam' diff --git a/Resources/Prototypes/_Null/Shipyard/Expedition/crapbucket.yml b/Resources/Prototypes/_Null/Shipyard/Expedition/crapbucket.yml index 33ee2da4ed..1c8307648a 100644 --- a/Resources/Prototypes/_Null/Shipyard/Expedition/crapbucket.yml +++ b/Resources/Prototypes/_Null/Shipyard/Expedition/crapbucket.yml @@ -13,12 +13,17 @@ category: Small group: Expedition shuttlePath: /Maps/_Null/Shuttles/Expedition/crapbucket.yml - guidebookPage: null + guidebookPage: ShipyardCrapbucket class: - Pirate engine: - Uranium +- type: guideEntry + id: ShipyardCrapbucket + name: guide-entry-shipyard-crapbucket + text: "/ServerInfo/_Null/Guidebook/Shipyard/Crapbucket.xml" + - type: gameMap id: Crapbucket mapName: 'Crapbucket' diff --git a/Resources/Prototypes/_Null/Shipyard/Expedition/littora.yml b/Resources/Prototypes/_Null/Shipyard/Expedition/littora.yml index 6102a46b4b..acab2bd4cd 100644 --- a/Resources/Prototypes/_Null/Shipyard/Expedition/littora.yml +++ b/Resources/Prototypes/_Null/Shipyard/Expedition/littora.yml @@ -13,12 +13,17 @@ category: Large group: Expedition shuttlePath: /Maps/_Null/Shuttles/Expedition/littora.yml - guidebookPage: null + guidebookPage: ShipyardLittora class: - Expedition engine: - AME +- type: guideEntry + id: ShipyardLittora + name: guide-entry-shipyard-littora + text: "/ServerInfo/_Null/Guidebook/Shipyard/Littora.xml" + - type: gameMap id: Littora mapName: 'Littora' diff --git a/Resources/Prototypes/_Null/Shipyard/Expedition/torque.yml b/Resources/Prototypes/_Null/Shipyard/Expedition/torque.yml index 777390e88d..81b5584f17 100644 --- a/Resources/Prototypes/_Null/Shipyard/Expedition/torque.yml +++ b/Resources/Prototypes/_Null/Shipyard/Expedition/torque.yml @@ -13,12 +13,17 @@ category: Large group: Expedition shuttlePath: /Maps/_Null/Shuttles/Expedition/torque.yml - guidebookPage: null + guidebookPage: ShipyardTorque class: - Expedition engine: - AME +- type: guideEntry + id: ShipyardTorque + name: guide-entry-shipyard-torque + text: "/ServerInfo/_Null/Guidebook/Shipyard/Torque.xml" + - type: gameMap id: Torque mapName: 'Torque' diff --git a/Resources/ServerInfo/_Null/Guidebook/Shipyard/Clam.xml b/Resources/ServerInfo/_Null/Guidebook/Shipyard/Clam.xml new file mode 100644 index 0000000000..d4a0d88cf4 --- /dev/null +++ b/Resources/ServerInfo/_Null/Guidebook/Shipyard/Clam.xml @@ -0,0 +1,14 @@ + + # CLAM + + + + + [color=#a4885c]Ship Size:[/color] Small + + [color=#a4885c]Recommended Crew:[/color] 2-3 + + [color=#a4885c]Initial Generator Type:[/color] Uranium + + A buccaneer-themed combat vessel fit with a kitchen and bar, and a small resting space. Additionally comes with ample bridge protection, but should those fail it also includes a spare weapons control room with padded armor. The entirety of the ship is surrounded in clam-like sets of additional shielding, owing to its name. + diff --git a/Resources/ServerInfo/_Null/Guidebook/Shipyard/Crapbucket.xml b/Resources/ServerInfo/_Null/Guidebook/Shipyard/Crapbucket.xml new file mode 100644 index 0000000000..4fd78f077e --- /dev/null +++ b/Resources/ServerInfo/_Null/Guidebook/Shipyard/Crapbucket.xml @@ -0,0 +1,14 @@ + + # CRAPBUCKET + + + + + [color=#a4885c]Ship Size:[/color] Small + + [color=#a4885c]Recommended Crew:[/color] 2-3 + + [color=#a4885c]Initial Generator Type:[/color] Uranium + + A buccaneer-themed raiding vessel with mounted weapons on either side. The internals are of a nice veneer and parquet wood style, but the exterior is well-protected. It is designed for active engagements and theft, sporting little room for cargo hauling. + diff --git a/Resources/ServerInfo/_Null/Guidebook/Shipyard/Littora.xml b/Resources/ServerInfo/_Null/Guidebook/Shipyard/Littora.xml new file mode 100644 index 0000000000..b4c280f284 --- /dev/null +++ b/Resources/ServerInfo/_Null/Guidebook/Shipyard/Littora.xml @@ -0,0 +1,14 @@ + + # LITTORA + + + + + [color=#a4885c]Ship Size:[/color] Large + + [color=#a4885c]Recommended Crew:[/color] 2-3 + + [color=#a4885c]Initial Generator Type:[/color] AME + + A large but reliable armored excavation vessel with a large amount of cargo space, a backup air supply, and additional room for modifications. The Littora is a go-to choice for many seasoned expeditionaries. + diff --git a/Resources/ServerInfo/_Null/Guidebook/Shipyard/Torque.xml b/Resources/ServerInfo/_Null/Guidebook/Shipyard/Torque.xml new file mode 100644 index 0000000000..7a66c12a14 --- /dev/null +++ b/Resources/ServerInfo/_Null/Guidebook/Shipyard/Torque.xml @@ -0,0 +1,14 @@ + + # TORQUE + + + + + [color=#a4885c]Ship Size:[/color] Huge + + [color=#a4885c]Recommended Crew:[/color] 3+ + + [color=#a4885c]Initial Generator Type:[/color] AME + + An incredibly large and cumbersome vessel with more room than you bargained for. Seriously. In fact, the Torque despite its slow space, is a force to be reckoned with despite its meager armaments solely because of the sheer amount of ample room it possesses. This thing could be turned into a station or a war-barge with the proper funding and care. A moth got stuck in the atmospheric systems once thanks to an artifact, and it took weeks to find it in the darkest corner of the ship. +