Merge branch 'june24-upstream-merge' of https://github.com/whatston3/…

…frontier-station-14 into pr/1536
new-frontiers-14 · Jul 1, 2024 · 9501714 · 9501714
2 parents 5b82072 + 2c6fa14
commit 9501714
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
@@ -227,4 +227,24 @@
       - MobFleshLoverSalvage
       - MobFleshLoverSalvage
       chance: 1
-      offset: 0.2
+      offset: 0.2
+
+- type: entity
+  name: Salvage Handheld Flag Spawner
+  id: SalvageHandheldFlagSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Misc/Handy_Flags/blank_handy_flag.rsi
+           state: icon
+    - type: RandomSpawner
+      prototypes:
+        - NTHandyFlag
+        - BlankHandyFlag
+        - SyndieHandyFlag
+        - LGBTQHandyFlag
+        - PirateHandyFlag
+      chance: 0.9
+      offset: 0.0
diff --git a/Resources/Prototypes/_NF/Entities/World/Debris/wrecks.yml b/Resources/Prototypes/_NF/Entities/World/Debris/wrecks.yml
@@ -25,15 +25,15 @@
             prob: 0.3
           - id: SalvageCanisterSpawner
             prob: 0.3
-          - id: SalvageTankSpawner # Frontier Fix up after merge
+          - id: SalvageTankSpawner
             prob: 0.15
-          - id: SalvageLockerSpawner # Frontier Fix up after merge
+          - id: SalvageLockerSpawner
             prob: 0.15
-          - id: SalvageSuitStorageSpawner # Frontier Fix up after merge
+          - id: SalvageSuitStorageSpawner
             prob: 0.05
           - id: PottedPlantRandomPlastic
             prob: 0.1
-          - id: SalvageGeneratorSpawner # Frontier Fix up after merge
+          - id: SalvageGeneratorSpawner
             prob: 0.1
           - id: SalvageMobSpawner
             prob: 0.3
@@ -67,7 +67,7 @@
             prob: 0.02
           - id: RandomBox
             prob: 0.2
-          - id: SalvageHandheldFlagSpawner # Frontier Fix up after merge
+          - id: SalvageHandheldFlagSpawner
             prob: 0.02
           - id: Girder
             prob: 1.7