Merge branch 'master' into Stasis

new-frontiers-14 · Jul 18, 2024 · 3b19914 · 3b19914
2 parents f7fd661 + a53c107
commit 3b19914
Show file tree

Hide file tree

Showing 60 changed files with 59 additions and 3,580 deletions.
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
@@ -1817,13 +1817,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-13.5
       parent: 3
-- proto: DonkpocketBoxSpawner
-  entities:
-  - uid: 226
-    components:
-    - type: Transform
-      pos: 6.5,-7.5
-      parent: 3
 - proto: DresserFilled
   entities:
   - uid: 234
@@ -1954,13 +1947,6 @@ entities:
     - type: Transform
       pos: 5.5,-13.5
       parent: 3
-- proto: FoodBurgerCarp
-  entities:
-  - uid: 189
-    components:
-    - type: Transform
-      pos: 3.4787748,-7.3710117
-      parent: 3
 - proto: GasPassiveVent
   entities:
   - uid: 448

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
@@ -2618,13 +2618,6 @@ entities:
     - type: Transform
       pos: -1.5,-5.5
       parent: 1
-- proto: RandomSpawner
-  entities:
-  - uid: 336
-    components:
-    - type: Transform
-      pos: 3.5,-0.5
-      parent: 1
 - proto: RemoteSignaller
   entities:
   - uid: 505