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

Adds FSB Nightlight service shuttle #2625

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 7 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
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_NF/guidebook/guides.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ guide-entry-shipyard-liquidator = Liquidator
guide-entry-shipyard-loader = Loader
guide-entry-shipyard-mccargo = McCargo
guide-entry-shipyard-mcdelivery = McDelivery
guide-entry-shipyard-nightlight = Nightlight
guide-entry-shipyard-pathfinder = Pathfinder
guide-entry-shipyard-phoenix = Phoenix
guide-entry-shipyard-pioneer = Pioneer
Expand Down
5,085 changes: 5,085 additions & 0 deletions Resources/Maps/_NF/Shuttles/nightlight.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
- id: BoxInflatable # Frontier
- id: BoxLighttube # Frontier
- id: BoxLightbulb # Frontier
- id: BoxColoredLightBulb # Frontier

- type: entityTable
id: SalvageEquipmentUncommon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
- NFPosterContrabandKillerFashion # Frontier
- NFPosterContrabandGoblinFront # Frontier
- NFPosterContrabandGoblinate # Frontier
- NFPosterContrabandFsbNightlight # Frontier
chance: 1

- type: entity
Expand Down
32 changes: 32 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,35 @@
whitelist:
components:
- LightBulb

- type: entity
name: colored bulbs box
parent: BoxLightbulb
id: BoxColoredLightBulb
description: This box is shaped on the inside so that only light tubes and bulbs fit. It's full of neat colored light bulbs!
components:
- type: StorageFill
contents:
- id: LightBulbCrystalCyan
amount: 2
- id: LightBulbCrystalBlue
amount: 2
- id: LightBulbCrystalPink
amount: 2
- id: LightBulbCrystalOrange
amount: 2
- id: LightBulbCrystalRed
amount: 2
- id: LightBulbCrystalGreen
amount: 2
- type: Sprite
layers:
- state: box
- state: light
color: "cyan"
- type: Storage
grid:
- 0,0,5,3
whitelist:
components:
- LightBulb
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@
guides:
- ShipyardSearchlight

- type: entity
parent: ShipyardInfoBase
id: ShipyardNightlightInfo
name: Nightlight user manual
components:
- type: GuideHelp
guides:
- ShipyardNightlight

- type: entity
parent: ShipyardInfoBase
id: ShipyardCharonInfo
Expand Down
143 changes: 143 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
- type: entity
parent: BaseLightbulb
name: cyan crystal light bulb
id: LightBulbCrystalCyan
description: A colorful light bulb with a small colored crystal inside.
components:
- type: LightBulb
bulb: Bulb
color: "#47f8ff"
lightEnergy: 1.0
lightRadius: 6
lightSoftness: 1.1
- type: Tag
tags:
- LightBulb
- Trash
- type: Construction
graph: CyanLight
node: icon
- type: ToolRefinable
refineResult:
- id: SheetGlass1
- id: ShardCrystalCyan

- type: entity
parent: BaseLightbulb
name: blue crystal light bulb
id: LightBulbCrystalBlue
description: A colorful light bulb with a small colored crystal inside.
components:
- type: LightBulb
bulb: Bulb
color: "#39a1ff"
lightEnergy: 1.0
lightRadius: 6
lightSoftness: 1.1
- type: Tag
tags:
- LightBulb
- Trash
- type: Construction
graph: BlueLight
node: icon
- type: ToolRefinable
refineResult:
- id: SheetGlass1
- id: ShardCrystalBlue

- type: entity
parent: BaseLightbulb
name: pink crystal light bulb
id: LightBulbCrystalPink
description: A colorful light bulb with a small colored crystal inside.
components:
- type: LightBulb
bulb: Bulb
color: "#ff66cc"
lightEnergy: 1.0
lightRadius: 6
lightSoftness: 1.1
- type: Tag
tags:
- LightBulb
- Trash
- type: Construction
graph: PinkLight
node: icon
- type: ToolRefinable
refineResult:
- id: SheetGlass1
- id: ShardCrystalPink

- type: entity
parent: BaseLightbulb
name: orange crystal light bulb
id: LightBulbCrystalOrange
description: A colorful light bulb with a small colored crystal inside.
components:
- type: LightBulb
bulb: Bulb
color: "#ff8227"
lightEnergy: 1.0
lightRadius: 6
lightSoftness: 1.1
- type: Tag
tags:
- LightBulb
- Trash
- type: Construction
graph: OrangeLight
node: icon
- type: ToolRefinable
refineResult:
- id: SheetGlass1
- id: ShardCrystalOrange

- type: entity
parent: BaseLightbulb
name: red crystal light bulb
id: LightBulbCrystalRed
description: A colorful light bulb with a small colored crystal inside.
components:
- type: LightBulb
bulb: Bulb
color: "#fb4747"
lightEnergy: 1.0
lightRadius: 6
lightSoftness: 1.1
- type: Tag
tags:
- LightBulb
- Trash
- type: Construction
graph: RedLight
node: icon
- type: ToolRefinable
refineResult:
- id: SheetGlass1
- id: ShardCrystalRed

- type: entity
parent: BaseLightbulb
name: green crystal light bulb
id: LightBulbCrystalGreen
description: A colorful light bulb with a small colored crystal inside.
components:
- type: LightBulb
bulb: Bulb
color: "#52ff39"
lightEnergy: 1.0
lightRadius: 6
lightSoftness: 1.1
- type: Tag
tags:
- LightBulb
- Trash
- type: Construction
graph: GreenLight
node: icon
- type: ToolRefinable
refineResult:
- id: SheetGlass1
- id: ShardCrystalGreen
39 changes: 39 additions & 0 deletions Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
- type: entity
name: ice box
description: This delightful machine is slowly filling with ice!
id: IceboxEmpty
parent: SinkEmpty
components:
- type: Sprite
sprite: _NF/Structures/Furniture/icebox.rsi
layers:
- state: icebox
- map: [ "enum.SolutionContainerLayers.Fill" ]
state: icebox_fill-1
visible: false
- type: Appearance
- type: SolutionContainerVisuals
maxFillLevels: 1
fillBaseName: icebox_fill-
solutionName: drainBuffer
- type: SolutionRegeneration
solution: tank
generated:
reagents:
- ReagentId: Ice
Quantity: 1

- type: entity
name: ice box
id: Icebox
parent: IceboxEmpty
suffix: Ice
components:
- type: SolutionContainerManager
solutions:
drainBuffer:
maxVol: 100
tank:
reagents:
- ReagentId: Ice
Quantity: 500
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,17 @@
- type: Sprite
sprite: _NF/Structures/Wallmounts/posters.rsi
state: nf_poster15_contraband

- type: entity
parent: PosterBase
id: NFPosterContrabandFsbNightlight
name: "Far Star Biotech Nightlight"
description: "The FSB Nightlight, chasing the night away."
components:
- type: Sprite
sprite: _NF/Structures/Wallmounts/posters.rsi
state: nf_poster16_contraband
- type: PointLight
radius: 1.5
energy: 2
color: "#F8F6F0"
6 changes: 6 additions & 0 deletions Resources/Prototypes/_NF/Guidebook/shipyard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
- ShipyardLoader
- ShipyardMcCargo
- ShipyardMcDelivery
- ShipyardNightlight
- ShipyardPathfinder
- ShipyardPhoenix
- ShipyardPioneer
Expand Down Expand Up @@ -208,6 +209,11 @@
name: guide-entry-shipyard-mcdelivery
text: "/ServerInfo/_NF/Guidebook/Shipyard/McDelivery.xml"

- type: guideEntry
id: ShipyardNightlight
name: guide-entry-shipyard-nightlight
text: "/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml"

- type: guideEntry
id: ShipyardPathfinder
name: guide-entry-shipyard-pathfinder
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,18 @@
state: loader
scale: 1.2, 1.2

- type: entity
parent: PosterBase
id: ShuttleMapNightlight
name: "FSB Nightlight"
description: "Detailed map of a Nightlight shuttle."
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
state: nightlight
scale: 1.2, 1.2

- type: entity
parent: PosterBase
id: ShuttleMapPathfinder
Expand Down
Loading
Loading