Merge pull request #310 from new-frontiers-14/master

Upfix
Corvax-Frontier · Jun 15, 2024 · a31dcbd · a31dcbd
2 parents d0d39d9 + 16ada9e
commit a31dcbd
Show file tree

Hide file tree

Showing 8 changed files with 1,038 additions and 18 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -5100,3 +5100,9 @@ Entries:
         distribution! Yeah, Science!
   id: 5042
   time: '2024-06-15T02:40:48.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Fix
+      message: Fixed backrooms on salvage outpost dungeon theme.
+  id: 5043
+  time: '2024-06-15T18:29:25.0000000+00:00'
diff --git a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
@@ -29,7 +29,6 @@
                 SheetSteel1:
                   min: 2
                   max: 4
-    - type: MobState # Frontier (otherwise NPCs won't attack the entity)
 
 - type: entity
   parent: BaseStructure
@@ -119,6 +118,7 @@
     - type: NoRotateOnMove
     - type: Input
       context: "human"
+    - type: MobState # Frontier (otherwise NPCs won't attack the entity)
 
 - type: entity
   parent: BaseWeaponTurret

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/traking_dart.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/traking_dart.yml
@@ -41,7 +41,7 @@
       projectile:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
+          bounds: "-0.2,-0.2,0.2,0.2"
         hard: false
         mask:
         - Impassable

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -106,7 +106,6 @@
     quickEquip: false
     slots:
     - Back
-    - Belt
     - suitStorage
   - type: BallisticAmmoProvider
     proto: null

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/nfsd_lake.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/nfsd_lake.rsi/meta.json
@@ -28,6 +28,14 @@
 		{
             "name": "equipped-SUITSTORAGE",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/...xtures/_NF/Objects/Weapons/Guns/Launchers/nfsd_lake.rsi/wielded-inhand-left.png b/...xtures/_NF/Objects/Weapons/Guns/Launchers/nfsd_lake.rsi/wielded-inhand-left.png
diff --git a/...tures/_NF/Objects/Weapons/Guns/Launchers/nfsd_lake.rsi/wielded-inhand-right.png b/...tures/_NF/Objects/Weapons/Guns/Launchers/nfsd_lake.rsi/wielded-inhand-right.png