diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index 0e4d0056c7..66fec56eeb 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -305,17 +305,25 @@ - type: entity parent: BaseLightTube - name: cyan crystal light tube + name: crystal light tube description: A high power high energy bulb which has a small colored crystal inside. - id: LightTubeCrystalCyan + id: BaseLightTubeCrystal + abstract: true components: - type: LightBulb - color: "#47f8ff" lightEnergy: 3 lightRadius: 8 lightSoftness: 0.5 BurningTemperature: 350 PowerUse: 60 + +- type: entity + parent: BaseLightTubeCrystal + name: cyan crystal light tube + id: LightTubeCrystalCyan + components: + - type: LightBulb + color: "#47f8ff" - type: Construction graph: CyanLight node: icon @@ -325,17 +333,12 @@ - id: ShardCrystalCyan - type: entity - parent: LightTubeCrystalCyan + parent: BaseLightTubeCrystal name: blue crystal light tube id: LightTubeCrystalBlue components: - type: LightBulb color: "#39a1ff" - lightEnergy: 3 - lightRadius: 8 - lightSoftness: 0.5 - BurningTemperature: 350 - PowerUse: 60 - type: Construction graph: BlueLight node: icon @@ -345,17 +348,12 @@ - id: ShardCrystalBlue - type: entity - parent: LightTubeCrystalCyan + parent: BaseLightTubeCrystal name: pink crystal light tube id: LightTubeCrystalPink components: - type: LightBulb color: "#ff66cc" - lightEnergy: 3 - lightRadius: 8 - lightSoftness: 0.5 - BurningTemperature: 350 - PowerUse: 60 - type: Construction graph: PinkLight node: icon @@ -365,17 +363,12 @@ - id: ShardCrystalPink - type: entity - parent: LightTubeCrystalCyan + parent: BaseLightTubeCrystal name: orange crystal light tube id: LightTubeCrystalOrange components: - type: LightBulb color: "#ff8227" - lightEnergy: 3 - lightRadius: 8 - lightSoftness: 0.5 - BurningTemperature: 350 - PowerUse: 60 - type: Construction graph: OrangeLight node: icon @@ -385,17 +378,12 @@ - id: ShardCrystalOrange - type: entity - parent: LightTubeCrystalCyan + parent: BaseLightTubeCrystal name: red crystal light tube id: LightTubeCrystalRed components: - type: LightBulb color: "#fb4747" - lightEnergy: 3 - lightRadius: 8 - lightSoftness: 0.5 - BurningTemperature: 350 - PowerUse: 60 - type: Construction graph: RedLight node: icon @@ -411,11 +399,6 @@ components: - type: LightBulb color: "#52ff39" - lightEnergy: 3 - lightRadius: 8 - lightSoftness: 0.5 - BurningTemperature: 350 - PowerUse: 60 - type: Construction graph: GreenLight node: icon @@ -423,3 +406,110 @@ refineResult: - id: SheetGlass1 - id: ShardCrystalGreen + + +- type: entity + parent: BaseLightbulb + name: crystal light bulb + description: A high power high energy bulb which has a small colored crystal inside. + id: BaseLightbulbCrystal + abstract: true + components: + - type: LightBulb + color: "#47f8ff" + lightEnergy: 1 + lightRadius: 6 + lightSoftness: 0.5 + BurningTemperature: 350 + PowerUse: 60 + bulb: Bulb + +- type: entity + parent: BaseLightbulbCrystal + name: cyan crystal light bulb + id: LightBulbCrystalCyan + components: + - type: LightBulb + color: "#47f8ff" + - type: Construction + graph: CyanLightBulb + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalCyan + +- type: entity + parent: BaseLightbulbCrystal + name: blue crystal light bulb + id: LightBulbCrystalBlue + components: + - type: LightBulb + color: "#39a1ff" + - type: Construction + graph: BlueLightBulb + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalBlue + +- type: entity + parent: BaseLightbulbCrystal + name: pink crystal light bulb + id: LightBulbCrystalPink + components: + - type: LightBulb + color: "#ff66cc" + - type: Construction + graph: PinkLightBulb + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalPink + +- type: entity + parent: BaseLightbulbCrystal + name: orange crystal light bulb + id: LightBulbCrystalOrange + components: + - type: LightBulb + color: "#ff8227" + - type: Construction + graph: OrangeLightBulb + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalOrange + +- type: entity + parent: BaseLightbulbCrystal + name: red crystal light bulb + id: LightBulbCrystalRed + components: + - type: LightBulb + color: "#fb4747" + - type: Construction + graph: RedLightBulb + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalRed + +- type: entity + parent: BaseLightbulbCrystal + name: green crystal light bulb + id: LightBulbCrystalGreen + components: + - type: LightBulb + color: "#52ff39" + - type: Construction + graph: GreenLightBulb + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalGreen diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml index 977be3f4d6..d7e48b6646 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml @@ -118,3 +118,124 @@ doAfter: 1 - node: icon entity: LightTubeCrystalGreen + +- type: constructionGraph + id: CyanLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 1 + doAfter: 1 + - tag: CrystalCyan + name: cyan crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + color: #52ff39 + doAfter: 1 + - node: icon + entity: LightBulbCrystalCyan + +- type: constructionGraph + id: BlueLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 1 + doAfter: 1 + - tag: CrystalBlue + name: blue crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalBlue + +- type: constructionGraph + id: PinkLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 1 + doAfter: 1 + - tag: CrystalPink + name: pink crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalPink + +- type: constructionGraph + id: OrangeLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 1 + doAfter: 1 + - tag: CrystalOrange + name: orange crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalOrange + +- type: constructionGraph + id: RedLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 1 + doAfter: 1 + - tag: CrystalRed + name: red crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalRed + +- type: constructionGraph + id: GreenLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 1 + doAfter: 1 + - tag: CrystalGreen + name: green crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalGreen diff --git a/Resources/Prototypes/Recipes/Construction/lighting.yml b/Resources/Prototypes/Recipes/Construction/lighting.yml index 0533f70f1a..d6aeddc7e8 100644 --- a/Resources/Prototypes/Recipes/Construction/lighting.yml +++ b/Resources/Prototypes/Recipes/Construction/lighting.yml @@ -5,7 +5,7 @@ startNode: start targetNode: icon category: construction-category-utilities - description: A high powered light tube containing a cyan crystal + description: A high powered light tube containing a cyan crystal. icon: { sprite: Objects/Power/light_tube.rsi, state: normal } objectType: Item @@ -16,7 +16,7 @@ startNode: start targetNode: icon category: construction-category-utilities - description: A high powered light tube containing a blue crystal + description: A high powered light tube containing a blue crystal. icon: { sprite: Objects/Power/light_tube.rsi, state: normal } objectType: Item @@ -27,7 +27,7 @@ startNode: start targetNode: icon category: construction-category-utilities - description: A high powered light tube containing a pink crystal + description: A high powered light tube containing a pink crystal. icon: { sprite: Objects/Power/light_tube.rsi, state: normal } objectType: Item @@ -38,7 +38,7 @@ startNode: start targetNode: icon category: construction-category-utilities - description: A high powered light tube containing an orange crystal + description: A high powered light tube containing an orange crystal. icon: { sprite: Objects/Power/light_tube.rsi, state: normal } objectType: Item @@ -49,7 +49,7 @@ startNode: start targetNode: icon category: construction-category-utilities - description: A high powered light tube containing a red crystal + description: A high powered light tube containing a red crystal. icon: { sprite: Objects/Power/light_tube.rsi, state: normal } objectType: Item @@ -60,6 +60,72 @@ startNode: start targetNode: icon category: construction-category-utilities - description: A high powered light tube containing a green crystal + description: A high powered light tube containing a green crystal. icon: { sprite: Objects/Power/light_tube.rsi, state: normal } objectType: Item + +- type: construction + name: cyan light bulb + id: CyanLightBulb + graph: CyanLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light bulb containing a cyan crystal. + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: blue light bulb + id: BlueLightBulb + graph: BlueLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light bulb containing a blue crystal. + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: pink light bulb + id: PinkLightBulb + graph: PinkLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light bulb containing a pink crystal. + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: orange light bulb + id: OrangeLightBulb + graph: OrangeLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light bulb containing an orange crystal. + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: red light bulb + id: RedLightBulb + graph: RedLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light bulb containing a red crystal. + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: green light bulb + id: GreenLightBulb + graph: GreenLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light bulb containing a green crystal. + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item