Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Salvage Expedition Rebalance (Follow up, p. 1) #1338

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
f0dcadf
More items to spawners
ErhardSteinhauer Apr 29, 2024
8089b4e
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 5, 2024
39f6b5a
weapon case icon fix, diluted filled containers with empty
ErhardSteinhauer May 5, 2024
035e7e9
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 8, 2024
d3fd2e2
small fix
ErhardSteinhauer May 8, 2024
33eee87
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 11, 2024
0075aa9
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 15, 2024
cb0b0bd
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 15, 2024
b4390e7
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 15, 2024
baa0385
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 16, 2024
9e767e7
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 17, 2024
a7f64c2
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 18, 2024
b775935
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 18, 2024
267560a
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 20, 2024
7371767
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 26, 2024
919c748
weapon spawners rework
ErhardSteinhauer May 26, 2024
e1c73be
weapon spawners
ErhardSteinhauer May 26, 2024
cc5a896
dungeon updates
ErhardSteinhauer May 26, 2024
b739b0f
salvage outpost theme
ErhardSteinhauer May 27, 2024
03c616f
some tweaks
ErhardSteinhauer May 27, 2024
d3801d6
missing tag
ErhardSteinhauer May 27, 2024
b982d9b
fix
ErhardSteinhauer May 27, 2024
5799317
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer May 27, 2024
9149156
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer Jun 1, 2024
3572453
Merge branch 'master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer Jun 2, 2024
a483e87
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer Jun 6, 2024
f7fed13
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer Jun 8, 2024
bb791d8
Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expe…
ErhardSteinhauer Jun 9, 2024
b083b7e
Update Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dung…
ErhardSteinhauer Jun 9, 2024
f2737ad
Update Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dung…
ErhardSteinhauer Jun 9, 2024
5bb3b31
Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expe…
ErhardSteinhauer Jun 9, 2024
0984f72
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer Jun 9, 2024
b1ff8a2
weapon cases touch up
ErhardSteinhauer Jun 9, 2024
c8a7677
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer Jun 11, 2024
6914c2d
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer Jun 11, 2024
91c8fed
Merge branch 'new-frontiers-14:master' into 2024-05-Dungeon-Spawner-UPD
ErhardSteinhauer Jun 11, 2024
7420265
Merge branch 'master' of https://github.com/dvir001/frontier-station-…
dvir001 Jun 12, 2024
beb43f2
Fixup
dvir001 Jun 12, 2024
1a1fe2a
Update WeaponCaseInsertable.cs
dvir001 Jun 12, 2024
f8eeefb
A bit less syndicate stuff, but still keep some
dvir001 Jun 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Content.Shared/_NF/Containers/WeaponCaseInsertable.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Content.Shared._NF.Containers;

[RegisterComponent]
public sealed partial class WeaponCaseInsertableComponent : Component
{

}
73 changes: 49 additions & 24 deletions Resources/Maps/_NF/Dungeon/cave_factory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ entities:
- type: MetaData
- type: Transform
- type: Map
mapPaused: True
- type: PhysicsMap
- type: GridTree
- type: MovedGrids
- type: Broadphase
- type: OccluderTree
- type: MapGrid
Expand Down Expand Up @@ -3113,8 +3116,6 @@ entities:
1004: 9.110695,42.81673
- type: RadiationGridResistance
- type: LoadedMap
- type: GridTree
- type: MovedGrids
- type: SpreaderGrid
- proto: AcousticGuitarInstrument
entities:
Expand Down Expand Up @@ -3245,13 +3246,6 @@ entities:
- type: Transform
pos: 11.5,1.5
parent: 1
- proto: BaseBallBat
entities:
- uid: 1875
components:
- type: Transform
pos: 24.683756,47.869045
parent: 1
- proto: Bed
entities:
- uid: 1094
Expand Down Expand Up @@ -3305,14 +3299,6 @@ entities:
- type: Transform
pos: 32.5,7.5
parent: 1
- proto: BrokenBottle
entities:
- uid: 1876
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 25.557798,47.80727
parent: 1
- proto: CableApcExtension
entities:
- uid: 42
Expand Down Expand Up @@ -8288,13 +8274,6 @@ entities:
- type: Transform
pos: 22.5,38.5
parent: 1
- proto: DonkpocketBoxSpawner
entities:
- uid: 526
components:
- type: Transform
pos: 16.5,13.5
parent: 1
- proto: DoorElectronics
entities:
- uid: 1069
Expand Down Expand Up @@ -9240,6 +9219,13 @@ entities:
- type: Transform
pos: 12.369425,13.798887
parent: 1
- proto: LandMineExplosive
entities:
- uid: 1942
components:
- type: Transform
pos: 2.476542,20.3592
parent: 1
- proto: Lighter
entities:
- uid: 1215
Expand Down Expand Up @@ -11726,6 +11712,18 @@ entities:
- type: Transform
pos: 12.999242,13.625918
parent: 1
- proto: SpawnDungeonLootArmoryExplosives
entities:
- uid: 1876
components:
- type: Transform
pos: 2.4536958,20.396553
parent: 1
- uid: 1941
components:
- type: Transform
pos: 1.4786916,26.59427
parent: 1
- proto: SpawnDungeonLootArmoryGuns
entities:
- uid: 281
Expand Down Expand Up @@ -12087,6 +12085,11 @@ entities:
- type: Transform
pos: 18.696524,21.493046
parent: 1
- uid: 883
components:
- type: Transform
pos: 16.67248,13.446251
parent: 1
- uid: 1902
components:
- type: Transform
Expand Down Expand Up @@ -12519,6 +12522,28 @@ entities:
- type: Transform
pos: 10.444371,39.695183
parent: 1
- proto: SpawnDungeonLootMeleeT1
entities:
- uid: 526
components:
- type: Transform
pos: 25.679262,47.681923
parent: 1
- uid: 666
components:
- type: Transform
pos: 24.585531,47.681923
parent: 1
- uid: 1470
components:
- type: Transform
pos: 4.934014,8.558511
parent: 1
- uid: 1875
components:
- type: Transform
pos: 5.662302,7.92888
parent: 1
- proto: SpawnDungeonLootMugs
entities:
- uid: 598
Expand Down
Loading
Loading