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

Апстрим #65

Merged
merged 6 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4173,3 +4173,31 @@ Entries:
information.
id: 4931
time: '2024-04-23T21:36:50.0000000+00:00'
- author: dvir01
changes:
- type: Tweak
message: NFSD Fixed the colors and machines on the NFSD base
id: 4932
time: '2024-04-24T22:36:54.0000000+00:00'
- author: erhardsteinhauer
changes:
- type: Add
message: Added safary suit and hat to AutoDrobe.
- type: Add
message: Added specific procedural suits to AutoDrobe.
- type: Tweak
message: >-
Arcadia Mask, Hydroponics EVA and Mailcarrier EVA helmets hide
character's hair now.
- type: Tweak
message: Pilot's hardsuit no longer requires mask to use air tank.
- type: Fix
message: Fixed arcadia webbing not displaying on character.
id: 4933
time: '2024-04-24T22:39:53.0000000+00:00'
- author: Cheackraze
changes:
- type: Add
message: Adds the Barnacle black market ship
id: 4934
time: '2024-04-25T00:20:16.0000000+00:00'
91 changes: 31 additions & 60 deletions Resources/Maps/_NF/POI/cove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2338,6 +2338,21 @@ entities:
- type: Transform
pos: 4.5,3.5
parent: 1
- uid: 1732
components:
- type: Transform
pos: 5.5,1.5
parent: 1
- uid: 1738
components:
- type: Transform
pos: 7.5,1.5
parent: 1
- uid: 1739
components:
- type: Transform
pos: 6.5,1.5
parent: 1
- proto: CableMV
entities:
- uid: 1316
Expand Down Expand Up @@ -3740,19 +3755,21 @@ entities:
showEnts: False
occludes: True
ents: []
- proto: ComputerFrame
- proto: ComputerBroken
entities:
- uid: 570
- uid: 574
components:
- type: Transform
pos: 7.5,1.5
rot: -1.5707963267948966 rad
pos: 7.5,2.5
parent: 1
- proto: ComputerPowerMonitoring
entities:
- uid: 574
- uid: 570
components:
- type: Transform
pos: 7.5,2.5
rot: -1.5707963267948966 rad
pos: 7.5,1.5
parent: 1
- proto: ComputerShipyardBlackMarket
entities:
Expand Down Expand Up @@ -4938,9 +4955,10 @@ entities:
rot: 1.5707963267948966 rad
pos: 1.5,-6.5
parent: 1
- uid: 1739
- uid: 1832
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 0.5,-5.5
parent: 1
- proto: RailingCorner
Expand All @@ -4962,55 +4980,13 @@ entities:
rot: 1.5707963267948966 rad
pos: -7.5,-13.5
parent: 1
- proto: RailingCornerSmall
entities:
- uid: 1732
components:
- type: Transform
pos: 1.5,-7.5
parent: 1
- uid: 1738
components:
- type: Transform
pos: 1.5,-8.5
parent: 1
- proto: RandomSpawner
entities:
- uid: 1832
components:
- type: Transform
pos: -1.5,0.5
parent: 1
- uid: 1833
components:
- type: Transform
pos: 0.5,1.5
parent: 1
- uid: 1834
components:
- type: Transform
pos: -4.5,2.5
parent: 1
- uid: 1835
components:
- type: Transform
pos: -6.5,3.5
parent: 1
- uid: 1836
components:
- type: Transform
pos: 3.5,-16.5
parent: 1
- uid: 1837
components:
- type: Transform
pos: -11.5,-13.5
parent: 1
- uid: 1838
components:
- type: Transform
pos: -23.5,-5.5
parent: 1
- proto: ReagentContainerFlour
entities:
- uid: 1760
Expand Down Expand Up @@ -5182,14 +5158,9 @@ entities:
- type: Transform
pos: -7.5,-13.5
parent: 1
- proto: SpawnPointLatejoin
- proto: SpawnPointPirate
entities:
- uid: 1996
components:
- type: Transform
pos: -5.5,-9.5
parent: 1
- uid: 1997
- uid: 1833
components:
- type: Transform
pos: -3.5,-9.5
Expand Down Expand Up @@ -11174,39 +11145,39 @@ entities:
pos: -0.5,-8.5
parent: 1
- type: Door
secondsUntilStateChange: -1725.3612
secondsUntilStateChange: -1983.0103
state: Opening
- uid: 1840
components:
- type: Transform
pos: -0.5,-7.5
parent: 1
- type: Door
secondsUntilStateChange: -1726.0421
secondsUntilStateChange: -1983.6912
state: Opening
- uid: 1841
components:
- type: Transform
pos: -1.5,-1.5
parent: 1
- type: Door
secondsUntilStateChange: -1699.2756
secondsUntilStateChange: -1956.9247
state: Opening
- uid: 1842
components:
- type: Transform
pos: -0.5,-1.5
parent: 1
- type: Door
secondsUntilStateChange: -1699.9088
secondsUntilStateChange: -1957.5579
state: Opening
- uid: 1905
components:
- type: Transform
pos: -5.5,2.5
parent: 1
- type: Door
secondsUntilStateChange: -1697.7966
secondsUntilStateChange: -1955.4457
state: Opening
- proto: WoodSecretDoor
entities:
Expand Down
Loading
Loading