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.

Sign up for GitHub

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

Barge Solars Adjustment #2695

Merged
merged 13 commits into from
Feb 13, 2025
+319 −229
Merged

Barge Solars Adjustment #2695

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e232696
Update barge.yml
dustylens Jan 12, 2025
511f464
Raises price to 49000 to pay for the extra SMES
dustylens Jan 12, 2025
f1b75ee
Merge branch 'master' into Barge-Solar-Adjustment
dustylens Jan 18, 2025
de423b5
Merge branch 'master' into Barge-Solar-Adjustment
dustylens Jan 19, 2025
4c51281
Merge branch 'master' into Barge-Solar-Adjustment
dustylens Jan 28, 2025
04bb244
Holopad update
dustylens Jan 28, 2025
a3f7000
Merge branch 'master' into Barge-Solar-Adjustment
dustylens Jan 28, 2025
8a13799
Merge branch 'master' into Barge-Solar-Adjustment
dustylens Jan 30, 2025
03a85b9
Holopad update
dustylens Jan 30, 2025
e9360b0
Merge branch 'master' into Barge-Solar-Adjustment
dustylens Feb 5, 2025
ee26c27
Merge branch 'master' into Barge-Solar-Adjustment
dustylens Feb 6, 2025
c0c0950
Merge branch 'master' into Barge-Solar-Adjustment
dvir001 Feb 8, 2025
2bcc463
Engine correction and spawn placement shift
dustylens Feb 9, 2025
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
Prev Previous commit
Next Next commit
Holopad update
@dustylens
dustylens committed Jan 28, 2025
commit 04bb24421c2b8c0234866504b0b45ca7de6419b7
120 changes: 67 additions & 53 deletions Resources/Maps/_NF/Shuttles/barge.yml
View file
Original file line number Diff line number Diff line change
@@ -538,6 +538,8 @@ entities:
- 623
- 304
- 647
- 48
- 289
- proto: AirlockCargoGlass
entities:
- uid: 570
@@ -2486,14 +2488,6 @@ entities:
color: '#990000FF'
- proto: GasPipeBend
entities:
- uid: 48
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 2.5,-12.5
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 264
components:
- type: Transform
@@ -2510,21 +2504,21 @@ entities:
parent: 70
- type: AtmosPipeColor
color: '#990000FF'
- uid: 615
- uid: 617
components:
- type: Transform
pos: -1.5,-12.5
pos: -1.5,-11.5
parent: 70
- type: AtmosPipeColor
color: '#990000FF'
- uid: 616
- uid: 618
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -3.5,-12.5
rot: 1.5707963267948966 rad
pos: 0.5,-11.5
parent: 70
- type: AtmosPipeColor
color: '#990000FF'
color: '#0055CCFF'
- uid: 621
components:
- type: Transform
@@ -2656,6 +2650,13 @@ entities:
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 57
components:
- type: Transform
pos: -1.5,-13.5
parent: 70
- type: AtmosPipeColor
color: '#990000FF'
- uid: 215
components:
- type: Transform
@@ -2678,22 +2679,6 @@ entities:
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 289
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 1.5,-12.5
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 290
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 2.5,-11.5
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 291
components:
- type: Transform
@@ -2823,18 +2808,25 @@ entities:
parent: 70
- type: AtmosPipeColor
color: '#990000FF'
- uid: 617
- uid: 586
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -2.5,-12.5
pos: -1.5,-12.5
parent: 70
- type: AtmosPipeColor
color: '#990000FF'
- uid: 618
- uid: 615
components:
- type: Transform
pos: -3.5,-11.5
pos: 0.5,-12.5
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 616
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -2.5,-11.5
parent: 70
- type: AtmosPipeColor
color: '#990000FF'
@@ -3057,12 +3049,21 @@ entities:
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 740
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 1.5,-11.5
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- proto: GasPipeTJunction
entities:
- uid: 14
components:
- type: Transform
pos: 0.5,-12.5
rot: -1.5707963267948966 rad
pos: 2.5,-11.5
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
@@ -3074,6 +3075,14 @@ entities:
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 290
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,-11.5
parent: 70
- type: AtmosPipeColor
color: '#990000FF'
- uid: 292
components:
- type: Transform
@@ -3098,14 +3107,6 @@ entities:
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 586
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -1.5,-13.5
parent: 70
- type: AtmosPipeColor
color: '#990000FF'
- uid: 622
components:
- type: Transform
@@ -3158,12 +3159,15 @@ entities:
parent: 70
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 57
- uid: 289
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -0.5,-12.5
rot: 3.141592653589793 rad
pos: 2.5,-12.5
parent: 70
- type: DeviceNetwork
deviceLists:
- 743
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 304
@@ -3217,23 +3221,26 @@ entities:
color: '#0055CCFF'
- proto: GasVentScrubber
entities:
- uid: 550
- uid: 48
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.5,-17.5
rot: 3.141592653589793 rad
pos: -3.5,-12.5
parent: 70
- type: DeviceNetwork
deviceLists:
- 485
- 743
- type: AtmosPipeColor
color: '#990000FF'
- uid: 594
- uid: 550
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.5,-13.5
pos: -0.5,-17.5
parent: 70
- type: DeviceNetwork
deviceLists:
- 485
- type: AtmosPipeColor
color: '#990000FF'
- uid: 623
@@ -3541,6 +3548,13 @@ entities:
- type: Transform
pos: 1.4998418,4.4436564
parent: 70
- proto: HolopadLongRange
entities:
- uid: 594
components:
- type: Transform
pos: -0.5,-13.5
parent: 70
- proto: LockerBoozeFilled
entities:
- uid: 129