Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
Browse files Browse the repository at this point in the history
ErhardSteinhauer authored Jun 5, 2024
2 parents 32a52a7 + c1b0601 commit dc025f8
Showing 22 changed files with 1,090 additions and 640 deletions.
36 changes: 36 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
@@ -4751,3 +4751,39 @@ Entries:
shooting speed.
id: 5002
time: '2024-06-01T16:30:25.0000000+00:00'
- author: dvir01
changes:
- type: Tweak
message: >-
NT Found there is too much fiber and plastic in all employees blood,
making gloves use less fiber, but now they also allow your fingerprints
to mark stuff you interact with, some illegal gloves possibly kept the
old fibers quality.
id: 5003
time: '2024-06-02T20:33:51.0000000+00:00'
- author: dvir01
changes:
- type: Tweak
message: Pirate Cove got new equipment shipment.
id: 5004
time: '2024-06-03T01:05:56.0000000+00:00'
- author: arimah
changes:
- type: Tweak
message: >-
The Ceres is no longer under NanoTrasen branding: look for SBB Ceres
instead.
id: 5005
time: '2024-06-03T18:42:27.0000000+00:00'
- author: Myzumi
changes:
- type: Add
message: Added Admeme Hand teleporter
id: 5006
time: '2024-06-04T14:02:24.0000000+00:00'
- author: Myzumi
changes:
- type: Fix
message: Admeme Teleporter hotfix
id: 5007
time: '2024-06-04T15:26:13.0000000+00:00'
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_NF/guidebook/guides.ftl
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ guide-entry-bank = NT Galactic Bank
guide-entry-shipyard = Shipyard
guide-entry-shipyard-ambition = Ambition
guide-entry-shipyard-brigand = Brigand
guide-entry-shipyard-ceres = Ceres
guide-entry-shipyard-gasbender = Gasbender
guide-entry-shipyard-harbormaster = Harbormaster
guide-entry-shipyard-kilderkin = Kilderkin
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_NF/paper/paper-misc.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
book-text-pirate-scribbles = Clarpy was drinking all the soda again, dont forget to refill the machine.
12 changes: 6 additions & 6 deletions Resources/Maps/_NF/Outpost/frontier.yml
Original file line number Diff line number Diff line change
@@ -4527,7 +4527,7 @@ entities:
- type: Transform
pos: -5.5,25.5
parent: 2173
- proto: AirlockAtmosphericsGlassLocked
- proto: AirlockFrontierCommandAtmosphericsGlassLocked
entities:
- uid: 4082
components:
@@ -4551,7 +4551,7 @@ entities:
- type: Transform
pos: 0.5,35.5
parent: 2173
- proto: AirlockEngineeringGlassLocked
- proto: AirlockFrontierCommandEngineeringGlassLocked
entities:
- uid: 4079
components:
@@ -4568,7 +4568,7 @@ entities:
- type: Transform
pos: -40.5,10.5
parent: 2173
- proto: AirlockEngineeringLocked
- proto: AirlockFrontierCommandEngineeringLocked
entities:
- uid: 4136
components:
@@ -5576,7 +5576,7 @@ entities:
- type: Transform
pos: 49.5,12.5
parent: 2173
- proto: AirlockMaintEngiLocked
- proto: AirlockMaintFrontierBridgeLocked
entities:
- uid: 4131
components:
@@ -41648,7 +41648,7 @@ entities:
rot: 3.141592653589793 rad
pos: 52.5,16.5
parent: 2173
- proto: WindoorSecureEngineeringLocked
- proto: WindoorSecureFrontierCommandLocked
entities:
- uid: 2128
components:
@@ -41671,7 +41671,7 @@ entities:
- type: Transform
pos: -33.5,6.5
parent: 2173
- proto: WindoorSecureHeadOfPersonnelLocked
- proto: WindoorSecureFrontierCommandLocked
entities:
- uid: 2642
components:
Loading

0 comments on commit dc025f8

Please sign in to comment.