Merge branch 'Manor' of https://github.com/PubliclyExecutedPig/space-…

…station-14-starlight into Manor
ss14Starlight · Feb 16, 2025 · bcf0bd6 · bcf0bd6
2 parents 116d30b + 91adb01
commit bcf0bd6
Show file tree

Hide file tree

Showing 33 changed files with 410,427 additions and 409,828 deletions.
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
@@ -232,6 +232,11 @@ public void FinishProducing(EntityUid uid, LatheComponent? comp = null, LathePro
                 {
                     var result = Spawn(resultProto, Transform(uid).Coordinates);
                     _stack.TryMergeToContacts(result);
+                    if (comp.CurrentRecipe.PrintTicket)
+                    {
+                        var tickets = Spawn(comp.CurrentRecipe.TicketProtoId, Transform(uid).Coordinates);
+                        _stack.TryMergeToContacts(tickets);
+                    }
                 }
 
                 if (comp.CurrentRecipe.ResultReagents is { } resultReagents &&

diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
@@ -42,6 +42,12 @@ public sealed partial class LatheRecipePrototype : IPrototype, IInheritingProtot
         /// </summary>
         [DataField]
         public EntProtoId? Result;
+
+        [DataField]
+        public bool PrintTicket = false;
+
+        [DataField]
+        public EntProtoId TicketProtoId = "SalvageTicket";
 
         [DataField]
         public Dictionary<ProtoId<ReagentPrototype>, FixedPoint2>? ResultReagents;

diff --git a/Resources/Changelog/ChangelogStarlight.yml b/Resources/Changelog/ChangelogStarlight.yml
@@ -3461,4 +3461,18 @@ Entries:
   id: 479
   time: '2025-02-16T17:09:01.000000+00:00'
   url: https://github.com/ss14Starlight/space-station-14/pull/331
+- author: Rinary
+  changes:
+  - message: Added Salvage Ticket Machine.
+    type: Add
+  id: 480
+  time: '2025-02-16T19:27:00.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/335
+- author: Rinary
+  changes:
+  - message: Added Salvage Tickets.
+    type: Add
+  id: 481
+  time: '2025-02-16T19:27:00.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/335
 
diff --git a/Resources/Locale/en-US/_Starlight/store/vendors.ftl b/Resources/Locale/en-US/_Starlight/store/vendors.ftl
@@ -3,4 +3,5 @@ vendor-medical-dispenser = medical dispenser
 vendor-engineering-dispenser = engineering dispenser
 vendor-clown-dispenser = HohohonkersVend
 vendor-security-dispenser = security dispenser
-vendor-fashion-o-mat = Fashion-o-Mat
+vendor-fashion-o-mat = Fashion-o-Mat
+vendor-salvage-ticket-machine = salvage ticket machine