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 colored light bulbs #2636

Merged
merged 14 commits into from
Jan 4, 2025
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@
- id: BoxInflatable # Frontier
- id: BoxLighttube # Frontier
- id: BoxLightbulb # Frontier
- id: BoxColoredLighttube # Frontier
- id: BoxColoredLightbulb # Frontier

- type: entityTable
id: SalvageEquipmentUncommon
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@
- ExteriorLightTube
- LightBulb
- LedLightBulb
- SodiumLightBulb # Frontier
- ExteriorLightBulb #Frontier
- Bucket
- DrinkMug
- DrinkMugMetal
Expand Down
29 changes: 0 additions & 29 deletions Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml

This file was deleted.

This file was deleted.

This file was deleted.

50 changes: 0 additions & 50 deletions Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,13 @@
cost: 1500
category: cargoproduct-category-name-service
group: market

- type: cargoProduct
id: ServiceColoredLightsReplacement
icon:
sprite: Objects/Power/light_bulb.rsi
state: normal
product: CrateServiceReplacementColoredLights
cost: 600
category: Service
group: market
65 changes: 65 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,68 @@
whitelist:
components:
- LightBulb

- type: entity
name: colored lighttube box
parent: BoxCardboard
id: BoxColoredLighttube
description: This box is shaped on the inside so that only light tubes and bulbs fit.
components:
- type: StorageFill
contents:
- id: LightTubeCrystalCyan
amount: 2
- id: LightTubeCrystalBlue
amount: 2
- id: LightTubeCrystalPink
amount: 2
- id: LightTubeCrystalOrange
amount: 2
- id: LightTubeCrystalRed
amount: 2
- id: LightTubeCrystalGreen
amount: 2
- type: Sprite
layers:
- state: box
- state: lighttube
- type: Storage
maxItemSize: Small
grid:
- 0,0,5,3
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
maxItemSize: Small
grid:
- 0,0,5,3
whitelist:
components:
- LightBulb
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,13 @@
contents:
- id: NFVehicleJanicart
- id: VehicleKeyJanicart

- type: entity
id: CrateServiceReplacementColoredLights
name: colored lights crate
parent: CrateGenericSteel
components:
- type: StorageFill
contents:
- id: BoxColoredLighttube
- id: BoxColoredLightbulb
Loading
Loading