Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #310 from new-frontiers-14/master
Browse files Browse the repository at this point in the history
Upfix
  • Loading branch information
Vonsant authored Jun 15, 2024
2 parents d0d39d9 + 16ada9e commit a31dcbd
Showing 8 changed files with 1,038 additions and 18 deletions.
6 changes: 6 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
@@ -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'
1,037 changes: 1,022 additions & 15 deletions Resources/Maps/_NF/Dungeon/salvage_outpost.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -106,7 +106,6 @@
quickEquip: false
slots:
- Back
- Belt
- suitStorage
- type: BallisticAmmoProvider
proto: null
Original file line number Diff line number Diff line change
@@ -28,6 +28,14 @@
{
"name": "equipped-SUITSTORAGE",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a31dcbd

Please sign in to comment.