Skip to content

Commit 9e9be73

Browse files
Merge branch 'starlight-dev' into upstream/solutions-rebirth
2 parents ee2c779 + 027eefb commit 9e9be73

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

Resources/Changelog/ChangelogStarlight.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
Entries:
2-
- author: Caws
3-
changes:
4-
- message: (Novo Lobster) Fixed missing fire axe from Atmospherics.
5-
type: Fix
6-
id: 407641
7-
time: '2026-08-16T15:22:36.000000+00:00'
8-
url: https://github.com/ss14Starlight/space-station-14/pull/5629
92
- author: Forrestgod
103
changes:
114
- message: '[Serpentcrest] Added Pipe Docking Pipes to Cargo Dock.'
@@ -2799,4 +2792,11 @@ Entries:
27992792
id: 408040
28002793
time: '2026-08-31T19:31:13.000000+00:00'
28012794
url: https://github.com/ss14Starlight/space-station-14/pull/5863
2795+
- author: Caws
2796+
changes:
2797+
- message: Quartermaster access from the funding allocation computer.
2798+
type: Remove
2799+
id: 408041
2800+
time: '2026-08-31T19:54:24.000000+00:00'
2801+
url: https://github.com/ss14Starlight/space-station-14/pull/5904
28022802
Order: -1

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1348,7 +1348,7 @@
13481348
key: enum.FundingAllocationConsoleUiKey.Key
13491349
- type: ActivatableUIRequiresAccess
13501350
- type: AccessReader
1351-
access: [["HeadOfPersonnel"], ["Quartermaster"]] #Starlight edit: added Quatermaster
1351+
access: [["HeadOfPersonnel"]]
13521352
- type: UserInterface
13531353
interfaces:
13541354
enum.FundingAllocationConsoleUiKey.Key:

0 commit comments

Comments
 (0)