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

Replaces Barnacle tiny fans with directional fans. #2097

Merged
merged 7 commits into from
Oct 11, 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
150 changes: 76 additions & 74 deletions Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,6 @@ entities:
- 227
- 213
- 215
- proto: AirCanister
entities:
- uid: 57
components:
- type: Transform
anchored: True
pos: -5.5,-2.5
parent: 201
- type: Physics
bodyType: Static
- proto: AirlockExternalGlass
entities:
- uid: 142
Expand Down Expand Up @@ -228,38 +218,43 @@ entities:
- type: Transform
pos: 1.3489224,-4.3157334
parent: 201
- proto: AtmosDeviceFanTiny
- proto: AtmosDeviceFanDirectional
entities:
- uid: 11
- uid: 28
components:
- type: Transform
pos: 0.5,-2.5
rot: -1.5707963267948966 rad
pos: -6.5,0.5
parent: 201
- uid: 12
- uid: 57
components:
- type: Transform
pos: 0.5,-1.5
rot: -1.5707963267948966 rad
pos: -6.5,-1.5
parent: 201
- uid: 13
- uid: 62
components:
- type: Transform
pos: 0.5,-0.5
rot: -1.5707963267948966 rad
pos: -6.5,-0.5
parent: 201
- uid: 27
- uid: 122
components:
- type: Transform
pos: -6.5,-1.5
rot: 1.5707963267948966 rad
pos: 0.5,-0.5
parent: 201
- uid: 28
- uid: 166
components:
- type: Transform
pos: -6.5,0.5
rot: 1.5707963267948966 rad
pos: 0.5,-1.5
parent: 201
- uid: 73
- uid: 226
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -6.5,-0.5
rot: 1.5707963267948966 rad
pos: 0.5,-2.5
parent: 201
- proto: AtmosFixBlockerMarker
entities:
Expand Down Expand Up @@ -341,27 +336,18 @@ entities:
rot: 3.141592653589793 rad
pos: 0.5,-2.5
parent: 201
- type: DeviceLinkSink
links:
- 103
- uid: 171
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 0.5,-0.5
parent: 201
- type: DeviceLinkSink
links:
- 103
- uid: 172
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 0.5,-1.5
parent: 201
- type: DeviceLinkSink
links:
- 103
- proto: CableApcExtension
entities:
- uid: 69
Expand Down Expand Up @@ -755,6 +741,19 @@ entities:
- type: Transform
pos: -2.5,-3.5
parent: 201
- proto: GasMixerOn
entities:
- uid: 67
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,-0.5
parent: 201
- type: GasMixer
inletTwoConcentration: 0.79
inletOneConcentration: 0.21
- type: AtmosPipeColor
color: '#0055CCFF'
- proto: GasPassiveVent
entities:
- uid: 123
Expand Down Expand Up @@ -809,6 +808,13 @@ entities:
parent: 201
- type: AtmosPipeColor
color: '#1010FFFF'
- uid: 11
components:
- type: Transform
pos: -3.5,-1.5
parent: 201
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 119
components:
- type: Transform
Expand Down Expand Up @@ -918,14 +924,6 @@ entities:
parent: 201
- type: AtmosPipeColor
color: '#990000FF'
- uid: 225
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -0.5,-3.5
parent: 201
- type: AtmosPipeColor
color: '#990000FF'
- proto: GasPipeTJunction
entities:
- uid: 117
Expand All @@ -946,25 +944,25 @@ entities:
color: '#990000FF'
- proto: GasPort
entities:
- uid: 42
- uid: 12
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -5.5,-2.5
pos: -3.5,-2.5
parent: 201
- type: AtmosPipeColor
color: '#1010FFFF'
- proto: GasPressurePump
entities:
- uid: 120
color: '#0055CCFF'
- uid: 42
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,-0.5
rot: 3.141592653589793 rad
pos: -5.5,-2.5
parent: 201
- type: AtmosPipeColor
color: '#1010FFFF'
- uid: 122
- proto: GasPressurePumpOnMax
entities:
- uid: 73
components:
- type: Transform
rot: -1.5707963267948966 rad
Expand Down Expand Up @@ -1157,8 +1155,14 @@ entities:
- type: Transform
pos: -4.5,2.5
parent: 201
- type: Thruster
originalPowerLoad: 1500
- proto: LockerWallMaterialsFuelPlasmaFilled
entities:
- uid: 120
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 1.5,-6.5
parent: 201
- proto: MachineFrame
entities:
- uid: 41
Expand All @@ -1174,6 +1178,26 @@ entities:
- type: Transform
pos: 1.6783751,-4.3457556
parent: 201
- proto: NitrogenCanister
entities:
- uid: 27
components:
- type: Transform
anchored: True
pos: -3.5,-2.5
parent: 201
- type: Physics
bodyType: Static
- proto: OxygenCanister
entities:
- uid: 13
components:
- type: Transform
anchored: True
pos: -5.5,-2.5
parent: 201
- type: Physics
bodyType: Static
- proto: PirateFlag
entities:
- uid: 14
Expand Down Expand Up @@ -1392,17 +1416,6 @@ entities:
23:
- Pressed: Toggle
- Pressed: Trigger
- proto: SheetPlasma
entities:
- uid: 166
components:
- type: Transform
pos: 0.4796412,-5.530752
parent: 201
- type: Stack
count: 15
- type: Item
size: 15
- proto: ShuttleGunPirateCannon
entities:
- uid: 23
Expand All @@ -1411,9 +1424,6 @@ entities:
rot: 1.5707963267948966 rad
pos: 1.5,-0.5
parent: 201
- type: DeviceLinkSink
links:
- 252
- proto: SignalButtonDirectional
entities:
- uid: 103
Expand Down Expand Up @@ -1518,31 +1528,23 @@ entities:
rot: 3.141592653589793 rad
pos: -3.5,-7.5
parent: 201
- type: Thruster
originalPowerLoad: 1500
- uid: 137
components:
- type: Transform
pos: -4.5,3.5
parent: 201
- type: Thruster
originalPowerLoad: 1500
- uid: 138
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 2.5,-7.5
parent: 201
- type: Thruster
originalPowerLoad: 1500
- uid: 150
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,2.5
parent: 201
- type: Thruster
originalPowerLoad: 1500
- proto: WallWood
entities:
- uid: 10
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
id: Barnacle
name: Barnacle
description: 'Nobody expects the lowly barnacle'
price: 16000
price: 17000 # Appraises for 15445, price set to 17k, margin of ~10% - TODO: review ship values - Whatstone
category: Small
group: BlackMarket
shuttlePath: /Maps/_NF/Shuttles/BlackMarket/barnacle.yml
Expand Down
Loading