Actual waste of my time making this PR yet again, holy shit

new-frontiers-14 · Oct 19, 2024 · 9371481 · 9371481
1 parent ee85177
commit 9371481
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
@@ -7,6 +7,7 @@
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 
@@ -217,6 +218,10 @@ public bool InstallProgram(EntityUid loaderUid, string prototype, bool deinstall
 
         RaiseLocalEvent(installedProgram, new CartridgeAddedEvent(loaderUid));
         UpdateUserInterfaceState(loaderUid, loader);
+
+        if (cartridge.Disposable) // Frontier: Delete the cartridge after install if its disposable.
+            EntityManager.DeleteEntity(loader.CartridgeSlot.ContainerSlot!.ContainedEntity);
+
         return true;
     }
 
@@ -345,6 +350,10 @@ protected override void OnItemInserted(EntityUid uid, CartridgeLoaderComponent l
 
         RaiseLocalEvent(args.Entity, new CartridgeAddedEvent(uid));
         base.OnItemInserted(uid, loader, args);
+
+        var cartridgeUid = GetEntity(message.CartridgeUid);
+        if (cartridge != null && cartridge.AutoInstall) // Frontier: Try to auto install the program when inserted, QOL
+            InstallCartridge(uid, cartridge.LoaderUid, loader);
     }
 
     protected override void OnItemRemoved(EntityUid uid, CartridgeLoaderComponent loader, EntRemovedFromContainerMessage args)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1764,10 +1764,10 @@
       food:
         maxVol: 10
         reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
+#        - ReagentId: Nutriment # Frontier
+#          Quantity: 5 # Frontier
         - ReagentId: Sulfur
-          Quantity: 5
+          Quantity: 10 # Frontier: 5<10
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/gatfruit.rsi
   - type: Produce
@@ -1782,6 +1782,7 @@
     entries:
       Taco: Gatfruit
       Burger: GatfruitBurger
+  - type: BadFood # Frontier: Nope
 
 - type: entity
   name: capfruit
@@ -1797,10 +1798,10 @@
       food:
         maxVol: 10
         reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
+#        - ReagentId: Nutriment # Frontier
+#          Quantity: 5 # Frontier
         - ReagentId: Sulfur
-          Quantity: 5
+          Quantity: 10 # Frontier: 5<10
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/capfruit.rsi
   - type: Produce
@@ -1815,6 +1816,7 @@
     entries:
       Taco: Capfruit
       Burger: CapfruitBurger
+  - type: BadFood # Frontier: Nope
 
 - type: entity
   name: capfruit

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -502,7 +502,7 @@
       sprite: Objects/Specific/Hydroponics/fly_amanita.rsi
 
 - type: entity
-  parent: [SeedBase, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
+  parent: [SeedBase, BaseC3SyndicateContrabandUnredeemable] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContrabandUnredeemable
   name: packet of gatfruit seeds
   description: "These are no peashooters."
   id: GatfruitSeeds