From 6d82a7becc3d40937c83b98c25cf85042811fe95 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 4 Jan 2025 20:32:57 +0000 Subject: [PATCH 1/4] Adds a new condiment station (#2637) * Adds a new condiment station * Update soda.yml * Update service.yml * Update soda.yml * Moves condiment cup to _NF * Changes + cleanup Converted tag to empty comp Removed StaticPrice to match the rest of the machines Rebase CondimentCup to DrinkWaterCup added on head sprite Added label to jugs * Condiment cups are now at 10, small copyright adjustment. Feel free to review. * Update service.yml * My sins (CondimentSqueezeBottle) --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../_NF/Containers/CondimentCupComponent.cs | 11 ++ .../CondimentSqueezeBottleComponent.cs | 11 ++ .../meta/consumable/food/condiments.ftl | 2 + .../Entities/Structures/Machines/lathe.yml | 1 + .../Catalog/ReagentDispensers/condiments.yml | 11 ++ .../Consumable/Drinks/condiments_bottles.yml | 135 ++++++++++++++++++ .../Objects/Consumable/Drinks/drinks.yml | 17 +++ .../Consumable/Food/Containers/condiments.yml | 13 +- .../Entities/Objects/Devices/production.yml | 19 +++ .../Objects/Specific/Service/condimentcup.yml | 43 ++++++ .../Structures/Dispensers/condiments.yml | 36 +++++ .../Entities/Structures/Machines/lathe.yml | 2 + .../_NF/Recipes/Lathes/electronics.yml | 10 +- .../Prototypes/_NF/Recipes/Lathes/service.yml | 15 ++ Resources/Prototypes/_NF/tags.yml | 2 +- .../condiment_cup.rsi/equipped-HELMET.png | Bin 0 -> 324 bytes .../Head/Hats/condiment_cup.rsi/icon.png | Bin 0 -> 229 bytes .../Head/Hats/condiment_cup.rsi/meta.json | 18 +++ .../Drinks/condiment_cup.rsi/icon-0.png | Bin 0 -> 261 bytes .../Drinks/condiment_cup.rsi/icon-1.png | Bin 0 -> 127 bytes .../Drinks/condiment_cup.rsi/meta.json | 17 +++ .../dispenser0.png | Bin 0 -> 303 bytes .../dispenser1.png | Bin 0 -> 334 bytes .../condiment_cup_dispenser.rsi/meta.json | 17 +++ .../Structures/smalldispensers.rsi/icon.png | Bin 0 -> 804 bytes .../Structures/smalldispensers.rsi/meta.json | 14 ++ 26 files changed, 382 insertions(+), 12 deletions(-) create mode 100644 Content.Shared/_NF/Containers/CondimentCupComponent.cs create mode 100644 Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs create mode 100644 Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl create mode 100644 Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png create mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json diff --git a/Content.Shared/_NF/Containers/CondimentCupComponent.cs b/Content.Shared/_NF/Containers/CondimentCupComponent.cs new file mode 100644 index 00000000000..01ef61f9ed0 --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentCupComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentCup empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentCupComponent : Component +{ + +} diff --git a/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs b/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs new file mode 100644 index 00000000000..7d7711f1a3b --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentSqueezeBottle empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentSqueezeBottleComponent : Component +{ + +} diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl new file mode 100644 index 00000000000..f89397fcb53 --- /dev/null +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl @@ -0,0 +1,2 @@ +reagent-name-coldsauce = coldsauce +reagent-desc-coldsauce = Coldsauce. Leaves the tongue numb in its passage. diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 45e157b6e91..8af06f49954 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -517,6 +517,7 @@ - SalvageTechFabCircuitboardNF # Frontier - NFScrapProcessorCircuitboard # Frontier - BlueprintLithographMachineCircuitboard # Frontier + - CondimentDispenserCircuitboard # Frontier dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard diff --git a/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml new file mode 100644 index 00000000000..366a7b6c185 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml @@ -0,0 +1,11 @@ +- type: reagentDispenserInventory + id: CondimentDispenserInventory + inventory: + - DrinkAstrotameJug + - DrinkBbqSauceJug + - DrinkColdsauceJug + - DrinkHorseradishSauceJug + - DrinkHotsauceJug + - DrinkKetchupJug + - DrinkMustardJug + - DrinkSoysauceJug diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml new file mode 100644 index 00000000000..aea59ed3e51 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml @@ -0,0 +1,135 @@ +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkAstrotameJug + name: astrotame jug + description: The sweetness of a thousand sugars but none of the calories. Put it in your coffee. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Astrotame + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-astrotame + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkBbqSauceJug + name: bbq sauce jug + description: Finally, ketchup for grownups. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: BbqSauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-bbq-sauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkColdsauceJug + name: coldsauce jug + description: Something to make every meal a little cooler. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Frostoil + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-coldsauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkHorseradishSauceJug + name: horseradish sauce jug + description: Now with 50% more horse. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: HorseradishSauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-horseradish-sauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkHotsauceJug + name: hotsauce jug + description: The antithesis of no more tears shampoo. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Hotsauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-hotsauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkKetchupJug + name: ketchup jug + description: Someone filled a tomato with sugar until it burst. Delicious. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Ketchup + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-ketchup + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkMustardJug + name: mustard jug + description: All of the implications of real mustard with none of the flavor. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Mustard + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-mustard + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkSoysauceJug + name: soy sauce jug + description: You can only dream of putting some of this on a bowl of rice. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Soysauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-soysauce diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml index 761d49039ee..61a58dbf889 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml @@ -95,3 +95,20 @@ - type: Icon sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi state: icon + +# condiment cup +- type: entity + parent: DrinkWaterCup + id: CondimentCup + name: condiment cup + description: A flimsy cup that can be filled with condiments. Warranty void if filled with other things. + components: + - type: Sprite + sprite: _NF/Objects/Consumable/Drinks/condiment_cup.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hats/condiment_cup.rsi + - type: CondimentCup + - type: SolutionContainerManager + solutions: + drink: + maxVol: 10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml index a6ab68876f6..6b43a731960 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -28,16 +28,9 @@ sprite: _NF/Objects/Consumable/Food/condiments.rsi - type: Icon sprite: _NF/Objects/Consumable/Food/condiments.rsi - # - type: EmitSoundOnActivate - # sound: - # collection: squeezeBottleUseSounds - # params: - # variation: 0.125 - # - type: EmitSoundOnLand - # sound: - # collection: squeezeBottleUseSounds - # params: - # variation: 0.125 + - type: CondimentSqueezeBottle + - type: FitsInDispenser + solution: food - type: entity parent: BaseFoodCondimentSqueezeBottle diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index bfd5c43d1db..182d5c2add6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -348,3 +348,22 @@ stackRequirements: Steel: 5 Plastic: 5 + +- type: entity + id: CondimentDispenserCircuitboard + parent: BaseMachineCircuitboard + name: condiment dispenser machine board + description: A machine printed circuit board for a condiment dispenser. + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: CondimentDispenserEmpty + requirements: # Frontier + MatterBin: 1 # Frontier + stackRequirements: + Steel: 5 + tagRequirements: + GlassBeaker: + amount: 1 + defaultPrototype: Beaker diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml new file mode 100644 index 00000000000..5d236032593 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml @@ -0,0 +1,43 @@ +- type: entity + name: condiment cup dispenser + description: It holds little condiment cups. They claim to be recyled. + id: CondimentCupDispenser + parent: [BaseItem, PaperBin] + components: + - type: Sprite + sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi + state: dispenser0 + - type: ItemMapper + sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi + mapLayers: + dispenser1: + whitelist: + components: + - CondimentCup + - type: Bin + whitelist: + components: + - CondimentCup + +- type: entity + name: condiment cup dispenser + suffix: 10 + description: It holds little condiment cups. They claim to be recyled. + id: CondimentCupDispenser10 + parent: CondimentCupDispenser + components: + - type: Bin + initialContents: + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + whitelist: + components: + - CondimentCup diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml new file mode 100644 index 00000000000..f0b25439ebb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml @@ -0,0 +1,36 @@ +- type: entity + parent: ReagentDispenserBase + id: CondimentDispenser + name: condiment dispenser + suffix: Filled + description: A condiment dispenser with a single slot for a condiment cup. + components: + - type: Rotatable + - type: Sprite + sprite: _NF/Structures/smalldispensers.rsi + drawdepth: SmallObjects + state: icon + - type: ReagentDispenser + storageWhitelist: + tags: + - DrinkBottle + pack: CondimentDispenserInventory + - type: Transform + noRot: false + - type: Machine + board: CondimentDispenserCircuitboard + - type: GuideHelp + guides: + - Bartender + - Drinks + +- type: entity + id: CondimentDispenserEmpty + suffix: Empty + parent: CondimentDispenser + components: + - type: ReagentDispenser + storageWhitelist: + tags: + - DrinkBottle + pack: EmptyInventory diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index ae15f942792..9a8a5e67723 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -134,6 +134,8 @@ - FoodPlateSmallPlastic - NapkinDrum - Napkin + - CondimentCupDispenser + - CondimentCup - FoodCondimentSqueezeBottleClear ## EVA - ClothingOuterEVASuitHydro diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index 96cd0950d1c..4de8b2c445e 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -46,6 +46,14 @@ Steel: 800 Glass: 900 +- type: latheRecipe + parent: BaseCircuitboardRecipe + id: CondimentDispenserCircuitboard + result: CondimentDispenserCircuitboard + materials: + Steel: 100 + Glass: 500 + # Thrusters - type: latheRecipe id: ThrusterSecurityMachineCircuitboard @@ -105,4 +113,4 @@ result: PortableGeneratorHyperPacmanMachineCircuitboard materials: Steel: 350 - Glass: 350 \ No newline at end of file + Glass: 350 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml index 853acc01279..0d693561ceb 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml @@ -58,6 +58,21 @@ Plastic: 100 Steel: 100 +- type: latheRecipe + id: CondimentCupDispenser + result: CondimentCupDispenser + parent: BaseServiceItemsRecipe + applyMaterialDiscount: false + +- type: latheRecipe + id: CondimentCup + result: CondimentCup + parent: BaseServiceItemsRecipe + completetime: 0.1 + applyMaterialDiscount: false + materials: + Steel: 10 + - type: latheRecipe id: FoodCondimentSqueezeBottleClear result: FoodCondimentSqueezeBottleClear diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index e22609d87a2..1a7e9b6ff15 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -152,4 +152,4 @@ id: NFVGRoidInterior - type: Tag - id: NFFoamRPG \ No newline at end of file + id: NFFoamRPG diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..c2b156524af5f99df7b26f5b5fb37680fb51b66c GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|{&~7MhE&XX zd+TCvvw?u?Mf26V3_FFz9XJDYN*bgWF+Wdc4O*l!X>XX?0o(Z=GmclZu=KQKZ=N;z z*S_#UiX5^aB-Uhndn6y!Cncv|F5-M?4ZZsyq?TOr`|)+p48 zqs#E#(-on27;nE@KIL2ScG;QBR<2s?)$@49(*1qaXSV2cPc3sOd~n?Cx65t&&sxrz zj6mlxFocJEwfb|`?wjii9gT)^hJ29&)(z%d4`dHWvwq-vuyzMS`tOe)UdukPkIHe| z{Ps(Qdq!ZxX?tcqb9sfm^940xUr+eV7_?im@$gx8kN4>;S-Zfdf{7gs(jHPl0yp2T Q`wQZGy85}Sb4q9e0OUx900000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0d9a9acb6928f0ee5e7b3c62ce250ba596729525 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^F3W0Ln2z= zUOvcsSV4g0fbSHh3#J7^vH=XL0lKXL%)AO#1#%Z%Tb?}pYHqF{edEn5mWJYUJL}7n z>rYt9f0J?g5w(76P<4=e^bXc;4hDzNi`B;^n)M3Pxn@|ZGwfmR6-}Cxx2vx%^|FU% z?5snNa~flNK0e;NwJcM9)d9I(LV_!_V%w}*mQG===>09uoyMnF%X?kP`Wu(k^Et%~ aA6Qg5^(DEI4u1eTmBG{1&t;ucLK6VH08&%{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json new file mode 100644 index 00000000000..e53406df8f1 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "equipped-HELMET, icon by wallflowerghost(discord), edited by dvir001 (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png new file mode 100644 index 0000000000000000000000000000000000000000..e570dc439c889d8892ffb5f6b86bacbae278885f GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4&D_gC^*;C z#W5tJ_3h+?yv&L`Earh+4kiw~B9F2(8<}1(oa9xodJy-lcsj>#>GRwRkM7=P@W7() z@gHmb)5=Ow{@<61lyY_+{d?{>XeFTA1O0nTSdNhhsEXLn80|unV{L yJ_g#taDa8q8`DR3COo|ibSPhHglC$sFM}444RSaLTne5HqC8#wT-G@yGywpPH(wF} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..589dcf55b36c1f8c89a815c203c86ba7c0b0b9bb GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY-_ zFKlFFFyLTvyiuRAsXFVdQ&MBb@0NIlwz5oCK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json new file mode 100644 index 00000000000..90542ff7b90 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "icon-0/1 by wallflowerghost(discord)", + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d594488b7a9bb33c39fb1da076394b11b35c28 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}FFjoxLn2y} z6C_v{Cy4Zv9Pn6oY`6ctzwz5s^_hXdc|yN&^QInw$h3(|Gf)0v{(n9HPM1_`Z+&OFH@$BEXNAV`3j>_wVgoGPAi`AXOy;TqIb6ze10(0J+k$83{{?GyieRp|w10Z;F zv%KTs9aoPD|9^jOj!E|DXUb|0WS{V+;mZyNH)-u+osCJF&r@4ve{@mo@`c(9#kb#+*`S85j zc8PPbdyX9df)76N-7(1?{Y~rR?Ix?bo3a}K!Jogs*^h1liWnRG`|sQr_{5zNr0>4{ zlgKU}55C4lYa-lAMO}Fc%gXrLfSgI*&YQX)9Xpq)(dt)QDRwihw<*wo%k7|s#7zc< YKFy%}bJ^#m0|SV`)78&qol`;+0IeU2)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json new file mode 100644 index 00000000000..6c27c69df8f --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by dustylens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dispenser0" + }, + { + "name": "dispenser1" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png b/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..de1dfe52b9ceb79092390a7dfa90ef0cbed31e98 GIT binary patch literal 804 zcmV+<1Ka$GP)Px%-bqA3R9J=Wlut+$VHn1LV?rn%I)t`p6m<$ef?Rg`b5bfRq&;+yh~17B9+ob3 z5MuS>K`-G=K}dJOTZf_TP(~wo5XVErhKF32z}9t?Fqa&Z*y%8ToN;%dV6)3U@G(2T zeZG00nR(xVnriyblFC8TG)>naNm8}BS9KMWRoGB1{zvlO!N1^8;T1UhD)_3!D+joF zuEC64Jqv)Y>%7hE@^00TIy*bf-rio9tE!5ss?s2s@kqqloJ=wV41#q1(Npum^AX#> z#q9V9@5e`dHA{M6U|_&atn2z;agxaj{w*JOR>>1cBob!Cxf3AixnQ-pqvhpghKGlx zvQyA~z7c@@^b_V^^fMjr1E8y`3xG@}!|d!VlarGG4B3qyiAHIQM#)5@0Ni-|41l%v z+sqkFyqy2U*w`2V>2w-^`opPYS*C8U2*AqseE@d$ipa7|v1svZHVZ(ZP(YStF4_B4 z`v zS=>+*rkb0XYHnr}$O1wLesr{vGPg;Y+r-T@4HugbLLh`7oldj9zFt0nD^KG%@5_3= zAIfs?WO(@^Yd-ER4xTAUBoY{BE6<`(E4uxp!3DFtv2Oz61@^x;B-IPWw7W0L112~2qsQM84%>!((lc*d-j?4lnShc2LI~%F%TD_2<+ Date: Sat, 4 Jan 2025 20:33:23 +0000 Subject: [PATCH 2/4] Automatic Changelog (#2637) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index e936661ccc9..8a37c6bfa0b 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6230,3 +6230,9 @@ Entries: message: Adds clear condiment bottle and lathe recipe. id: 5629 time: '2025-01-04T16:53:52.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Condiment dispenser. + id: 5630 + time: '2025-01-04T20:32:57.0000000+00:00' From de59bb6b6de8831f0972c838c779f9f08420a162 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 4 Jan 2025 23:23:37 +0000 Subject: [PATCH 3/4] Adds colored light bulbs (#2636) * Adds colored light bulbs * Strobes with fills update. * It turns out I didn't need this. Whoops. * Un mess * My bad * Line cuts * Migration * Update general.yml * Update migration.yml * Update migration.yml * Fix * Cleanup * Update lathe.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Spawners/Random/Salvage/tables_loot.yml | 2 + .../Entities/Structures/Machines/lathe.yml | 2 + .../Catalog/Fills/Boxes/general.yml | 29 ---- .../Catalog/Fills/Cargo/cargo_service.yml | 9 - .../Catalog/Fills/Crates/service.yml | 9 - .../Entities/Objects/Power/lights.yml | 50 ------ .../Objects/Specific/Power/lights.yml | 17 -- .../Structures/Lighting/base_lighting.yml | 8 - .../Structures/Lighting/colored_lighting.yml | 42 ----- .../_NF/Catalog/Cargo/cargo_service.yml | 10 ++ .../_NF/Catalog/Fills/Boxes/general.yml | 65 ++++++++ .../_NF/Catalog/Fills/Crates/service.yml | 10 ++ .../_NF/Entities/Objects/Power/lights.yml | 155 ++++++++++++++++++ .../Structures/Lighting/base_lighting.yml | 7 + .../Structures/Lighting/ground_lighting.yml | 11 ++ .../Structures/Lighting/strobe_lighting.yml | 113 +++++++++++++ .../Entities/Structures/Machines/lathe.yml | 14 +- .../Graphs/utilities/lighting.yml | 120 ++++++++++++++ .../_NF/Recipes/Construction/lighting.yml | 65 ++++++++ .../Prototypes/_NF/Recipes/Lathes/misc.yml | 16 +- .../Prototypes/_NF/Recipes/Lathes/service.yml | 18 ++ Resources/_NF/migration.yml | 10 ++ 22 files changed, 601 insertions(+), 181 deletions(-) delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/lighting.yml diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 71eda92b8e4..89376c39294 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -196,6 +196,8 @@ - id: BoxInflatable # Frontier - id: BoxLighttube # Frontier - id: BoxLightbulb # Frontier + - id: BoxColoredLighttube # Frontier + - id: BoxColoredLightbulb # Frontier - type: entityTable id: SalvageEquipmentUncommon diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8af06f49954..4d2afe193da 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -157,6 +157,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb # Frontier + - ExteriorLightBulb #Frontier - Bucket - DrinkMug - DrinkMugMetal diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml deleted file mode 100644 index 15b74b7451d..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml +++ /dev/null @@ -1,29 +0,0 @@ -- 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: ColoredLightTubeRed - amount: 4 - - id: ColoredLightTubeFrostyBlue - amount: 4 - - id: ColoredLightTubeBlackLight - amount: 4 - - type: Sprite - layers: - - state: box - - state: lighttube - - type: Storage - maxItemSize: Small - grid: - - 0,0,5,3 - whitelist: - components: - - LightBulb - - type: Tag - tags: - - DroneUsable - \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml deleted file mode 100644 index 55c28222bd7..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: ServiceColoredLightsReplacement - icon: - sprite: Objects/Power/light_bulb.rsi - state: normal - product: CrateServiceReplacementColoredLights - cost: 600 - category: Service - group: market diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml deleted file mode 100644 index eda100a8755..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - id: CrateServiceReplacementColoredLights - name: Colored Lights Crate - parent: CrateGenericSteel - components: - - type: StorageFill - contents: - - id: BoxColoredLighttube - amount: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml deleted file mode 100644 index a5910a81c80..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml +++ /dev/null @@ -1,50 +0,0 @@ -- type: entity - parent: BaseLightbulb - name: red light tube - description: A colorful light tube. These emit a red hue. - id: ColoredLightTubeRed - components: - - type: LightBulb - bulb: Tube - color: "#FF6666" - lightEnergy: 0.8 - lightRadius: 10 - lightSoftness: 0.5 - PowerUse: 25 - - type: Sprite - sprite: Objects/Power/light_tube.rsi - state: normal - -- type: entity - parent: BaseLightbulb - name: blue light tube - description: A colorful light tube. These emit a frosty blue hue. - id: ColoredLightTubeFrostyBlue - components: - - type: LightBulb - bulb: Tube - color: "#00FFFF" - lightEnergy: 0.8 - lightRadius: 10 - lightSoftness: 1 - PowerUse: 25 - - type: Sprite - sprite: Objects/Power/light_tube.rsi - state: normal - -- type: entity - parent: BaseLightbulb - name: black light tube - description: A colorful light tube. These emit "black light". - id: ColoredLightTubeBlackLight - components: - - type: LightBulb - bulb: Tube - color: "#5D0CED" - lightEnergy: 0.8 - lightRadius: 10 - lightSoftness: 1 - PowerUse: 25 - - type: Sprite - sprite: Objects/Power/light_tube.rsi - state: normal diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml deleted file mode 100644 index e984f148e55..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: BaseLightbulb - name: blue light tube - description: A medium power high energy bulb that reminds you of space. May contain mercury. - id: BlueLightTube - components: - - type: LightBulb - bulb: Tube - color: "#B4FCF0" - lightEnergy: 3 - lightRadius: 12 - lightSoftness: 0.5 - BurningTemperature: 350 - PowerUse: 75 - - type: Sprite - sprite: Objects/Power/light_tube.rsi - state: normal diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml deleted file mode 100644 index 3b9627cede8..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: entity - parent: PoweredlightExterior - id: PoweredlightBlueInterior - suffix: Blue Interior - description: "A light fixture. Draws power and produces light when equipped with a light tube." - components: - - type: PoweredLight - hasLampOnSpawn: BlueLightTube diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml deleted file mode 100644 index 95d2e02204a..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml +++ /dev/null @@ -1,42 +0,0 @@ -#Colored lights - -- type: entity - id: PoweredlightColoredRed - description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Red - parent: Poweredlight - components: - - type: PoweredLight - hasLampOnSpawn: ColoredLightTubeRed - -- type: entity - id: PoweredlightColoredFrostyBlue - description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Frosty - parent: Poweredlight - components: - - type: PoweredLight - hasLampOnSpawn: ColoredLightTubeFrostyBlue - -- type: entity - id: PoweredlightColoredBlack - description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Black - parent: Poweredlight - components: - - type: PoweredLight - hasLampOnSpawn: ColoredLightTubeBlackLight - -- type: entity - id: PoweredLightPostSmallRed - name: post light - description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Red - parent: PoweredLightPostSmallEmpty - components: - - type: Sprite - layers: - - state: base - map: [ "enum.PoweredLightLayers.Base" ] - - type: PoweredLight - hasLampOnSpawn: ColoredLightTubeRed diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml index d471a927a03..0dbecc70f0e 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index d738dec2d9e..2a0d10e04cb 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml index 51c472147f9..b083029342c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml b/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml new file mode 100644 index 00000000000..af3222d17b5 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml @@ -0,0 +1,155 @@ +- type: entity + parent: BaseLightTube + name: black crystal light tube + id: LightTubeCrystalBlack + description: A high power high energy bulb which has a small colored crystal inside. + components: + - type: LightBulb + color: "#5D0CED" + lightEnergy: 3 + lightRadius: 8 + lightSoftness: 0.5 + BurningTemperature: 350 + PowerUse: 60 + - type: ToolRefinable + refineResult: + - id: SheetGlass1 +# - id: ShardCrystalBlack + +- type: entity + parent: LightBulb + name: cyan crystal light bulb + id: LightBulbCrystalCyan + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#47f8ff" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: CyanLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalCyan + +- type: entity + parent: LightBulb + name: blue crystal light bulb + id: LightBulbCrystalBlue + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#39a1ff" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: BlueLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalBlue + +- type: entity + parent: LightBulb + name: pink crystal light bulb + id: LightBulbCrystalPink + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#ff66cc" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: PinkLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalPink + +- type: entity + parent: LightBulb + name: orange crystal light bulb + id: LightBulbCrystalOrange + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#ff8227" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: OrangeLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalOrange + +- type: entity + parent: LightBulb + name: red crystal light bulb + id: LightBulbCrystalRed + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#fb4747" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: RedLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalRed + +- type: entity + parent: LightBulb + name: green crystal light bulb + id: LightBulbCrystalGreen + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#52ff39" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: GreenLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalGreen + +- type: entity + parent: LightBulb + name: sodium light bulb + id: SodiumLightBulb + description: A harsh lightbulb that both alarms and depresses you. + components: + - type: LightBulb + color: "#FFAF38" + lightEnergy: 4 + lightRadius: 8 + lightSoftness: 0.7 + +- type: entity + parent: LightBulb + name: exterior light bulb + id: ExteriorLightBulb + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#B4FCF0" + lightEnergy: 4.5 + lightRadius: 8 + lightSoftness: 0.7 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml new file mode 100644 index 00000000000..83a448b9683 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml @@ -0,0 +1,7 @@ +- type: entity + id: PoweredlightBlack + suffix: Black + parent: Poweredlight + components: + - type: PoweredLight + hasLampOnSpawn: LightTubeCrystalBlack diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml new file mode 100644 index 00000000000..cdf5befc804 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml @@ -0,0 +1,11 @@ +- type: entity + id: PoweredLightPostSmallRed + suffix: Red + parent: PoweredLightPostSmall + components: + - type: Sprite + layers: + - state: base + map: [ "enum.PoweredLightLayers.Base" ] + - type: PoweredLight + hasLampOnSpawn: PoweredlightRed diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml new file mode 100644 index 00000000000..b1cbfb866df --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml @@ -0,0 +1,113 @@ +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeIncandescent + suffix: Incandescent + components: + - type: PointLight + enabled: true + color: "#FFD1A3" # 4000K color temp + energy: 1.0 + radius: 6 + softness: 1.1 + - type: PoweredLight + hasLampOnSpawn: LightBulb + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeLed + suffix: LED + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LedLightBulb + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeService + suffix: Service + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: ServiceLightBulb + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeSodium + suffix: Sodium + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: SodiumLightBulb + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeExterior + suffix: Exterior + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: ExteriorLightBulb + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeCyan + suffix: Cyan + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalCyan + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeBlue + suffix: Blue + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalBlue + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobePink + suffix: Pink + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalPink + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeOrange + suffix: Orange + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalOrange + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeRed + suffix: Red + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalRed + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeGreen + suffix: Green + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalGreen diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 9a8a5e67723..1bdfeedf63a 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -76,6 +76,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb + - ExteriorLightBulb - ConveyorBeltAssembly - PowerCellSmall - PowerCellMedium @@ -238,6 +240,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb + - ExteriorLightBulb - ConveyorBeltAssembly - PowerCellSmall - PowerCellMedium @@ -395,6 +399,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb + - ExteriorLightBulb - ConveyorBeltAssembly - PowerCellSmall - PowerCellMedium @@ -646,6 +652,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb + - ExteriorLightBulb - ConveyorBeltAssembly - PowerCellSmall - PowerCellMedium @@ -863,6 +871,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb + - ExteriorLightBulb - ConveyorBeltAssembly - PowerCellSmall - PowerCellMedium @@ -873,10 +883,6 @@ - WeaponCapacitorRechargerCircuitboard - AirTank # Mercenary techfab - ## Utility - - ColoredLightTubeRedNF - - ColoredLightTubeBlackLightNF - - ColoredLightTubeFrostyBlueNF ## Clothing / Armor - RiotShield - ClothingHandsMercenaryGlovesCombat diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml new file mode 100644 index 00000000000..8deb0b4871f --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml @@ -0,0 +1,120 @@ +- 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: 2 + 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: 2 + 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: 2 + 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: 2 + 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: 2 + 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/_NF/Recipes/Construction/lighting.yml b/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml new file mode 100644 index 00000000000..74d4c74f130 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml @@ -0,0 +1,65 @@ +- type: construction + name: cyan light bulb + id: CyanLightBulb + graph: CyanLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube 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 tube 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 tube 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 tube 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 tube 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 tube containing a green crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml index ab7e9f825a5..8aeedcd6908 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml @@ -132,19 +132,9 @@ result: ClothingNeckIFFPurple parent: NFWearableIFFRecipe -- type: latheRecipe - id: ColoredLightTubeRedNF - result: ColoredLightTubeRed - parent: NFBaseLightTubeRecipe - -- type: latheRecipe - id: ColoredLightTubeBlackLightNF - result: ColoredLightTubeBlackLight - parent: NFBaseLightTubeRecipe - -- type: latheRecipe - id: ColoredLightTubeFrostyBlueNF - result: ColoredLightTubeFrostyBlue +- type: latheRecipe # Remove this ones we have a black crystal + id: LightTubeCrystalBlack + result: LightTubeCrystalBlack parent: NFBaseLightTubeRecipe - type: latheRecipe diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml index 0d693561ceb..16738728adf 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml @@ -80,3 +80,21 @@ applyMaterialDiscount: false materials: Plastic: 50 + +- type: latheRecipe + id: SodiumLightBulb + result: SodiumLightBulb + category: Lights + completetime: 2 + materials: + Steel: 50 + Glass: 50 + +- type: latheRecipe + id: ExteriorLightBulb + result: ExteriorLightBulb + category: Lights + completetime: 2 + materials: + Steel: 50 + Glass: 50 diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml index b64ad3579c4..f17c5ceb6af 100644 --- a/Resources/_NF/migration.yml +++ b/Resources/_NF/migration.yml @@ -181,3 +181,13 @@ CrateSpaceCleaner: ChemicalBarrelSpaceCleaner ScienceTechFab: UnfinishedMachineFrame ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard ScienceTechFabFlatpack: ProtolatheFlatpack + +# 2025-01-05 Lights +ColoredLightTubeRed: LightTubeCrystalRed +ColoredBlueLightTube: LightTubeCrystalBlue +ColoredLightTubeCyan: LightTubeCrystalCyan +ColoredLightTubeBlackLight: PoweredlightBlack +PoweredlightColoredRed: PoweredlightRed +PoweredlightBlueInterior: PoweredlightBlue +PoweredlightColoredFrostyBlue: PoweredlightCyan +PoweredlightColoredBlack: LightTubeCrystalBlack From 78a49332c1f5fbae4c4c4c30a4511439daa03612 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 4 Jan 2025 23:24:07 +0000 Subject: [PATCH 4/4] Automatic Changelog (#2636) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 8a37c6bfa0b..3f2423429e8 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6236,3 +6236,9 @@ Entries: message: Condiment dispenser. id: 5630 time: '2025-01-04T20:32:57.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Colored craftable lightbulbs and prefilled light strobes.! + id: 5631 + time: '2025-01-04T23:23:37.0000000+00:00'