Merge branch 'master' of https://github.com/new-frontiers-14/frontier…

…-station-14 into smuggling-buff
new-frontiers-14 · Sep 21, 2024 · 6eb6974 · 6eb6974
2 parents 1370ab8 + 1dda632
commit 6eb6974
Show file tree

Hide file tree

Showing 209 changed files with 2,585 additions and 316 deletions.
diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
@@ -139,7 +139,7 @@ private void OnSalvageFinishMessage(EntityUid entity, SalvageExpeditionConsoleCo
                 continue;
 
             // NPC, definitely not a person
-            if (HasComp<ActiveNPCComponent>(uid) || HasComp<SalvageMobRestrictionsNFComponent>(uid))
+            if (HasComp<ActiveNPCComponent>(uid) || HasComp<NFSalvageMobRestrictionsComponent>(uid))
                 continue;
 
             // Hostile ghost role, continue

diff --git a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs
@@ -81,7 +81,7 @@ private void OnDebrisDespawn(EntityUid entity, SpaceDebrisComponent component, E
         if (entity != null)
         {
             // Handle mobrestrictions getting deleted
-            var query = AllEntityQuery<SalvageMobRestrictionsNFComponent>();
+            var query = AllEntityQuery<NFSalvageMobRestrictionsComponent>();
 
             while (query.MoveNext(out var salvUid, out var salvMob))
             {

diff --git a/...vage/SalvageMobRestrictionsNFComponent.cs → ...vage/NFSalvageMobRestrictionsComponent.cs b/...vage/SalvageMobRestrictionsNFComponent.cs → ...vage/NFSalvageMobRestrictionsComponent.cs
@@ -1,9 +1,3 @@
-using Robust.Shared.GameObjects;
-using Robust.Shared.Maths;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.ViewVariables;
-using System;
-
 namespace Content.Server._NF.Salvage;
 
 /// <summary>
@@ -14,9 +8,15 @@ namespace Content.Server._NF.Salvage;
 ///     whatever it's currently parented to.
 /// </summary>
 [RegisterComponent]
-public sealed partial class SalvageMobRestrictionsNFComponent : Component
+public sealed partial class NFSalvageMobRestrictionsComponent : Component
 {
-    [ViewVariables(VVAccess.ReadOnly)]
-    [DataField("linkedGridEntity")]
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
     public EntityUid LinkedGridEntity = EntityUid.Invalid;
+
+    /// <summary>
+    /// If set to false, this mob will not be despawned when its linked entity is despawned.
+    /// Useful for event ghost roles, for instance.
+    /// </summary>
+    [DataField]
+    public bool DespawnIfOffLinkedGrid = true;
 }
diff --git a/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs b/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs
@@ -15,12 +15,12 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SalvageMobRestrictionsNFComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<SalvageMobRestrictionsNFComponent, ComponentRemove>(OnRemove);
+        SubscribeLocalEvent<NFSalvageMobRestrictionsComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<NFSalvageMobRestrictionsComponent, ComponentRemove>(OnRemove);
         SubscribeLocalEvent<SalvageMobRestrictionsGridComponent, ComponentRemove>(OnRemoveGrid);
     }
 
-    private void OnInit(EntityUid uid, SalvageMobRestrictionsNFComponent component, ComponentInit args)
+    private void OnInit(EntityUid uid, NFSalvageMobRestrictionsComponent component, ComponentInit args)
     {
         var gridUid = Transform(uid).ParentUid;
         if (!EntityManager.EntityExists(gridUid))
@@ -38,7 +38,7 @@ private void OnInit(EntityUid uid, SalvageMobRestrictionsNFComponent component,
         component.LinkedGridEntity = gridUid;
     }
 
-    private void OnRemove(EntityUid uid, SalvageMobRestrictionsNFComponent component, ComponentRemove args)
+    private void OnRemove(EntityUid uid, NFSalvageMobRestrictionsComponent component, ComponentRemove args)
     {
         if (TryComp(component.LinkedGridEntity, out SalvageMobRestrictionsGridComponent? rg))
         {

diff --git a/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs b/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs
@@ -77,10 +77,20 @@ protected override void Ended(EntityUid uid, BluespaceErrorRuleComponent compone
         var gridValue = _pricing.AppraiseGrid(gridUid, null);
 
         // Handle mobrestrictions getting deleted
-        var query = AllEntityQuery<SalvageMobRestrictionsNFComponent>();
+        var query = AllEntityQuery<NFSalvageMobRestrictionsComponent>();
 
         while (query.MoveNext(out var salvUid, out var salvMob))
         {
+            if (!salvMob.DespawnIfOffLinkedGrid)
+            {
+                var transform = Transform(salvUid);
+                if (transform.GridUid != salvMob.LinkedGridEntity)
+                {
+                    RemComp<NFSalvageMobRestrictionsComponent>(salvUid);
+                    continue;
+                }
+            }
+
             if (gridTransform.GridUid == salvMob.LinkedGridEntity)
             {
                 QueueDel(salvUid);

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -7124,3 +7124,42 @@ Entries:
       message: Fixed NT Vagabond's issues.
   id: 5291
   time: '2024-09-20T16:52:33.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added recipes for crossbow and bolt to mercenary techfab.
+    - type: Add
+      message: Added ability to craft hand crossbows by using a saw on full-sized one.
+    - type: Add
+      message: >-
+        Added more craftable crossbow bolts: syringe, armor-piercing
+        (C3-contraband), incendiary (C3-contraband).
+    - type: Add
+      message: >-
+        Added to crossbows the ability to use wooden stakes, plungers, bread and
+        mail capsules as projectiles.
+    - type: Tweak
+      message: >-
+        Bolts and crossbows can be recycled and bolts take damage on impact: a
+        regular bolt should be good for 5-6 uses, however specialized ones
+        (like, syringe-bolt or incendiary) shatter after single use.
+    - type: Tweak
+      message: Bolts can now draw solutions directly from puddles and containers.
+    - type: Tweak
+      message: Crossbows can be used to perform melee attacks.
+  id: 5292
+  time: '2024-09-20T20:13:08.0000000+00:00'
+- author: arimah
+  changes:
+    - type: Remove
+      message: Removed the SBI Crown pending a complete rework.
+  id: 5293
+  time: '2024-09-20T20:59:11.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: >-
+        Adds avocado and cucumber plants in addition to new supported recipes
+        and reagents.
+  id: 5294
+  time: '2024-09-20T21:52:42.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl
@@ -1,7 +1,10 @@
 flavor-base-basic = basic
+flavor-base-earthy = earthy
+
+flavor-complex-avocado = like avocado
+flavor-complex-cucumber = crisp and refreshing
 flavor-complex-fast = fast
 flavor-complex-greed = like greed
 flavor-complex-blast = like jungle warfare
 flavor-complex-torpedo = like convoy raiding
 flavor-complex-bees = like buzzing and honey
-flavor-base-earthy = earthy
diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl
@@ -13,5 +13,8 @@ reagent-desc-pineapple-blast = For when the trees start talking. Smells tropical
 reagent-name-torpedo-juice = torpedo juice
 reagent-desc-torpedo-juice = The joys of drinking and unrestricted submarine warfare combined! Has a strong alcoholic smell.
 
-reagent-name-bees-knees = bee’s knees
-reagent-desc-bees-knees = BEEEEEEEEEEEEEEES!!! Has a stingy smell.
+reagent-name-bees-knees = bee's knees
+reagent-desc-bees-knees = BEEEEEEEEEEEEEEES!!! Has a stingy smell.
+
+reagent-name-cucumber-water = cucumber water
+reagent-desc-cucumber-water = The fanciest of waters.
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
@@ -1,2 +1,5 @@
 reagent-name-coffeegrounds = coffee grounds
 reagent-desc-coffeegrounds = Aromatic and richly textured, these grounds exude a robust scent that promises a flavorful brew.
+
+reagent-name-oil-vegetable = vegetable oil
+reagent-desc-oil-vegetable = It's made from vegetables, that means it's healthy, right?
diff --git a/Resources/Locale/en-US/_NF/seeds/seeds.ftl b/Resources/Locale/en-US/_NF/seeds/seeds.ftl
@@ -5,6 +5,10 @@ seeds-pear-name = pear
 seeds-pear-display-name = pear trees
 seeds-coffee-name = coffee
 seeds-coffee-display-name = coffee plants
+seeds-avocado-name = avocado
+seeds-avocado-display-name = avocado plants
+seeds-cucumber-name = cucumber
+seeds-cucumber-display-name = cucumber plants
 
 # Missing upstream definitions
 seeds-lemoon-display-name = lemoon trees
diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -33375,7 +33375,7 @@ entities:
     - type: Transform
       pos: -5.5,13.5
       parent: 2173
-- proto: VendingMachineCart
+- proto: NFVendingMachineCart
   entities:
   - uid: 1211
     components:

diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
@@ -15415,7 +15415,7 @@ entities:
     - type: Transform
       pos: -4.5,-3.5
       parent: 1
-- proto: VendingMachineCartNfsd
+- proto: NFVendingMachineCartNfsd
   entities:
   - uid: 934
     components:

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
@@ -1,38 +1,18 @@
 - type: vendingMachineInventory
   id: PTechInventory
   startingInventory:
-    ContractorPDA: 5 # Frontier: PassengerPDA<ContractorPDA
-    ClearNFPDA: 5 # Frontier: ClearPDA<ClearNFPDA
-    MusicianPDA: 3 # Frontier
-    MedicalPDA: 3 # Frontier
-    SecurityGuardPDA: 3 # Frontier
-    ContractorIDCard: 10 # Frontier: Passenger<Contractor, 5<10
-    ClothingHeadsetGrey: 10 # Frontier 5<10
-    RubberStampStc: 1 # Frontier
-    RubberStampCaptain: 10 # Frontier
-    RubberStampApproved: 3 # Frontier 1<3
-    RubberStampDenied: 3 # Frontier 1<3
-    Pen: 10 # Frontier
-#    Paper: 10 # Frontier
-#    Envelope: 10 # Frontier
-    BoxPaper: 4 # Frontier
-    BoxPaperOffice: 4 # Frontier
-    BoxPaperCaptainsThoughts: 4 # Frontier
-    BoxEnvelope: 4 # Frontier
-    BoxFolderClipboard: 3 # Frontier
-    BoxFolderBlue: 3 # Frontier
-    BoxFolderRed: 3 # Frontier
-    BoxFolderYellow: 3 # Frontier
-    HandLabeler: 3 # Frontier
-    BrbSign: 3 # Frontier
-    DeskBell: 3 # Frontier
-    EncryptionKeyCommand: 3 # Frontier
-    EncryptionKeySecurity: 10 # Frontier  1<10
-    EncryptionKeyNfsd: 10 # Frontier
-    EncryptionKeyCargo: 20 # Frontier 2<20
-    EncryptionKeyEngineering: 20 # Frontier 2<20
-    EncryptionKeyMedical: 20 # Frontier 2<20
-    EncryptionKeyScience: 20 # Frontier 2<20
-    EncryptionKeyCommon: 30 # Frontier
-    EncryptionKeyService: 30 # Frontier 3<30
-    EncryptionKeyTraffic: 30 # Frontier
+    PassengerPDA: 5
+    ClearPDA: 5
+    PassengerIDCard: 5
+    ClothingHeadsetGrey: 5
+    RubberStampApproved: 1
+    RubberStampDenied: 1
+    Paper: 10
+    Envelope: 10
+    HandLabeler: 2
+    EncryptionKeyCargo: 2
+    EncryptionKeyEngineering: 2
+    EncryptionKeyMedical: 2
+    EncryptionKeyScience: 2
+    EncryptionKeySecurity: 1
+    EncryptionKeyService: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -4,6 +4,7 @@
     AloeSeeds: 3
     AmbrosiaVulgarisSeeds: 3
     AppleSeeds: 5
+    AvocadoSeeds: 5 # Frontier
     BananaSeeds: 5
     BerrySeeds: 5
     CarrotSeeds: 5
@@ -14,6 +15,7 @@
     CoffeeSeeds: 5 # Frontier
     CornSeeds: 5
     CottonSeeds: 5
+    CucumberSeeds: 5 # Frontier
     EggplantSeeds: 5
     EggySeeds: 5
     GalaxythistleSeeds: 3

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
@@ -142,6 +142,12 @@
       - id: FoodCoffee # Frontier
         amount: !type:RangeNumberSelector # Frontier
           range: 1, 5 # Frontier
+      - id: FoodAvocado # Frontier
+        amount: !type:RangeNumberSelector # Frontier
+          range: 1, 5 # Frontier
+      - id: FoodCucumber # Frontier
+        amount: !type:RangeNumberSelector # Frontier
+          range: 1, 5 # Frontier
     #rare
     - !type:GroupSelector
       children:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -149,7 +149,7 @@
   parent: MobCarp
   suffix: "Salvage Ruleset"
   components:
-    - type: SalvageMobRestrictionsNF
+    - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   name: space carp
@@ -238,4 +238,4 @@
   parent: MobShark
   suffix: "Salvage Ruleset"
   components:
-    - type: SalvageMobRestrictionsNF
+    - type: NFSalvageMobRestrictions
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -252,7 +252,7 @@
         Slash: 6
   - type: ReplacementAccent
     accent: genericAggressive
-  - type: SalvageMobRestrictionsNF
+  - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   parent: BaseMobFleshSalvage

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -116,7 +116,7 @@
   parent: MobBearSpace
   suffix: "Salvage Ruleset"
   components:
-  - type: SalvageMobRestrictionsNF
+  - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   name: space kangaroo
@@ -173,7 +173,7 @@
   parent: MobKangarooSpace
   suffix: "Salvage Ruleset"
   components:
-  - type: SalvageMobRestrictionsNF
+  - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   name: space spider
@@ -271,7 +271,7 @@
   parent: MobSpiderSpace
   suffix: "Salvage Ruleset"
   components:
-  - type: SalvageMobRestrictionsNF
+  - type: NFSalvageMobRestrictions
 
 - type: entity
   name: space cobra
@@ -368,4 +368,4 @@
   parent: MobCobraSpace
   suffix: "Salvage Ruleset"
   components:
-    - type: SalvageMobRestrictionsNF
+    - type: NFSalvageMobRestrictions
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -85,5 +85,5 @@
   parent: MobTick
   suffix: "Salvage Ruleset"
   components:
-  - type: SalvageMobRestrictionsNF
+  - type: NFSalvageMobRestrictions # Frontier
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -120,7 +120,7 @@
     molsPerSecondPerUnitMass: 0.0005
   - type: Speech
     speechVerb: LargeMob
-  - type: SalvageMobRestrictionsNF # Frontier
+  - type: NFSalvageMobRestrictions # Frontier
   - type: ReplacementAccent # Frontier
     accent: genericAggressive # Frontier
 
@@ -430,7 +430,7 @@
     tags:
     - DoorBumpOpener
     - FootstepSound
-  - type: SalvageMobRestrictionsNF # Frontier
+  - type: NFSalvageMobRestrictions # Frontier
   - type: ReplacementAccent # Frontier
     accent: genericAggressive # Frontier
 

diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -217,7 +217,7 @@
   - type: ActionGun #Frontier
     action: ActionDragonsBreath #Frontier
     gunProto: DragonsBreathGun #Frontier
-  - type: SalvageMobRestrictionsNF # Frontier
+  - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   id: ActionSpawnRift

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -2,7 +2,7 @@
 # Base
 
 - type: entity
-  parent: FoodInjectableBase
+  parent: [ FoodInjectableBase, LaunchableProjectileBase ] # Frontier: added LaunchableProjectileBase, located in \Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\base_projectiles.yml
   id: FoodBreadBase
   abstract: true
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -212,8 +212,8 @@
 - type: entity
   parent: ReagentPacketBase
   id: ReagentContainerOliveoil
-  name: olive oil
-  description: Olive oil. From space olives presumably.
+  name: olive oil #frontier for consolidating vegetable oils
+  description: Olive oil. From space olives presumably. #frontier
   components:
   - type: Sprite
     state: oliveoil
@@ -803,4 +803,4 @@
         maxVol: 4
         reagents:
         - ReagentId: Nutriment
-          Quantity: 3
+          Quantity: 3