From 2a00f251678813a0bcdbd42942941e68f11155b2 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 8 Mar 2024 18:46:21 +0200 Subject: [PATCH 01/11] Juice --- .../Components/ReagentGrinderComponent.cs | 6 ++++ .../EntitySystems/ReagentGrinderSystem.cs | 9 ++++++ .../Components/ExtractableComponent.cs | 8 ++++- .../components/reagent-grinder-component.ftl | 4 +++ .../Xenoarchaeology/item_artifacts.yml | 1 + .../Structures/Machines/reagent_grinder.yml | 28 ++++++++++++++++++ .../Machines/advancedjuicer.rsi/juicer0.png | Bin 0 -> 579 bytes .../Machines/advancedjuicer.rsi/juicer1.png | Bin 0 -> 598 bytes .../Machines/advancedjuicer.rsi/meta.json | 1 + 9 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/en-US/_NF/kitchen/components/reagent-grinder-component.ftl create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml create mode 100644 Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/juicer0.png create mode 100644 Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/juicer1.png create mode 100644 Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/meta.json diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs index 2a028a85805..0cd152dca95 100644 --- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs +++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs @@ -49,6 +49,12 @@ public sealed partial class ReagentGrinderComponent : Component public SoundSpecifier JuiceSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/juicer.ogg"); public EntityUid? AudioStream; + + /// + /// Frontier - Tier 2 reagent grinder + /// + [DataField("advanced")] + public bool Advanced; } [Access(typeof(ReagentGrinderSystem)), RegisterComponent] diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs index e309c3bd374..1381dc48864 100644 --- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs @@ -81,6 +81,15 @@ public override void Update(float frameTime) foreach (var item in inputContainer.ContainedEntities.ToList()) { + // Frontier code for regent grinder tier 2 - Start + TryComp(item, out var extractable); + if (!reagentGrinder.Advanced && extractable!.Advanced) + { + _popupSystem.PopupEntity(Loc.GetString("advanced-reagent-grinder-component-cannot-grind-entity-message"), uid, PopupType.MediumCaution); + continue; + } + // Frontier code for regent grinder tier 2 - End + var solution = active.Program switch { GrinderProgram.Grind => GetGrindSolution(item), diff --git a/Content.Shared/Kitchen/Components/ExtractableComponent.cs b/Content.Shared/Kitchen/Components/ExtractableComponent.cs index bff21662801..1f91633958d 100644 --- a/Content.Shared/Kitchen/Components/ExtractableComponent.cs +++ b/Content.Shared/Kitchen/Components/ExtractableComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Chemistry.Components; +using Content.Shared.Chemistry.Components; using Robust.Shared.GameStates; namespace Content.Shared.Kitchen.Components; @@ -14,4 +14,10 @@ public sealed partial class ExtractableComponent : Component [DataField("grindableSolutionName")] public string? GrindableSolution; + + /// + /// Frontier - Tier 2 reagent grinder required + /// + [DataField("advanced")] + public bool Advanced; }; diff --git a/Resources/Locale/en-US/_NF/kitchen/components/reagent-grinder-component.ftl b/Resources/Locale/en-US/_NF/kitchen/components/reagent-grinder-component.ftl new file mode 100644 index 00000000000..9d16852ddb8 --- /dev/null +++ b/Resources/Locale/en-US/_NF/kitchen/components/reagent-grinder-component.ftl @@ -0,0 +1,4 @@ +## UI +advanced-reagent-grinder-component-cannot-grind-entity-message = The item is too dense to be grinded, try a stronger grinder. + +advanced-grinder-menu-title = All-In-One Grinder 6000 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml index e5f7a5ec3e4..83aee3916f1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml @@ -158,6 +158,7 @@ reagents: - ReagentId: Artifexium Quantity: 10 + advanced: true # Frontier - type: StaticPrice price: 0 - type: Stack diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml new file mode 100644 index 00000000000..ddea3bf84d1 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml @@ -0,0 +1,28 @@ +- type: entity + id: AdvancedReagentGrinder + parent: KitchenReagentGrinder + name: advanced reagent grinder + description: The new advanced grinder from BlenderTech. Will It Blend? Let's find out! + suffix: grinder/juicer + components: + - type: Sprite + sprite: _NF/Structures/Machines/advancedjuicer.rsi + drawdepth: SmallObjects + snapCardinals: true + offset: "0.0,0.4" + layers: + - map: [ "grinder" ] + state: "juicer0" + - type: ApcPowerReceiver + powerLoad: 600 + - type: ItemSlots + slots: + beakerSlot: + whitelist: + components: + - FitsInDispenser + - type: Machine +# board: AdvancedReagentGrinderMachineCircuitboard + board: ReagentGrinderMachineCircuitboard + - type: ReagentGrinder + advanced: true diff --git a/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/juicer0.png b/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/juicer0.png new file mode 100644 index 0000000000000000000000000000000000000000..ea33f756608eb3eae9f6bb3e4d1193eca6dfda6a GIT binary patch literal 579 zcmV-J0=)f+P)`rh`QEVPEde6W-8%kRkV;d%lm8d%hg_j~B+Pst1!K$#1PcJUnRSd|g#Qnx;x? zWq4DCJV}y#Hk%=YpjN8^a5x;uvWz52a-Aw@mCN(IywPaT?REih90$v?0FY9$SS$e8 zZny0Bd#2NAX?|q^p6BJh?=u(-Xti22o6VbXX_^wpF-2^d2<=Z0hT)U@aU7S%R1y$| zA+~L^TrQDP{*^>Z34m?etk>((yjpi)KA-0R$K&zIIKwai7>!1y`L)_GilQ^Y``^F# z_~jFZVO%}C-Hs@V&aq|CHloR7lDFG!K71bWWBQe!Z{J;!Wm$%lk{}3_a#!*JfbZYt zz^N)(mYvsy5C|a%fq&U00hN?o5iSGoNP+@%7~!CeKIruni0 z#^W)b=PC7n0qudLUa#NufX7`Bh9Rrf>V5+WoZPM7?_ZI_$p?zbsDSGKKv_UB1v`$T z6km*IW%HqO8~VO~l~^^t3|bRWr_)hRT%5U^fMV3rfyx=}OQ;jC>x%y-{s4gI=!-D@ RcO(D+002ovPDHLkV1j8x51jx2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/juicer1.png b/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/juicer1.png new file mode 100644 index 0000000000000000000000000000000000000000..e588271229d6aae3d44afdf643c99c239959e6fd GIT binary patch literal 598 zcmV-c0;&CpP)E~=C5j?~Ac*t0kjpO9G~-&WMyJyOz%UFnO#?tm z$z(DCV6|GY*=!h%Mw$7Q1(>E8+qO-=->2DZQm@yK^1?90_k9v>mWbT1z;)dlpZmU_ z$tfhjbzO8_XF8oCrTlFXDJ1~9uCrV&GxO%^0n4&tfZc9)Bd=U8127m2GV|y93_Z`= z7x-TPg8k}}a=Dzk*6TH%=k2*!$UTUL!(rTNwV1se@btqa52MGaVo?+!rNnU@rQC() z0Kmmt3;5|u6h-@UAp}AQ9LG`0Q+N^{7Eg)_A@d_hS=wguKew$e=7K_aMxth?nZF;?4 zsyJN#f@fBWt2!5y9Z0rd!!VTi$$FNxA1XUw+jc6kDnARkHllXBt(-WCIhlYWvtA`8 k*H@tWi%p=ql>FQH0mbIyGhrLwlmGw#07*qoM6N<$f Date: Fri, 8 Mar 2024 20:14:06 +0200 Subject: [PATCH 02/11] THICK --- .../Machines/advancedjuicer.rsi/juicer0.png | Bin 579 -> 633 bytes .../Machines/advancedjuicer.rsi/juicer1.png | Bin 598 -> 672 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/juicer0.png b/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/juicer0.png index ea33f756608eb3eae9f6bb3e4d1193eca6dfda6a..70723dee888f47d43f5213b2ecc87d767167a076 100644 GIT binary patch delta 609 zcmV-n0-pWD1o;GzBYyw^b5ch_0Itp)=>Px%8A(JzR9J=WRzK_7Kp1{nI%RPvQn^fm zOT~~$DflJag<#zsq*KK)T&I2oD{gN24iYGF3U}BgaFc-|U0u^bF8pHeE-}Bf9olER zKkxfI_ujqly}*C`WxS|scsiXj)qKC-f5_*{x&o3UsWexHN`Go8rTJ;&IED}c-EJ3z z5VYHE0KnyPL7Jxdn(Mj%fYoYcTEn(w7Rxj>vUgqwyoqbyQjbPpexK(D^HUgiQ&kQWgJA`~)q< v@w~tqK9B$a01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjfxE~S> delta 555 zcmV+`0@VHa1j7W7BYy%4Nkl`rh`QEVPEde6W-8%kRkV;d%lm8d%hg_ zj~B+Pst1!K$#1PcJUnRSd|g#Qnx;x?Wq4DCJV}y#Hk%=Ypnq1Y0dP1R$g+$iNphVk zXqC(Jyu8t9(Cu~sa2yBAvH*}$vREtt*lxG%_j{((X=#3C0iNgOzV9;_3~04lG@H$v zacP0Dl;bMy2_++AxZuGr{}czxep&6NX`2J-gkGD2mRpWzaUF$z+nZ+igC4 z9`R%Pm7j0lU6Ey3hLn;Z2$XVH@&SPF-{!!nDp{7D*M$%WAqav%DNki5yd*D3g%Ibx zUaxo4svo0r1un^ft119kmZemM$^tI2*=#DGy^8?LvVRy3hv)Y=j+JZ}o_PlfNGWk$ zSDPH}Q~?0fG;v*5x%~>x%y-{s4gI=!-D@cO(D+002ovPDHLkV1m}s4z2(I diff --git a/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/juicer1.png b/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/juicer1.png index e588271229d6aae3d44afdf643c99c239959e6fd..0edf996832f533176b7562fd8707b2b261fff225 100644 GIT binary patch delta 649 zcmV;40(Sk@1fT_wBYyw^b5ch_0Itp)=>Px%KuJVFR9J=WS21hbKotI5Iuy~>U`|jl zxQnq66f7t%856n$FI_SSS92GyhSKeRL1)!?FqkePOG(GLrdWo8knoTS4hq)dHJEPd z5Kc|pyOXR4I<()WyZ7Gr>D{}hC*VK+GHPWV*XwmET5q@82Y$;9^w+jGRtyb9{V=N=% z&j2!V?x*W|y4h@`LZs>_rK#t6==b~RbUJ9YS}LtV#Bq!$iooNDL?|-=+@!oLqA1Gs zmkJ1i0Jd#oGJlzXF;+?lKNj1zF`v(cHp&8VT{i`Q-EMaWoiKDdR+!!XRX$-Rcd;V?A}1Jl-zVtkB z8}F{}7GP2G$^`7=)Ana!+scoC*T6^ou7T?-`4v^RVoGV+Xf*y<7xjRrXO1+^_o<87 zY<74f@_#%Jyl0kZ_{{U3{Z=>Px#4rN$L jW=%~1DgXcg2mk;800000(o>TF0000S;D1=a+RBYy%NNkl((=_8+twyKQ0l+W}G))6QO37q00bsRSvDs`GjYgUIl?9ll8QZo^zu%|X zY*Me+kMhDW#P@v?ZkCALufTQP8=w2WpUEjCz;#`8U1vI-BBlIo5h*1Ax~{WaE;IAy z>H*8LVu0OlcYhXLG~oVwQQHJ<0~xmn0Ph=#*q z+-kL$y&UlL!zB-+$Ejjb6d|R=aU7-Gh2{Xj#aj#b=}Htu`*R@#LI@nkQOZ+z5*`*$ ziV7k2&$`|2(NX;?3OjIE97wqUplO`xobDJWz}~i35iso>%VWiaCh`Z@xy^q(3R(HaMw(tIwZ!cioIvimv2d zNUGK9(HZdQVvyo~n^`Oti_HAFn$Wgwdc9t%I9&gNXI6@FQH0mbIyGhrLwlmGw# M07*qoM6N<$f(1Dl9smFU From 4e5af71065da437588a78f758b5a52b4a1fea8a5 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 9 Mar 2024 13:24:23 +0200 Subject: [PATCH 03/11] Tech --- .../Locale/en-US/_NF/research/technologies.ftl | 3 ++- .../Entities/Structures/Machines/lathe.yml | 17 ++++++++--------- .../Prototypes/Research/civilianservices.yml | 1 - .../_NF/Entities/Objects/Devices/production.yml | 17 +++++++++++++++++ .../Structures/Machines/reagent_grinder.yml | 16 ++-------------- .../_NF/Recipes/Lathes/electronics.yml | 9 +++++++++ .../_NF/Research/civilianservices.yml | 17 +++++++++++++++++ 7 files changed, 55 insertions(+), 25 deletions(-) diff --git a/Resources/Locale/en-US/_NF/research/technologies.ftl b/Resources/Locale/en-US/_NF/research/technologies.ftl index 090b62aaa59..d9d22465910 100644 --- a/Resources/Locale/en-US/_NF/research/technologies.ftl +++ b/Resources/Locale/en-US/_NF/research/technologies.ftl @@ -1 +1,2 @@ -research-techology-advanced-personal-propulsion = Advanced Personal Propulsion \ No newline at end of file +research-techology-advanced-personal-propulsion = Advanced Personal Propulsion +research-technology-food-service-advanced = Advanced Food Service diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 57432e76112..e9fa9d83535 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -471,17 +471,16 @@ - SodaDispenserMachineCircuitboard - TelecomServerCircuitboard - MassMediaCircuitboard - # Begin Nyano additions - - DoorElectronics - - FireAlarmElectronics - - FirelockElectronics - - IntercomElectronics - - MailingUnitElectronics - - StationMapElectronics - - DeepFryerMachineCircuitboard - # End Nyano additions + - DoorElectronics # Nyano + - FireAlarmElectronics # Nyano + - FirelockElectronics # Nyano + - IntercomElectronics # Nyano + - MailingUnitElectronics # Nyano + - StationMapElectronics # Nyano + - DeepFryerMachineCircuitboard # Nyano - SmallThrusterMachineCircuitboard # Frontier - SmallGyroscopeMachineCircuitboard # Frontier + - AdvancedReagentGrinderMachineCircuitboard # Frontier - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index f2306a63ed4..5b66fa4703b 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -50,7 +50,6 @@ - ElectricGrillMachineCircuitboard - BoozeDispenserMachineCircuitboard - SodaDispenserMachineCircuitboard - - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board to service research. - type: technology id: AudioVisualCommunication diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index 5824d991440..7a028bfa378 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -67,3 +67,20 @@ Manipulator: 2 materialRequirements: Glass: 1 + +- type: entity + id: AdvancedReagentGrinderMachineCircuitboard + parent: BaseMachineCircuitboard + name: advanced reagent grinder machine board + description: A machine printed circuit board for a advanced reagent grinder. + components: + - type: MachineBoard + prototype: AdvancedReagentGrinder + requirements: + MatterBin: 2 + Manipulator: 2 + tagRequirements: + GlassBeaker: + Amount: 1 + DefaultPrototype: Beaker + ExamineName: Glass Beaker diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml index ddea3bf84d1..601bef83857 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml @@ -7,22 +7,10 @@ components: - type: Sprite sprite: _NF/Structures/Machines/advancedjuicer.rsi - drawdepth: SmallObjects - snapCardinals: true - offset: "0.0,0.4" - layers: - - map: [ "grinder" ] - state: "juicer0" - type: ApcPowerReceiver powerLoad: 600 - - type: ItemSlots - slots: - beakerSlot: - whitelist: - components: - - FitsInDispenser - type: Machine -# board: AdvancedReagentGrinderMachineCircuitboard - board: ReagentGrinderMachineCircuitboard + board: AdvancedReagentGrinderMachineCircuitboard - type: ReagentGrinder advanced: true + baseStorageMaxEntities: 6 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index 42b5ffdd168..5600ce6e587 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -37,3 +37,12 @@ materials: Steel: 700 Glass: 900 + +- type: latheRecipe + id: AdvancedReagentGrinderMachineCircuitboard + result: AdvancedReagentGrinderMachineCircuitboard + category: Circuitry + completetime: 4 + materials: + Steel: 400 + Glass: 900 diff --git a/Resources/Prototypes/_NF/Research/civilianservices.yml b/Resources/Prototypes/_NF/Research/civilianservices.yml index 2956fadfc81..565ef8ea9a0 100644 --- a/Resources/Prototypes/_NF/Research/civilianservices.yml +++ b/Resources/Prototypes/_NF/Research/civilianservices.yml @@ -1,3 +1,20 @@ +# Tier 2 + +- type: technology + id: AdvancedFoodService + name: research-technology-food-service-advanced + icon: + sprite: _NF/Structures/Machines/juicer.rsi + state: juicer1 + discipline: CivilianServices + tier: 2 + cost: 10000 + recipeUnlocks: #remove all of these once we have more kitchen equipment + - AdvancedReagentGrinderMachineCircuitboard + - DeepFryerMachineCircuitboard # Nyano - Summary: adds deep fryer circuit board to service research. + technologyPrerequisites: + - FoodService + # Tier 3 - type: technology From 7765753c275469d71bb70fa07aca430d5bb85a82 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 9 Mar 2024 13:39:53 +0200 Subject: [PATCH 04/11] Update meta.json --- .../_NF/Structures/Machines/advancedjuicer.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/meta.json index 6048f25646e..d865bf97494 100644 --- a/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/advancedjuicer.rsi/meta.json @@ -1 +1 @@ -{"license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d","version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "juicer0", "delays": [[1.0]]}, {"name": "juicer1", "delays": [[1.0]]}]} +{"license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, edited by GhostPrince on Frontier Discord","version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "juicer0", "delays": [[1.0]]}, {"name": "juicer1", "delays": [[1.0]]}]} From 036b69d09fa6af030f3a4dccb1a11d517ac01091 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 9 Mar 2024 13:44:41 +0200 Subject: [PATCH 05/11] Update civilianservices.yml --- Resources/Prototypes/_NF/Research/civilianservices.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Research/civilianservices.yml b/Resources/Prototypes/_NF/Research/civilianservices.yml index 565ef8ea9a0..e9d362665ea 100644 --- a/Resources/Prototypes/_NF/Research/civilianservices.yml +++ b/Resources/Prototypes/_NF/Research/civilianservices.yml @@ -4,7 +4,7 @@ id: AdvancedFoodService name: research-technology-food-service-advanced icon: - sprite: _NF/Structures/Machines/juicer.rsi + sprite: _NF/Structures/Machines/advancedjuicer.rsi state: juicer1 discipline: CivilianServices tier: 2 From 753effd4913651b7c4bcf93889ef31e2dfcf13bf Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 25 Mar 2024 23:26:24 +0200 Subject: [PATCH 06/11] Update production.yml --- .../_NF/Entities/Objects/Devices/production.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index da5b6457a48..62b3b394a98 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -68,15 +68,6 @@ materialRequirements: Glass: 1 -- type: entity - id: AdvancedReagentGrinderMachineCircuitboard - parent: BaseMachineCircuitboard - name: advanced reagent grinder machine board - description: A machine printed circuit board for a advanced reagent grinder. - components: - - type: MachineBoard - prototype: AdvancedReagentGrinder - - type: entity id: AdvancedReagentGrinderMachineCircuitboard parent: BaseMachineCircuitboard From f187e3dd1c21012557a756330baab8eac882b49e Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 27 Apr 2024 18:32:07 +0300 Subject: [PATCH 07/11] Update civilianservices.yml --- Resources/Prototypes/Research/civilianservices.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index feb5416c418..2336f1feb3b 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -51,6 +51,7 @@ - ElectricGrillMachineCircuitboard - BoozeDispenserMachineCircuitboard - SodaDispenserMachineCircuitboard + - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board to service research. - type: technology id: AudioVisualCommunication From a37c8b9dfda61dbeb5e3c642e9d0658529fbf398 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 27 Apr 2024 18:32:51 +0300 Subject: [PATCH 08/11] Update electronics.yml --- Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index 42fdcbb2ddc..d4ae9e008eb 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -14,15 +14,6 @@ Steel: 700 Glass: 900 -- type: latheRecipe - id: AdvancedReagentGrinderMachineCircuitboard - result: AdvancedReagentGrinderMachineCircuitboard - category: Circuitry - completetime: 4 - materials: - Steel: 400 - Glass: 900 - - type: latheRecipe id: SalvageTechFabCircuitboardNF result: SalvageTechFabCircuitboardNF From d336da215bb97a8808a952f7707077ef18737241 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 27 Apr 2024 18:33:19 +0300 Subject: [PATCH 09/11] Delete Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml --- .../Structures/Machines/reagent_grinder.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml deleted file mode 100644 index 601bef83857..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - id: AdvancedReagentGrinder - parent: KitchenReagentGrinder - name: advanced reagent grinder - description: The new advanced grinder from BlenderTech. Will It Blend? Let's find out! - suffix: grinder/juicer - components: - - type: Sprite - sprite: _NF/Structures/Machines/advancedjuicer.rsi - - type: ApcPowerReceiver - powerLoad: 600 - - type: Machine - board: AdvancedReagentGrinderMachineCircuitboard - - type: ReagentGrinder - advanced: true - baseStorageMaxEntities: 6 From 57fedb394f083b69209198facf3fc5541d5ca3f9 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 27 Apr 2024 18:35:33 +0300 Subject: [PATCH 10/11] Update civilianservices.yml --- .../_NF/Research/civilianservices.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Resources/Prototypes/_NF/Research/civilianservices.yml b/Resources/Prototypes/_NF/Research/civilianservices.yml index e9d362665ea..2956fadfc81 100644 --- a/Resources/Prototypes/_NF/Research/civilianservices.yml +++ b/Resources/Prototypes/_NF/Research/civilianservices.yml @@ -1,20 +1,3 @@ -# Tier 2 - -- type: technology - id: AdvancedFoodService - name: research-technology-food-service-advanced - icon: - sprite: _NF/Structures/Machines/advancedjuicer.rsi - state: juicer1 - discipline: CivilianServices - tier: 2 - cost: 10000 - recipeUnlocks: #remove all of these once we have more kitchen equipment - - AdvancedReagentGrinderMachineCircuitboard - - DeepFryerMachineCircuitboard # Nyano - Summary: adds deep fryer circuit board to service research. - technologyPrerequisites: - - FoodService - # Tier 3 - type: technology From fd3f4f84039c11b8a9f0d04f6c54dab172b48a5e Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 27 Apr 2024 19:17:32 +0300 Subject: [PATCH 11/11] Here we go --- .../_NF/kitchen/components/reagent-grinder-component.ftl | 4 ---- Resources/Locale/en-US/_NF/research/technologies.ftl | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 Resources/Locale/en-US/_NF/kitchen/components/reagent-grinder-component.ftl diff --git a/Resources/Locale/en-US/_NF/kitchen/components/reagent-grinder-component.ftl b/Resources/Locale/en-US/_NF/kitchen/components/reagent-grinder-component.ftl deleted file mode 100644 index 9d16852ddb8..00000000000 --- a/Resources/Locale/en-US/_NF/kitchen/components/reagent-grinder-component.ftl +++ /dev/null @@ -1,4 +0,0 @@ -## UI -advanced-reagent-grinder-component-cannot-grind-entity-message = The item is too dense to be grinded, try a stronger grinder. - -advanced-grinder-menu-title = All-In-One Grinder 6000 diff --git a/Resources/Locale/en-US/_NF/research/technologies.ftl b/Resources/Locale/en-US/_NF/research/technologies.ftl index a7c4a39a52a..790fe6e24f9 100644 --- a/Resources/Locale/en-US/_NF/research/technologies.ftl +++ b/Resources/Locale/en-US/_NF/research/technologies.ftl @@ -1,7 +1,4 @@ research-techology-advanced-personal-propulsion = Advanced Personal Propulsion - -research-technology-food-service-advanced = Advanced Food Service - research-technology-rapid-construction = Rapid Construction research-technology-hardsuits-basic = Basic Hardsuits research-technology-hardsuits-specialized = Specialized Hardsuits @@ -10,4 +7,3 @@ research-technology-hardsuits-experimental-industrial = Experimental Salvager Ha research-technology-hardsuits-armored = Armored Hardsuits research-technology-hardsuits-armored-advanced = Advanced Armored Hardsuits research-technology-hardsuits-experimental-rd = Experimental Research Hardsuit -