Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Vonsant committed Aug 11, 2024
2 parents 3bab412 + fcb2eee commit 7a457b7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -205,19 +205,19 @@
name: cargo market computer
parent: ComputerMarketConsoleNFBase
id: ComputerMarketConsoleNFLow
suffix: Low 5x
suffix: Low
components:
- type: MarketModifier
mod: 5
mod: 4

- type: entity
name: cargo market computer
parent: ComputerMarketConsoleNFBase
id: ComputerMarketConsoleNFHigh
suffix: High 10x
suffix: High
components:
- type: MarketModifier
mod: 10
mod: 8

- type: entity
id: ComputerPirateBounty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@
- type: entity
parent: [BaseStructureComputerTabletop, ComputerMarketConsoleNFLow]
id: ComputerTabletopMarketConsoleNFLow
suffix: Low 2x, Tabletop
suffix: Low, Tabletop
components:
- type: Sprite
drawdepth: SmallObjects
Expand All @@ -672,7 +672,7 @@
- type: entity
parent: [BaseStructureComputerTabletop, ComputerMarketConsoleNFHigh]
id: ComputerTabletopMarketConsoleNFHigh
suffix: High 5x, Tabletop
suffix: High, Tabletop
components:
- type: Sprite
drawdepth: SmallObjects
Expand Down

0 comments on commit 7a457b7

Please sign in to comment.