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

Table and chair construction 1 #353

Merged
merged 6 commits into from
Jul 14, 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
12,728 changes: 10,566 additions & 2,162 deletions Resources/Maps/N14/sunnyvale2.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/schoolchair.rsi
state: chair
- type: Construction
graph: N14Seat
node: N14ChairSchool

- type: entity
parent: ChairWood
Expand All @@ -17,6 +20,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/bedsandchairs.rsi
state: wooden_chair
- type: Construction
graph: N14Seat
node: N14ChairWood

- type: entity
parent: ChairWood
Expand All @@ -25,6 +31,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: wood_chair
- type: Construction
graph: N14Seat
node: N14ChairWood1

- type: entity
parent: ChairWood
Expand All @@ -34,6 +43,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: wood_chair_padded
- type: Construction
graph: N14Seat
node: N14ChairWoodPadded

- type: entity
parent: N14ChairWood
Expand All @@ -43,6 +55,9 @@
components:
- type: Sprite
state: wooden_chair_settler
- type: Construction
graph: N14Seat
node: N14ChairWoodSettler

- type: entity
parent: StoolBase
Expand All @@ -53,6 +68,9 @@
sprite: _Nuclear14/Structures/Furniture/bedsandchairs.rsi
state: bar_black
snapCardinals: true
- type: Construction
graph: N14Seat
node: N14ChairStoolBarBlack

- type: entity
parent: StoolBase
Expand All @@ -62,6 +80,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/bedsandchairs.rsi
state: bar_tan
- type: Construction
graph: N14Seat
node: N14ChairStoolBarTan

- type: entity
parent: StoolBase
Expand All @@ -71,6 +92,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: barstool
- type: Construction
graph: N14Seat
node: N14ChairStoolBarRed

- type: entity
parent: N14ChairWood
Expand All @@ -81,6 +105,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: armchair
- type: Construction
graph: N14Seat
node: N14ChairArmchair

# Metal Chairs
- type: entity
Expand All @@ -91,6 +118,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: metal_chair
- type: Construction
graph: N14Seat
node: N14ChairMetalGreen

- type: entity
parent: N14ChairMetalGreen
Expand All @@ -117,6 +147,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: metal_chair_blue
- type: Construction
graph: N14Seat
node: N14ChairMetalBlue

- type: entity
parent: N14ChairMetalGreen
Expand All @@ -143,6 +176,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: metal_chair_red
- type: Construction
graph: N14Seat
node: N14ChairMetalRed

- type: entity
parent: N14ChairMetalGreen
Expand Down Expand Up @@ -170,6 +206,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: office_chair
- type: Construction
graph: N14Seat
node: N14ChairOfficeRed

- type: entity
parent: OfficeChairBase
Expand All @@ -190,6 +229,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: office_chair_blue
- type: Construction
graph: N14Seat
node: N14ChairOfficeBlue

- type: entity
parent: N14ChairOfficeRed
Expand All @@ -210,6 +252,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: office_chair_green
- type: Construction
graph: N14Seat
node: N14ChairOfficeGreen

- type: entity
parent: OfficeChairBase
Expand All @@ -229,6 +274,9 @@
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/chairs.rsi
state: ergo_chair
- type: Construction
graph: N14Seat
node: N14ChairOfficeErgonomic

- type: entity
parent: N14ChairMetalGreen
Expand All @@ -238,6 +286,9 @@
components:
- type: Sprite
state: metal_chair_folding
- type: Construction
graph: N14Seat
node: N14ChairMetalFolding

- type: entity
parent: N14ChairMetalGreen
Expand All @@ -256,6 +307,9 @@
components:
- type: Sprite
state: plastic_chair
- type: Construction
graph: N14Seat
node: N14ChairPlastic

- type: entity
parent: N14ChairMetalGreen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,9 @@
sprite: _Nuclear14/Structures/Furniture/Tables/table_settler.rsi
- type: Icon
sprite: _Nuclear14/Structures/Furniture/Tables/table_settler.rsi
- type: Construction
graph: N14Table
node: N14TableWoodSettler

# - type: entity
# id: N14TableWoodenBuilt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,54 @@
range: 200
ports:
- OrderSender

- type: entity
parent: [ SignalButton, N14ComputerTerminalWallControls ]
id: N14ControlTerminalButton
components:
- type: Sprite
sprite: _Nuclear14/Structures/Machines/Terminals/terminal_classic.rsi
state: computer

# Camera Monitors
## Base
- type: entity
parent: N14ComputerTerminalWallDisplays
id: N14ComputerCameraDisplay
name: camera display unit
description: A surveillance camera monitor. You're watching them. Maybe.
abstract: true
components:
# - type: Computer
# board: SurveillanceCameraMonitorCircuitboard
- type: DeviceNetwork
deviceNetId: Wired
receiveFrequencyId: SurveillanceCamera
transmitFrequencyId: SurveillanceCamera
- type: WiredNetworkConnection
- type: DeviceNetworkRequiresPower
- type: Speech
- type: SurveillanceCameraSpeaker
- type: SurveillanceCameraMonitor
- type: ActivatableUI
key: enum.SurveillanceCameraMonitorUiKey.Key
- type: ActivatableUIRequiresPower
- type: UserInterface
interfaces:
- key: enum.SurveillanceCameraMonitorUiKey.Key
type: SurveillanceCameraMonitorBoundUserInterface
- type: PointLight
radius: 1.5
energy: 1.6
color: "#b89f25"

# In Use
- type: entity
parent: N14ComputerCameraDisplay
id: N14ComputerCameraDisplayBrotherhoodWashington
suffix: BOS Washington
components:
- type: DeviceNetwork
deviceNetId: Wired
receiveFrequencyId: SurveillanceCamera
transmitFrequencyId: SurveillanceCameraBrotherhoodWashington
Original file line number Diff line number Diff line change
Expand Up @@ -237,3 +237,65 @@
- MachineMask
layer:
- MachineLayer

# Panels in use
## Base
- type: entity
parent: N14MachineRackRecorder
id: N14MachineRackCameraRouterBase
name: camera router
description: An old rack with camera recording equipment in.
abstract: true
components:
- type: DeviceNetwork
deviceNetId: Wired
receiveFrequencyId: SurveillanceCamera
transmitFrequencyId: SurveillanceCamera
- type: WiredNetworkConnection
- type: DeviceNetworkRequiresPower
- type: UserInterface
interfaces:
- key: enum.SurveillanceCameraSetupUiKey.Router
type: SurveillanceCameraSetupBoundUi

## Cameras
### See devicenet_frequencies.yml for definitions
- type: entity
parent: N14MachineRackCameraRouterBase
id: N14MachineRackCameraRouterBrotherhoodWashington
suffix: BOS Washington
components:
- type: SurveillanceCameraRouter
subnetFrequency: SurveillanceCameraBrotherhoodWashington

- type: entity
parent: N14MachineRackCameraRouterBase
id: N14MachineRackCameraRouterBrotherhoodMidwest
suffix: BOS Midwest
components:
- type: SurveillanceCameraRouter
subnetFrequency: SurveillanceCameraBrotherhoodMidwest

- type: entity
parent: N14MachineRackCameraRouterBase
id: N14MachineRackCameraRouterNCR
suffix: NCR
components:
- type: SurveillanceCameraRouter
subnetFrequency: SurveillanceCameraNCR

- type: entity
parent: N14MachineRackCameraRouterBase
id: N14MachineRackCameraRouterTown
suffix: Town
components:
- type: SurveillanceCameraRouter
subnetFrequency: SurveillanceCameraTown

- type: entity
parent: N14MachineRackCameraRouterBase
id: N14MachineRackCameraRouterVault
suffix: Vault
components:
- type: SurveillanceCameraRouter
subnetFrequency: SurveillanceCameraVault
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
parent: SurveillanceCameraBase
id: N14SurveillanceCameraBrotherhoodWashington
name: camera
suffix: BrotherhoodWashington
components:
- type: DeviceNetwork
deviceNetId: Wired
receiveFrequencyId: SurveillanceCamera
transmitFrequencyId: SurveillanceCameraBrotherhoodWashington
- type: SurveillanceCamera
networkSet: true
Loading
Loading