From db26562009fb2f4f3734be08ad0bc08da8683677 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 29 Sep 2024 12:40:16 +0300 Subject: [PATCH 01/15] Printable blueprints --- .../Entities/Structures/Machines/lathe.yml | 3 +- .../Entities/Structures/Machines/lathe.yml | 6 +- Resources/Prototypes/Research/arsenal.yml | 6 +- .../Prototypes/Research/civilianservices.yml | 6 + .../Prototypes/Research/experimental.yml | 1 + Resources/Prototypes/Research/industrial.yml | 16 +- .../Entities/Objects/Devices/flatpacks.yml | 9 + .../Entities/Objects/Devices/production.yml | 17 ++ .../Tools/blueprints/blueprints_armory.yml | 30 +++ .../Tools/blueprints/blueprints_base.yml | 195 ++++++++++++++++++ .../blueprints/blueprints_engineering.yml | 122 +++++++++++ .../Tools/blueprints/blueprints_medical.yml | 30 +++ .../Tools/blueprints/blueprints_salvage.yml | 40 ++++ .../Tools/blueprints/blueprints_science.yml | 50 +++++ .../Tools/blueprints/blueprints_service.yml | 30 +++ .../Entities/Structures/Machines/lathe.yml | 95 ++++++++- .../_NF/Recipes/Lathes/blueprints.yml | 171 +++++++++++++++ .../_NF/Recipes/Lathes/electronics.yml | 9 + .../Prototypes/_NF/Research/experimental.yml | 4 + .../Prototypes/_NF/Research/industrial.yml | 2 + .../Tools/blueprints.rsi/icon-base.png | Bin 0 -> 450 bytes .../Tools/blueprints.rsi/icon-text.png | Bin 0 -> 246 bytes .../Tools/blueprints.rsi/inhand-left-base.png | Bin 0 -> 292 bytes .../Tools/blueprints.rsi/inhand-left-text.png | Bin 0 -> 233 bytes .../blueprints.rsi/inhand-right-base.png | Bin 0 -> 302 bytes .../blueprints.rsi/inhand-right-text.png | Bin 0 -> 236 bytes .../Objects/Tools/blueprints.rsi/meta.json | 33 +++ .../blueprint_printer.rsi/building.png | Bin 0 -> 2357 bytes .../Machines/blueprint_printer.rsi/icon.png | Bin 0 -> 1159 bytes .../Machines/blueprint_printer.rsi/meta.json | 42 ++++ .../Machines/blueprint_printer.rsi/panel.png | Bin 0 -> 574 bytes .../Machines/blueprint_printer.rsi/unlit.png | Bin 0 -> 510 bytes 32 files changed, 906 insertions(+), 11 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_salvage.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_science.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml create mode 100644 Resources/Textures/_NF/Objects/Tools/blueprints.rsi/icon-base.png create mode 100644 Resources/Textures/_NF/Objects/Tools/blueprints.rsi/icon-text.png create mode 100644 Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-left-base.png create mode 100644 Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-left-text.png create mode 100644 Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-right-base.png create mode 100644 Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-right-text.png create mode 100644 Resources/Textures/_NF/Objects/Tools/blueprints.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/building.png create mode 100644 Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/icon.png create mode 100644 Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/panel.png create mode 100644 Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/unlit.png diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 40d956ddea8..693f99ab738 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -506,6 +506,7 @@ - StationAnchorCircuitboard - SalvageMagnetMachineCircuitboard - SalvageTechFabCircuitboardNF # Frontier + - BlueprintLithographMachineCircuitboard # Frontier dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard @@ -972,7 +973,7 @@ - type: entity id: MedicalTechFab - parent: BaseLatheLube + parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: added BlueprintReceiverBase name: medical techfab description: Prints equipment for use by the medbay. components: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml index 216eeec1ea8..bc94bb392f8 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseLatheLube # Frontier: ProtolathePx$d`Uz>R9J=WRXdKuAP{|6dx|tjoWqJ@&M_VLNa1_9BiAqy@;M^W_yXyft?-h> zj!}};Zs8|cpkY3bH)9*vuwlc7KZaOyIG@h|fEXj^_NuB@V{;r1hgo}75*%aXaU7ww z7FugDj^hKNSFuVU#>iT0K}5n@%K$(`;&eK}d;d0xA_V}zTFXQv(jEXp2=CS}CvdMo zvU~42#<=)=jKIADP167X>bky}jWjE1zeb{%Ku!bzoO1wxVHjYo<+&Cmyfv_W-}78j zV+xdw_q5C*`lTRDs{{y27X#l*YyL@Um70nf(#_WtDN;Zwb(4sQgfV9E*17#71X90K(WYtO zoWu2coqY0F@P1&QKK*t@UiJA_eyQ seF~n61DMv`Znqfw>>IFQ!-ju>Z{M#GCPyjk3;+NC07*qoM6N<$g8Ej)?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/icon-text.png b/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/icon-text.png new file mode 100644 index 0000000000000000000000000000000000000000..0780b0c5d50fe7e3b556e8b64c5a8e1931183d46 GIT binary patch literal 246 zcmVPx#ut`KgR9J=WlTix9APhvur3drqo+ut+`q34#qG_bEKh1+u(dbMx0fHb1-cDKx zCP@HDDJ1|XrMULxoTqCa&jBJrl5E1wh;^_RmjU3)y1#+H!7u&TgZG(CM8p*D=T{86 z(Aj(9R&dvV7U_lhCmQ`98_-=aDne`Rv4L9aPZ!)7U3rSb8wkv^)AM?)Z*3b^7g)8i wOPc`NHxC*VX6hE&XX zd+Q=!vjR_RV(ho9+E;dS;wB0-Ejc2meEa|1H^<5%tRsWA@d8ydFx+|iu6?)s>L-6w z)OC!+SMT_!w3Q)sVcNFzXKRbo#Fh6lznXnMB4@61;Ent;r_kN2K6%|^JT?Eo>Z!}G z)a}z^L{~5ss0*MFp9?x>anR{N;FVdQ&MBb@0Ka#9Bme*a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-left-text.png b/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-left-text.png new file mode 100644 index 0000000000000000000000000000000000000000..423302c2711d6ea93dcc60fb118d6da476ee15f1 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|7JIrlhE&XX zd&^MB#Xy4X!hJC-^Me1AcQ*PZcgq?}3YSe3xmKN-1_&N_UQ4e`@7r1=xpPlUS>Bmx&oVYDUpo1F zovlfD=f>LWW``}#RzL3kuP{+;#l)X)U+Q0SeSbGRm3i9ScyY_g!XG0Ktmi%zyZaI& c1H->7(yLGQ{Wz3X@DpURr>mdKI;Vst07ej9>;M1& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-right-base.png b/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-right-base.png new file mode 100644 index 0000000000000000000000000000000000000000..ee28a8faabb7c53fb568e4e2b70c1c57c9fbd547 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|UU<4VhE&XX zd&`^ekO7bDMUjoB>u+^yFZKuw3AR?8-&L(YHYb_ed(x2yJ=4>lJ_B-j}{@8%MJbw*dpp~BdD^}8)KoBYD} z>0aqtTvfDdX62ICH4W*X!s;Z>zOJsjeMqL^`}xzaKYbUBF1_;2oc+S*n(4dMst!HL u`k++QbBl4|^n`0waW4$@9f3ywY2@F(=tAj!uWNTfwt2exxvXlyYaW_Ph-a-o&`k`MHyfblKNyM~qr# gS8U~DVEFKmH~VzokD5(Uq9AiUUHx3vIVCg!0C%uns{jB1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/meta.json b/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/meta.json new file mode 100644 index 00000000000..8511331d7ab --- /dev/null +++ b/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon sprite is taken from Baystation12 at https://github.com/Baystation12/Baystation12/blob/dev/icons/obj/tools/blueprints.dmi | Split into layers and grayscaled by ErhardSteinhauer (discord/github); Inhand sprites are taken from https://github.com/vgstation-coders/vgstation13/commit/dd749c36c416a6960782732cecf25e5ebac326e8 | Split into layers and grayscaled by ErhardSteinhauer (discord/github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left-base", + "directions": 4 + }, + { + "name": "inhand-left-text", + "directions": 4 + }, + { + "name": "inhand-right-base", + "directions": 4 + }, + { + "name": "inhand-right-text", + "directions": 4 + }, + { + "name": "icon-base" + }, + { + "name": "icon-text" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/building.png b/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/building.png new file mode 100644 index 0000000000000000000000000000000000000000..32b081a843075778c04e5067d8140eac5d598e5b GIT binary patch literal 2357 zcmbVOc{CJU8^2737#UlG${ML8 zwcF+%T*ssQrSI4(4hX+K_RwWh;I!NWDa6U9%E?Kp=U`K-lcS)cF`Na0!$R!C2ol^Z zsS7QUn9r#ZO!){pD6sQ*Gck%UzcC!VOc4@_Y?n zTB9<#HRzL+M`Rf|JjsXXG1{`Lr9Zo>DT;(@wko%Zw*JHaqd*d}rZ|$-RzoXq)ZOc? zVra8lacAS zur(LZ`}Stx$$5)@Y%>)-y}2*sz_eOC;S!&N@BNGDbtLQWPim*EBP|QI^|HUAknfCo zG_Mm&!}5Cl>(+a?xWLJ8Z(kp{(Kxe1Yu&5;*^-suULmXx$As)3;@AE zOEcrMkvZRU+yprS)?Ui1)p7W4LOd)etucqcGb1g4z zfWdC`4Y?7Dp76Szot-{`P`Cv*5mMxZM2&&r!06yu`pw`QSl^TyLpVwD7>$rRQE6DL zx>Cd_sY+wYAHxNNLji`_H_GZB;~t30$DnRi#Q#M*^#;;-a|jWKt>iowaK|ikmH-d| zUF-_HmSnI`>`g>ZztV9Jn&Xsa4FHqtWj3Wj^a|AG{9N*`dn5EA0!?ky+c1SVwzfK; zEV2D7CT`Rjb=fLm20w@QxPrzz*DN+$JS2XGTl|j`Y3W@>`Nr$ z2fvj|#Bd)xU?rzXjJqkiOFX42^8F-?+sra)4(NEuFifRAv&EpeL6$b|BtqHKk0Cl(cmAIL*glV zB6$6K+PVhn>BgC{{{F%hx-+`%D}wyjF6$no(j%cXi!hIBO}t6~zXC_QMb7JJH0fHuXNQ8Q%bZ9i#|=JiiTqp-qc6=DHBFjw_!xR^g^9#a>{Y5K%}Yw)jwOh)jC) z9<87uLp{0-i`KW7Mn@+F=p}zK6$GHhnS8OH+gI`_=mr!O%W-C`u_7{q9?Rv}G=0U$ z)P@`4Ih-_<0cxSTM3Q&cS#{8MFBJsjlrz8Ady3#L_1;JcVwZCH$U)CCy#k|^qE*Bp z+{)l~uL>syXMAiUIcacY?B;T^rHba%ck=Zs5=neiHqCLdpV{2Wd+^4ho3WAz=wVD?|_^XN1j;0I>g7>namG9&PypR^0&`~w0{tA572+u zdB`;^V5D3C+^->Uo0W2{zcSrom$qrqlo0GYtb0S?D`vQEyt-IAWpSsN@AwYTW^mWR zr8*Ts%c3J1gzApwnrmc1;HsOsNSjQ~`}IADM!d-0+3zprqt09%*O1(t+4|EJvhLlk zOY?NwRA1cx`|$}Wa`lJB@@q(J@Mvp<2Pgq(TwH%n-O@&+uIcL-r~`I)MeLrln{nS@ zA2<2#ZiInip84WYDBaJdBbJD`!2Hjh+|O zn(gO9br*K#rRu9@7-vw|L0SERE%^s>i2Ibclfc zJHjX5X+k@_-O)H@3ZcNBGafV7TYr=k&jxqchn6+MR7TZj=^VP!eKwH(8C18LHOF%o zzVr``zZw5a{eOde(tqulCmaoI@xAOVkywMACAuA15-hZ*sQtl&oOkMAEDtU@#$nJ# zHBl=jyx~wl|MhqHae17&&jAX-*c^>3M1ma@24QhdbC)9b`@ql-rF}bf9c^xsAl2{B)xf)M9G1b z6F!N7X`cc0Bgmi+wg)IjOm(81+Djz-*kC*}Ip3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/icon.png b/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..99ebfbe0d1d254261affa8f1bbaa4737ac827a83 GIT binary patch literal 1159 zcmV;21bF+2P)EX>4Tx04R}tkv&MmKpe$iQ$>-ALpz9c$WWau_=PxX6^c+H)C#RSm|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfbaGO3krMxx6k5c1aNLh~_a1le0HIM~n$)S(glehxvqHp#<}RSz%wIeCOuCaAr^}rtaLCdnHupFaZJ^8$``U8 ztDLtuYn2*n-IKpCl-F05xlS{RBo?s*2_h8KP(}qd;8RapT*I-SPnD;K%ggc{EnqcvejZRghQ zJHp*`-GR2Y6I*%>twM@HD4?dcmYZFd0Qfnb>-;?};@7aMvVxl0TJu?e*zhO-;d4P^ z!=pTX@|cUAUBv~YQVYBo7&7N;uYIOnemdj2n!dhXqR~M#O(W9N4S@c8#j*ZE0RR&d zZ%sS%&QgLZ_Yz2wL`TPYqR~M{;^VHqt^#0VCjc@_76GZ^Jz(sBv4~V^0Zr3Tlz=w@ z$+>AXO*7}~E4gMW(^iTKaKg;Y2Oi#!l&ESfk1s8B{Fs<30Z^0xiV{E$R}FO`46})8KF>`Fb2;w7Y+`!H1h~QJr$OC!;K)cz zODh1$WCFR)hpy}Bt3C|gz^cB{bj{7p0HhXk2Uaqf;My){|7O* ZkH0@i-fd!KSLy%&002ovPDHLkV1kxFB!U0{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/meta.json new file mode 100644 index 00000000000..68647e8f754 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | Resprited by ErhardSteinhauer (discord/github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16 + ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..c866a0c4566f210131adf1e768058f62e96204f5 GIT binary patch literal 574 zcmV-E0>S->P)EX>4Tx04R}tkv&MmKpe$iQ$>-AU^|F7WT*~eK~%(1t5Adrp;l;qmz@OipZjz4syT}R0g-r?8KzCVK|H-_ z8=UuvBdjQ^#OK6gCS8#Dk?V@bZ=4G*3p_Jorc?985n{2>#!4HrqNx#25l2-`r+gvf zvC4UivsSLM<~{ifLpgnAnd>x%kia6AAVGwJDoQBBMvPXS6bmWZkNfxsUB5&wg;V;Jb#1sXNS`95}>#t9I72Cnp$zfuQgK1r{& zwCEAgw+&oew=`uBxZD8-o($QPT`5RY$mfCgGy0}15WWR^*1X=D`#607($rP*1~@nb zMhcX@?(^>M_TK(I)9mjDK*MsA#Uc_f0001WNklJA6olc!Da0i#WCs&h zuxBWGS1@r0EF6O=o}B?DbYOE|a|t1NKR`r8L`2lcysVOY?`jGitX2j{Bf*Fhdss;48RJ_dt-j01Mh7kSc2D}Lwd%)MM*8l(j M07*qoM6N<$f+L9fWB>pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/unlit.png b/Resources/Textures/_NF/Structures/Machines/blueprint_printer.rsi/unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..58528c802d2c3cb33152632e84b5190e4bd9892f GIT binary patch literal 510 zcmVEX>4Tx04R}tkv&MmKpe$iQ$>-ALpz9c$WWau_=PxX6^c+H)C#RSm|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfbaGO3krMxx6k5c1aNLh~_a1le0HIM~n$)S(glehxvqHp#<}RSz%wIeCOuCaAr^}rtaLCdnHupFaZJ^8$``U8 ztDLtuYn2*n-IKpCl-F05xlS{RBo?s*2_h8KP(}qd; Date: Sun, 29 Sep 2024 12:52:23 +0300 Subject: [PATCH 02/15] tweaks --- .../_NF/Catalog/Fills/Crates/science.yml | 1 + .../Inventories/flatpackvend.yml | 1 + .../Tools/blueprints/blueprints_armory.yml | 6 ++--- .../blueprints/blueprints_engineering.yml | 24 +++++++++---------- .../Tools/blueprints/blueprints_medical.yml | 6 ++--- .../Tools/blueprints/blueprints_salvage.yml | 8 +++---- .../Tools/blueprints/blueprints_science.yml | 10 ++++---- .../Tools/blueprints/blueprints_service.yml | 6 ++--- 8 files changed, 32 insertions(+), 30 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml index 3b9dd654044..ff639156957 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml @@ -9,6 +9,7 @@ - id: ExosuitFabricatorFlatpack - id: MachineAnomalyVesselFlatpack - id: CircuitImprinterFlatpack + - id: BlueprintLithographFlatpack - id: ResearchAndDevelopmentServerFlatpack - id: ComputerResearchAndDevelopmentFlatpack - id: MachineArtifactAnalyzerFlatpack diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml index bc64e23b7e6..a12a179ac06 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml @@ -10,6 +10,7 @@ CircuitImprinterFlatpack: 4294967295 # Infinite ResearchAndDevelopmentServerFlatpack: 4294967295 # Infinite ComputerResearchAndDevelopmentFlatpack: 4294967295 # Infinite + BlueprintLithographFlatpack: 4294967295 # Infinite ScienceTechFabFlatpack: 4294967295 # Infinite EngineeringTechFabFlatpack: 4294967295 # Infinite SalvageTechfabNFFlatpack: 4294967295 # Infinite diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml index 8c44fbc685e..a8b62b032e6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml @@ -3,7 +3,7 @@ parent: BaseBlueprintArmoryNF id: BlueprintWeaponAntiqueLaserNF name: antique laser blueprint - description: A blueprint with a schematic of an antique laser. It can be inserted into an autolathe. + description: A blueprint with a schematic of an antique laser. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -13,7 +13,7 @@ parent: BaseBlueprintArmoryNF id: BlueprintWeaponLaserSvalinnNF name: svalinn pistol blueprint - description: A blueprint with a schematic of a svalinn pistol. It can be inserted into an autolathe. + description: A blueprint with a schematic of a svalinn pistol. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -23,7 +23,7 @@ parent: BaseBlueprintArmoryNF id: BlueprintPortableRechargerNF name: portable recharger blueprint - description: A blueprint with a schematic of a portable recharger. It can be inserted into an autolathe. + description: A blueprint with a schematic of a portable recharger. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml index d26d92d1224..0758d82e6f7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml @@ -3,7 +3,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintPowerDrillNF name: power drill blueprint - description: A blueprint with a schematic of a power drill. It can be inserted into an autolathe. + description: A blueprint with a schematic of a power drill. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -13,7 +13,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintJawsOfLifeNF name: jaws of life blueprint - description: A blueprint with a schematic of a jaws of life. It can be inserted into an autolathe. + description: A blueprint with a schematic of a jaws of life. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -23,7 +23,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintWelderExperimentalNF name: experimental welder blueprint - description: A blueprint with a schematic of an experimental welder. It can be inserted into an autolathe. + description: A blueprint with a schematic of an experimental welder. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -33,7 +33,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintShipyardRCDAmmoNF name: shipyard compressed matter blueprint - description: A blueprint with a schematic of a shipyard compressed matter. It can be inserted into an autolathe. + description: A blueprint with a schematic of a shipyard compressed matter. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -44,7 +44,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintPowerCellMediumPrintedNF name: medium-capacity power cell blueprint - description: A blueprint with a schematic of a medium-capacity power cell. It can be inserted into an autolathe. + description: A blueprint with a schematic of a medium-capacity power cell. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -54,7 +54,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintPowerCellMicroreactorNF name: microreactor blueprint - description: A blueprint with a schematic of a microreactor. It can be inserted into an autolathe. + description: A blueprint with a schematic of a microreactor. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -65,7 +65,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintSignallerAdvancedNF name: advanced signaller blueprint - description: A blueprint with a schematic of an advanced signaller. It can be inserted into an autolathe. + description: A blueprint with a schematic of an advanced signaller. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -75,7 +75,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintClothingBackpackHoldingNF name: bluespace backpack blueprint - description: A blueprint with a schematic of a bluespace backpack. It can be inserted into an autolathe. + description: A blueprint with a schematic of a bluespace backpack. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -85,7 +85,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintClothingBackpackSatchelHoldingNF name: bluespace satchel blueprint - description: A blueprint with a schematic of a bluespace satchel. It can be inserted into an autolathe. + description: A blueprint with a schematic of a bluespace satchel. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -95,7 +95,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintClothingBackpackMessengerHoldingNF name: bluespace messenger bag blueprint - description: A blueprint with a schematic of a bluespace messenger bag. It can be inserted into an autolathe. + description: A blueprint with a schematic of a bluespace messenger bag. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -105,7 +105,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintClothingBackpackDuffelHoldingNF name: bluespace duffel blueprint - description: A blueprint with a schematic of a bluespace duffel. It can be inserted into an autolathe. + description: A blueprint with a schematic of a bluespace duffel. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -115,7 +115,7 @@ parent: BaseBlueprintEngineeringNF id: BlueprintConstructionBagOfHoldingNF name: bluespace construction bag blueprint - description: A blueprint with a schematic of a bluespace construction bag. It can be inserted into an autolathe. + description: A blueprint with a schematic of a bluespace construction bag. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml index 0211cc6a167..2d7028e6b32 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml @@ -3,7 +3,7 @@ parent: BaseBlueprintMedicalNF id: BlueprintBluespaceBeakerNF name: bluespace beaker blueprint - description: A blueprint with a schematic of a bluespace beaker. It can be inserted into an autolathe. + description: A blueprint with a schematic of a bluespace beaker. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -13,7 +13,7 @@ parent: BaseBlueprintMedicalNF id: BlueprintSyringeBluespaceNF name: bluespace syringe blueprint - description: A blueprint with a schematic of a bluespace syringe. It can be inserted into an autolathe. + description: A blueprint with a schematic of a bluespace syringe. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -23,7 +23,7 @@ parent: BaseBlueprintMedicalNF id: BlueprintVialBluespaceNF name: bluespace syringe blueprint - description: A blueprint with a schematic of a bluespace vial. It can be inserted into an autolathe. + description: A blueprint with a schematic of a bluespace vial. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_salvage.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_salvage.yml index ee7d6116303..ea539946ce1 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_salvage.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_salvage.yml @@ -3,7 +3,7 @@ parent: BaseBlueprintSalvageNF id: BlueprintOreBagOfHoldingNF name: bluespace ore bag blueprint - description: A blueprint with a schematic of a bluespace ore bag. It can be inserted into an autolathe. + description: A blueprint with a schematic of a bluespace ore bag. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -13,7 +13,7 @@ parent: BaseBlueprintSalvageNF id: BlueprintMiningDrillDiamondNF name: diamond tipped mining drill blueprint - description: A blueprint with a schematic of a diamond tipped mining drill. It can be inserted into an autolathe. + description: A blueprint with a schematic of a diamond tipped mining drill. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -23,7 +23,7 @@ parent: BaseBlueprintSalvageNF id: BlueprintAdvancedMineralScannerEmptyNF name: advanced mineral scanner blueprint - description: A blueprint with a schematic of an advanced mineral scanner. It can be inserted into an autolathe. + description: A blueprint with a schematic of an advanced mineral scanner. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -33,7 +33,7 @@ parent: BaseBlueprintSalvageNF id: BlueprintClothingOuterHardsuitMaximPrototypeNF name: experimental salvager hardsuit blueprint - description: A blueprint with a schematic of an experimental salvager hardsuit. It can be inserted into an autolathe. + description: A blueprint with a schematic of an experimental salvager hardsuit. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_science.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_science.yml index 96bfc970435..2c59f72ca3c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_science.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_science.yml @@ -3,7 +3,7 @@ parent: BaseBlueprintScienceNF id: BlueprintRpedNF name: RPED blueprint - description: A blueprint with a schematic of a RPED. It can be inserted into an autolathe. + description: A blueprint with a schematic of a RPED. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -13,7 +13,7 @@ parent: BaseBlueprintScienceNF id: BlueprintSuperCapacitorStockPartNF name: super capacitor blueprint - description: A blueprint with a schematic of a super capacitor. It can be inserted into an autolathe. + description: A blueprint with a schematic of a super capacitor. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -23,7 +23,7 @@ parent: BaseBlueprintScienceNF id: BlueprintPicoManipulatorStockPartNF name: super manipulator blueprint - description: A blueprint with a schematic of a super manipulator. It can be inserted into an autolathe. + description: A blueprint with a schematic of a super manipulator. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -33,7 +33,7 @@ parent: BaseBlueprintScienceNF id: BlueprintSuperMatterBinStockPartNF name: super matter bin blueprint - description: A blueprint with a schematic of a super matter bin. It can be inserted into an autolathe. + description: A blueprint with a schematic of a super matter bin. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -43,7 +43,7 @@ parent: BaseBlueprintScienceNF id: BlueprintClothingShoesBootsMagAdvNF name: advanced magboots blueprint - description: A blueprint with a schematic of an advanced magboots. It can be inserted into an autolathe. + description: A blueprint with a schematic of an advanced magboots. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml index 19c416ba448..9309382000a 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml @@ -3,7 +3,7 @@ parent: BaseBlueprintServiceNF id: BlueprintAdvMopItemNF name: advanced mop blueprint - description: A blueprint with a schematic of an advanced mop. It can be inserted into an autolathe. + description: A blueprint with a schematic of an advanced mop. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -13,7 +13,7 @@ parent: BaseBlueprintServiceNF id: BlueprintPlantAnalyzerEmptyNF name: plant analyzer blueprint - description: A blueprint with a schematic of a plant analyzer. It can be inserted into an autolathe. + description: A blueprint with a schematic of a plant analyzer. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: @@ -23,7 +23,7 @@ parent: BaseBlueprintServiceNF id: BlueprintPlantBagOfHoldingNF name: bluespace plant bag blueprint - description: A blueprint with a schematic of a bluespace plant bag. It can be inserted into an autolathe. + description: A blueprint with a schematic of a bluespace plant bag. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: From fc669796689fe9c3370d6672216f410ffc743e03 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 29 Sep 2024 13:09:29 +0300 Subject: [PATCH 03/15] fixes --- .../Objects/Tools/blueprints/blueprints_engineering.yml | 2 +- .../Objects/Tools/blueprints/blueprints_service.yml | 2 +- Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml index 0758d82e6f7..11da757ee16 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml @@ -48,7 +48,7 @@ components: - type: Blueprint providedRecipes: - - PowerCellMediumPrinted + - PowerCellMedium - type: entity parent: BaseBlueprintEngineeringNF diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml index 9309382000a..b2ffce7808d 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml @@ -17,7 +17,7 @@ components: - type: Blueprint providedRecipes: - - PlantAnalyzerEmpty + - PlantAnalyzer - type: entity parent: BaseBlueprintServiceNF diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml index 44037082595..71d02993752 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml @@ -157,13 +157,13 @@ - type: latheRecipe parent: BaseBlueprintLatheRecipeNF - id: BlueprintWeaponAntiqueLaser - result: BlueprintWeaponAntiqueLaser + id: BlueprintWeaponAntiqueLaserNF + result: BlueprintWeaponAntiqueLaserNF - type: latheRecipe parent: BaseBlueprintLatheRecipeNF - id: BlueprintWeaponLaserSvalinn - result: BlueprintWeaponLaserSvalinn + id: BlueprintWeaponLaserSvalinnNF + result: BlueprintWeaponLaserSvalinnNF - type: latheRecipe parent: BaseBlueprintLatheRecipeNF From 01e0cbdd39d0c2e95c118194fe7c613508bc8637 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 29 Sep 2024 13:16:12 +0300 Subject: [PATCH 04/15] more fixes --- Resources/Prototypes/Research/arsenal.yml | 4 ++-- .../Prototypes/_NF/Entities/Structures/Machines/lathe.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index f932ce3deb6..4e0f8bb5c64 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -201,7 +201,7 @@ - WeaponAdvancedLaser - PortableRecharger - WeaponAntiqueLaserNF # Frontier - - BlueprintWeaponAntiqueLaser # Frontier + - BlueprintWeaponAntiqueLaserNF # Frontier - BlueprintPortableRechargerNF # Frontier - type: technology @@ -215,7 +215,7 @@ cost: 15000 recipeUnlocks: - WeaponLaserSvalinn - - BlueprintWeaponLaserSvalinn # Frontier + - BlueprintWeaponLaserSvalinnNF # Frontier - type: technology id: AdvancedShuttleWeapon diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 8d67fc2fea7..b642a746562 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -785,8 +785,8 @@ - BlueprintPlantAnalyzerEmptyNF - BlueprintPlantBagOfHoldingNF # Armory - - BlueprintWeaponAntiqueLaser - - BlueprintWeaponLaserSvalinn + - BlueprintWeaponAntiqueLaserNF + - BlueprintWeaponLaserSvalinnNF - BlueprintPortableRechargerNF - type: MaterialStorage whitelist: From 75ba9f60d65f50b652d423a1ac4ccb271c0f8d34 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 29 Sep 2024 16:10:35 +0300 Subject: [PATCH 05/15] stampable, edible, scaf blueprint --- .../Tools/blueprints/blueprints_armory.yml | 10 ++ .../Tools/blueprints/blueprints_base.yml | 158 ++++++++++++++---- .../Entities/Structures/Machines/lathe.yml | 1 + .../_NF/Recipes/Lathes/blueprints.yml | 5 + Resources/Prototypes/_NF/Research/arsenal.yml | 1 + 5 files changed, 147 insertions(+), 28 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml index a8b62b032e6..940c06cfa21 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml @@ -28,3 +28,13 @@ - type: Blueprint providedRecipes: - PortableRecharger + +- type: entity + parent: BaseBlueprintArmoryNF + id: BlueprintClothingOuterHardsuitScaf + name: scaf hardsuit blueprint + description: A blueprint with a schematic of a scaf hardsuit. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - ClothingOuterHardsuitScaf diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml index 339af87a512..f66db95fc36 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml @@ -4,11 +4,17 @@ abstract: true components: - type: Sprite - sprite: _NF/Objects/Tools/blueprints.rsi layers: - - state: icon-base + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-base color: "#7da0ba" - - state: icon-text + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-text + - sprite: Objects/Misc/bureaucracy.rsi + state: paper_stamp-generic + offset: 0.15,-0.1 + map: ["enum.PaperVisualLayers.Stamp"] + visible: false - type: Item size: Normal sprite: _NF/Objects/Tools/blueprints.rsi @@ -32,8 +38,8 @@ materialComposition: Paper: 100 # Paper stuff - - type: FaxableObject # Not sure about it, but why not? If someone wants to waste their time printing free copies of blueprints for cash they can have their spesos - type: Paper + - type: PaperVisuals - type: Flammable fireSpread: true canResistFire: false @@ -61,17 +67,46 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Food + solution: food + delay: 7 + forceFeedDelay: 7 + - type: FlavorProfile + flavors: + - paper + - type: BadFood + - type: SolutionContainerManager + solutions: + food: + maxVol: 1 + reagents: + - ReagentId: Fiber + Quantity: 0.1 -- type: entity # Engineering +- type: entity parent: BaseBlueprintNF + id: BaseBlueprintFaxable + abstract: true + components: + - type: FaxableObject # Not sure about it, but why not? If someone wants to waste their time printing free copies of blueprints for cash they can have their spesos + +- type: entity # Engineering + parent: BaseBlueprintFaxable id: BaseBlueprintEngineeringNF abstract: true components: - type: Sprite layers: - - state: icon-base - color: "#fff87c" # Pale yellow - - state: icon-text + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-base + color: "#fff87c" + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-text + - sprite: Objects/Misc/bureaucracy.rsi + state: paper_stamp-generic + offset: 0.15,-0.1 + map: ["enum.PaperVisualLayers.Stamp"] + visible: false - type: Item size: Normal inhandVisuals: @@ -85,15 +120,22 @@ - state: inhand-right-text - type: entity # Salvage / Cargo - parent: BaseBlueprintNF + parent: BaseBlueprintFaxable id: BaseBlueprintSalvageNF abstract: true components: - type: Sprite layers: - - state: icon-base - color: "#e1ba8b" # Pale brown - - state: icon-text + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-base + color: "#e1ba8b" + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-text + - sprite: Objects/Misc/bureaucracy.rsi + state: paper_stamp-generic + offset: 0.15,-0.1 + map: ["enum.PaperVisualLayers.Stamp"] + visible: false - type: Item size: Normal inhandVisuals: @@ -107,15 +149,22 @@ - state: inhand-right-text - type: entity # Science - parent: BaseBlueprintNF + parent: BaseBlueprintFaxable id: BaseBlueprintScienceNF abstract: true components: - type: Sprite layers: - - state: icon-base - color: "#e18bd5" # Pale purple - - state: icon-text + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-base + color: "#e18bd5" + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-text + - sprite: Objects/Misc/bureaucracy.rsi + state: paper_stamp-generic + offset: 0.15,-0.1 + map: ["enum.PaperVisualLayers.Stamp"] + visible: false - type: Item size: Normal inhandVisuals: @@ -129,15 +178,22 @@ - state: inhand-right-text - type: entity # Service - parent: BaseBlueprintNF + parent: BaseBlueprintFaxable id: BaseBlueprintServiceNF abstract: true components: - type: Sprite layers: - - state: icon-base - color: "#94e18b" # Pale green - - state: icon-text + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-base + color: "#94e18b" + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-text + - sprite: Objects/Misc/bureaucracy.rsi + state: paper_stamp-generic + offset: 0.15,-0.1 + map: ["enum.PaperVisualLayers.Stamp"] + visible: false - type: Item size: Normal inhandVisuals: @@ -151,15 +207,22 @@ - state: inhand-right-text - type: entity # Medical - parent: BaseBlueprintNF + parent: BaseBlueprintFaxable id: BaseBlueprintMedicalNF abstract: true components: - type: Sprite layers: - - state: icon-base - color: "#97cae1" # Pale blue - - state: icon-text + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-base + color: "#97cae1" + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-text + - sprite: Objects/Misc/bureaucracy.rsi + state: paper_stamp-generic + offset: 0.15,-0.1 + map: ["enum.PaperVisualLayers.Stamp"] + visible: false - type: Item size: Normal inhandVisuals: @@ -173,15 +236,22 @@ - state: inhand-right-text - type: entity # Armory - parent: BaseBlueprintNF + parent: BaseBlueprintFaxable id: BaseBlueprintArmoryNF abstract: true components: - type: Sprite layers: - - state: icon-base - color: "#e18b8b" # Pale red - - state: icon-text + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-base + color: "#e18b8b" + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-text + - sprite: Objects/Misc/bureaucracy.rsi + state: paper_stamp-generic + offset: 0.15,-0.1 + map: ["enum.PaperVisualLayers.Stamp"] + visible: false - type: Item size: Normal inhandVisuals: @@ -193,3 +263,35 @@ - state: inhand-right-base color: "#e18b8b" - state: inhand-right-text + +- type: entity # Church + parent: BaseBlueprintFaxable + id: BaseBlueprintChurchNF + abstract: true + components: + - type: Sprite + layers: + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-base + color: "#525252" + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-text + color: "#cbab00" + - sprite: Objects/Misc/bureaucracy.rsi + state: paper_stamp-generic + offset: 0.15,-0.1 + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: Item + size: Normal + inhandVisuals: + left: + - state: inhand-left-base + color: "#525252" + - state: inhand-left-text + color: "#cbab00" + right: + - state: inhand-right-base + color: "#525252" + - state: inhand-right-text + color: "#cbab00" diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index b642a746562..dee4063f975 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -788,6 +788,7 @@ - BlueprintWeaponAntiqueLaserNF - BlueprintWeaponLaserSvalinnNF - BlueprintPortableRechargerNF + - BlueprintClothingOuterHardsuitScaf - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml index 71d02993752..3a4dc90681d 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml @@ -169,3 +169,8 @@ parent: BaseBlueprintLatheRecipeNF id: BlueprintPortableRechargerNF result: BlueprintPortableRechargerNF + +- type: latheRecipe + parent: BaseBlueprintLatheRecipeNF + id: BlueprintClothingOuterHardsuitScaf + result: BlueprintClothingOuterHardsuitScaf diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml index 052168e9570..4bf0ced9362 100644 --- a/Resources/Prototypes/_NF/Research/arsenal.yml +++ b/Resources/Prototypes/_NF/Research/arsenal.yml @@ -107,5 +107,6 @@ - ClothingOuterHardsuitWarden - ClothingOuterHardsuitBrigmedic - ClothingOuterHardsuitScaf + - BlueprintClothingOuterHardsuitScaf technologyPrerequisites: - HardsuitsArmored From 08f24e1c3c89452159f357d12bff472738d9e6c9 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 29 Sep 2024 17:31:33 +0300 Subject: [PATCH 06/15] exped loot --- .../Fills/Items/document_cases_expedition.yml | 39 ++++++ .../Random/dungeon_items_research.yml | 1 + .../Entities/Objects/Storage/weapon_cases.yml | 21 +++ .../Tools/blueprints/blueprints_base.yml | 40 ++++++ .../blueprints/blueprints_expedition_loot.yml | 127 ++++++++++++++++++ .../Cases/documentcaseshort.rsi/icon-open.png | Bin 0 -> 760 bytes .../Cases/documentcaseshort.rsi/icon.png | Bin 0 -> 712 bytes .../documentcaseshort.rsi/inhand-left.png | Bin 0 -> 664 bytes .../documentcaseshort.rsi/inhand-right.png | Bin 0 -> 673 bytes .../Cases/documentcaseshort.rsi/meta.json | 31 +++++ .../Cases/documentcaseshort.rsi/unshaded.png | Bin 0 -> 5576 bytes 11 files changed, 259 insertions(+) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/icon-open.png create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/unshaded.png diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml new file mode 100644 index 00000000000..61b51323fce --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml @@ -0,0 +1,39 @@ + +- type: entity + parent: WeaponCaseShortDocuments + id: WeaponCaseShortDocumentsFilled + suffix: Dungeon, Blueprints + #categories: [ HideSpawnMenu ] + components: + - type: StorageFill + contents: + - id: BlueprintBoxShotgunUraniumNF + prob: 0.2 + orGroup: Blueprints + - id: BlueprintMagazineBoxRifleUraniumNF + prob: 0.2 + orGroup: Blueprints + - id: BlueprintMagazineBoxLightRifleUraniumNF + prob: 0.2 + orGroup: Blueprints + - id: BlueprintMagazineBoxMagnumUraniumNF + prob: 0.2 + orGroup: Blueprints + - id: BlueprintMagazineBoxPistolUraniumNF + prob: 0.2 + orGroup: Blueprints + - id: BlueprintBoxShotgunIncendiaryNF + prob: 0.2 + orGroup: Blueprints + - id: BlueprintMagazineBoxRifleIncendiaryNF + prob: 0.2 + orGroup: Blueprints + - id: BlueprintMagazineBoxMagnumIncendiaryNF + prob: 0.2 + orGroup: + - id: BlueprintWeaponLaserCannonNF + prob: 0.2 + orGroup: Blueprints + - id: BlueprintWeaponXrayCannonNF + prob: 0.2 + orGroup: Blueprints diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml index ef96d2f4b67..aaa453c02b7 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml @@ -223,6 +223,7 @@ rarePrototypes: - TechnologyDiskRare - ResearchDisk10000 + - WeaponCaseShortDocumentsFilled rareChance: 0.05 - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml b/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml index 526ae330d4a..7dbefb77548 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml @@ -92,6 +92,27 @@ - type: Item sprite: _NF/Objects/Storage/Cases/explosivescaseshort.rsi +- type: entity + name: document case + parent: WeaponCaseShortExplosives + id: WeaponCaseShortDocuments + description: A reinforced casing for storing important documents. + suffix: Short + components: + - type: Sprite + sprite: _NF/Objects/Storage/Cases/documentcaseshort.rsi + - type: Item + sprite: _NF/Objects/Storage/Cases/documentcaseshort.rsi + - type: Storage + maxItemSize: Normal + grid: + - 0,0,1,1 + whitelist: + tags: + - BlueprintAutolathe + - Document + - Paper + - type: entity name: weapon case parent: WeaponCaseLong diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml index f66db95fc36..0ecd5612aac 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml @@ -90,6 +90,8 @@ components: - type: FaxableObject # Not sure about it, but why not? If someone wants to waste their time printing free copies of blueprints for cash they can have their spesos +# Faxable variants (obtainable from research) + - type: entity # Engineering parent: BaseBlueprintFaxable id: BaseBlueprintEngineeringNF @@ -295,3 +297,41 @@ color: "#525252" - state: inhand-right-text color: "#cbab00" + +# Non-faxable variants (obtainable from expeditions) + +- type: entity # Armory + parent: [ BaseC3Contraband, BaseBlueprintNF ] + id: BaseBlueprintExpedition + abstract: true + components: + - type: Sprite + layers: + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-base + color: "#d70601" + - sprite: _NF/Objects/Tools/blueprints.rsi + state: icon-text + - sprite: Objects/Misc/bureaucracy.rsi + state: paper_stamp-generic + offset: 0.15,-0.1 + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: Item + size: Normal + inhandVisuals: + left: + - state: inhand-left-base + color: "#d70601" + - state: inhand-left-text + right: + - state: inhand-right-base + color: "#d70601" + - state: inhand-right-text + - type: Paper + stampState: paper_stamp-rd + stampedBy: + - reapply: False + stampType: RubberStamp + stampedColor: '#1F66A0FF' + stampedName: stamp-component-stamped-name-rd diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml new file mode 100644 index 00000000000..c19ca689d59 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml @@ -0,0 +1,127 @@ + +# Ammo +## Uranium + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintBoxShotgunUraniumNF + name: uranium shotgun ammo blueprint + description: A blueprint with a schematic of an uranium shotgun ammo. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - BoxShotgunUranium + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintMagazineBoxRifleUraniumNF + name: uranium .20 ammo blueprint + description: A blueprint with a schematic of an uranium .20 rifle ammo. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - MagazineBoxRifleUranium + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintMagazineBoxLightRifleUraniumNF + name: uranium .30 ammo blueprint + description: A blueprint with a schematic of an uranium .30 rifle ammo. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - MagazineBoxLightRifleUranium + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintMagazineBoxMagnumUraniumNF + name: uranium .45 ammo blueprint + description: A blueprint with a schematic of an uranium .45 ammo. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - MagazineBoxMagnumUranium + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintMagazineBoxPistolUraniumNF + name: uranium .35 ammo blueprint + description: A blueprint with a schematic of an uranium .35 ammo. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - MagazineBoxPistolUranium + +## Incendiary + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintBoxShotgunIncendiaryNF + name: incendiary shotgun ammo blueprint + description: A blueprint with a schematic of an incendiary shotgun ammo. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - BoxShotgunIncendiary + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintMagazineBoxRifleIncendiaryNF + name: incendiary .20 ammo blueprint + description: A blueprint with a schematic of an incendiary .20 rifle ammo. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - MagazineBoxRifleIncendiary + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintMagazineBoxLightRifleIncendiaryNF + name: incendiary .30 ammo blueprint + description: A blueprint with a schematic of an incendiary .30 rifle ammo. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - MagazineBoxLightRifleIncendiary + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintMagazineBoxMagnumIncendiaryNF + name: incendiary .45 ammo blueprint + description: A blueprint with a schematic of an incendiary .45 ammo. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - MagazineBoxMagnumIncendiary + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintMagazineBoxPistolIncendiaryNF + name: incendiary .35 ammo blueprint + description: A blueprint with a schematic of an incendiary .35 ammo. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - MagazineBoxPistolIncendiary + +# Guns + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintWeaponLaserCannonNF + name: laser cannon blueprint + description: A blueprint with a schematic of a laser cannon. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - WeaponLaserCannon + +- type: entity + parent: BaseBlueprintExpedition + id: BlueprintWeaponXrayCannonNF + name: x-ray cannon blueprint + description: A blueprint with a schematic of a x-ray cannon. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - WeaponXrayCannon diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..59ee3fc0b3b4aa79f0fc7af4e61e6b47225a17d6 GIT binary patch literal 760 zcmVEX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8 z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%pV2qvfWBLxYt`+oxsTHaAVXa(-2exN zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb5E=fc|R9J=WmOo3xFdT*-MR02n>geFE zw6k#6K@=Rt%`f2S;#UwI1a)*1oDWAqaZqQWK^Jjwa65}|_XW=3I0>}UH_)Sld6$;t zA$iE3AA$d#83o$j*&8X`auEUW5f8cUT}WfkDU)}zjxrYU&G@^N0WeY|Y6T`aKRr=V z_O}jXc2*{*6nO;z;&`!^DT*&I0eJrHqNVTzliH qH-hmlW?%j`E5uI#0000EX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8 z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%pV2qvfWBLxYt`+oxsTHaAVXa(-2exN zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb4{z*hZR9J;$U>F6XU=)mkkq#J%Q4|=Q z{-0EX*RP#Pl-VrASZ-%;OO&NL=Oh>y7#J9?7`h)RU~{Co@{p@AqgIt~d9WH98?XXq^m zVc_TIBiaE33kqDNU`S{noDB;hMYIqgrXV6J3b6SIIa>Jn`4|>h-DFt27E)rqEX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8 z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%pV2qvfWBLxYt`+oxsTHaAVXa(-2exN zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb4&PhZ;RCt{2+QAKiFcik|r|~SK-~zx5 z4GR!1oq%B+!Z?GvfQ*6*;8hWfHLuWy|L;~3KHAsz^bi36000000I((-?Lbr7{&jpl z9smA@X4aIgcA$tzUSyINS#Vinyc8fN6kzEIEN$l_^m@4knFRm<00000005wB*wGE$ z>RV&c7QmFYA3JSR&!?#N2CKU1yY8VG`BjqarK+2c#k$PFOLKHi=^=d^xA)fReYGoK yN;~WBYf(D^KK|eNh3k$FMSTTgJaGVkkURm^w=*Q{mo|0)0000EX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8 z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%pV2qvfWBLxYt`+oxsTHaAVXa(-2exN zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb4*GWV{RCt{2+QAKiFcik|YCOv*xBxH% zVFAL037EnOycicS&Y&(Jqu>H~t%}sAwFUYA5)ME^K3?0?t5N^}000000H$Qt_cG1O zR=+>&H@)MBK$>}O`e2+yDo&zrb2%l+Y%IXPqX51G__i<&I33R}a#%IS%m4rY00000 z007WEw!Uqcd~fjW0;E~lcFn-6=VM`Pj_QJ7sq&(F`q`$r+Dl}R7gf94uC1L^5pRKT z72aJwbWOsiL@QtjY_B$P0qRR_HGsq~4rz%B;Bv16035gh#4s^_D%Z9#00000NkvXX Hu0mjfy|^+R literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/meta.json new file mode 100644 index 00000000000..a8107eefdfb --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/obj/storage/case.dmi , held sprites and open sprite made by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "unshaded", + "delays": [ + [ 0.2, 0.1, 0.1, 0.2 ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/documentcaseshort.rsi/unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..d598b670413157f0259516fe86eaad1df968563e GIT binary patch literal 5576 zcmeHLd0Z3M79KYO2#6Kh*V<|b`fy>g3|YrSgb*P}5P?>fTAd`51+qCA2w+82Tq#wQ z@|2>2#VT5sqQUn#>f`JL{%+JyKL&U@KdPa-B#0KQW<8>< zGWF8Nv>X@AshT?U?5_(5{j^yFYqh@LuWcLpuVTXGjj@5v!;4qfFWz0bZ%Xjz+A%{$ z-~QEoZ}=m_-MtkDW=KmySFB$e((3>5JM{aCpi!s`FK2dMZOcU3@bK#F13p84A6Z>7 zs%kB9@9LmG`j3c8ZSLdzT~mYYzR#-8d6_P53vzzc6=Wu7u2reOu1~K@b{~-3Xieea zmE5U08U7ttXIC8PAR_8V%%9w{>kBWh0SnK091gu+Q9_QY&B7sSmP_i>;jCR-;$t>nh}Vy;|eY^WIUv@0{ncuOsTzk&-k|VMRUK$?*E7{87m7 zvCRo%E-hO7WA&UVRdYQxhD)jLOepx;z|ag~*QAfuGVl^og&&ESDu06m7j+1pjhrvci950zY7v z@8pA@)Jt72NQMIUFRnZ7U;|L^^JwQjwOY5b++!fVrrAJ z_IV6Jmimn!!v8pblAj{`SVW9=HGgJ7{9D1sBjFP!f3)-C&)zq;jwsqvJ$h21 zlnGKFGwx+4hW(USdArZEJJsT?0FPuil@N0Ou@jkNa@>!pXjgCp^!MZtyt_b0TF8iQB}763(obCyzc+ zc3R^iuFG@U^0{|e?frL4PbSq1$E6fhWrVHYS>!jo&ivz<>eD}m)z7%L9S&;xc8D?g zaN)rZm|JLfId_S{?oKx+O%OI7ihDnA{Tm+3kqm847;Q)U&fUu+HW=NE{ECL``4eX{ zrj0S=PBlm$G`a-N$?W^k`H%1VHYQ1~eWKF#o>!O)?lCXp0-mRN@JX|)~;{(r>!%?gJ z7cLftd*@6m+3uZ?!rt8})g4<}S}Alb??(%KbCUp@{#Bl_d7bRjtaHZm7xt_>GNY!$gMF)X!u(5N znT5e6P}Q0iK}S|~VsY|`8=H48IZmTXr@(CxZ9$DLZ|f=XxwbRszTdAceE1NOnuz>9 zR>Nut8c?JMTW*{p0#%ufOiXQ7;>Bo0ioV5(%Cq$_c)-XvlCvUfj&u2)MK zlX(iZ!Xm|W`mhWFkI9IPRb?crL~2IhSXXfx3J8oiiP6)H29p&{lQ8VOD7dD~EC$^U zA(JJHI7Jj)Y9??xm&s+aVOg3!6=95ZrHcu*28|9G-$McJBn%x%T2L0tX0tJE0ZcQY zWpP9z5sQtm5CjGY*qUx4u{79Z^`$7fIYMx&iqKm~z1c*kI5DL;g_JNDV4U7V4n|e7 zG+^urK;7Hvt)!YI2RB?W9{^w>Y_pFmR30K>Q2C;2vr4Zwdfp@s`%z!T;wMFJS(fh)E^g@|w*K`@@c zfnp+|2c3W!9J8XR)PM@%AbfrRhXX6sY5~mU^HqQp5x@alzEX&BG(x2kvr|#)fCfd$ zB@BegerAa>V5G)O7(sjKO=`2v`fMmxZ^UCrjFOEb;Bb)ugwGXl1OYrQ?-}R=oUnp2 zr&u{`CW6>U)GBm5;KV?=>5Z5cXIV^I`vA2tD3}hA7NfcYFx%~5HmH=qG15%Ln#~3Y zgUXgpQQDh|F79a;G{UU1JKDjxn(DZoo(smbEc>mP^)m3Em|}Eho9Tb!c?NyT5=4+T zGm$)zn5ay`RpiTgUIc#16b*JeD@mlw|6)@AffIKZY#8u06X_1|WAN$Scimf(L2s9e zPPcCZD5mO`--@N;YWorZ9lM8AI?SZS!G7D*Y)|a^7Zfs=qf`rd7!G5YN(plXJOsx0 z2o4JZL~IqCuNETQfalq*W({e>2s}s&Y5=S=XfFFY(?|5w-^l0jHXTkC7aQTiY%Yul zVmU&T%SG7&M)zvd#Vl%veKK1ywFfB_sG}ZYYL7zYR3XNsSS$uTPCT#Ele+mYI0yfp z8vQGGM_9MF)NDxyU92M~+DtDE{{mn)Lxf(1o2=%SrS1snmc`*90y%fvzySx&OV-l^ zv!_a^M*16HJ=OO&MgY{WgS?WyujP6z*DERTO5oSk^;)i1Qs9-qudD0-CYS58M{e8% z{_nGa2WrLUJN?1KxRY{1Xb6-;y*JFt=K+h0B`n?wLH!3&pI%U5(LaEZM#>d3+SR^; z2l&&jMnCWYCR8306bpVmZJF%?(cStSXll=DYH7Ua5j?QnG Date: Sun, 29 Sep 2024 17:35:03 +0300 Subject: [PATCH 07/15] hid --- .../_NF/Catalog/Fills/Items/document_cases_expedition.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml index 61b51323fce..154aa3d7f78 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml @@ -3,7 +3,7 @@ parent: WeaponCaseShortDocuments id: WeaponCaseShortDocumentsFilled suffix: Dungeon, Blueprints - #categories: [ HideSpawnMenu ] + categories: [ HideSpawnMenu ] components: - type: StorageFill contents: From 9d8fc9e636b1085618938d51a9e9fece2b9dd328 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 29 Sep 2024 17:39:48 +0300 Subject: [PATCH 08/15] exped blueprints pricing --- .../_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml index 0ecd5612aac..1a838fe4885 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml @@ -335,3 +335,5 @@ stampType: RubberStamp stampedColor: '#1F66A0FF' stampedName: stamp-component-stamped-name-rd + - type: StaticPrice + price: 1000 From 09e958646ae98a64cc90d65786ce173dfa768509 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 29 Sep 2024 11:46:27 -0400 Subject: [PATCH 09/15] Delete sensitive documents on fax (no dupes) --- Content.Server/Fax/FaxSystem.cs | 26 +++++++++++++++++++ Content.Shared/Paper/PaperComponent.cs | 11 ++++++++ Resources/Locale/en-US/_NF/fax/fax.ftl | 1 + .../Tools/blueprints/blueprints_base.yml | 3 +++ 4 files changed, 41 insertions(+) create mode 100644 Resources/Locale/en-US/_NF/fax/fax.ftl diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs index 0a3a294f92b..38b781970f2 100644 --- a/Content.Server/Fax/FaxSystem.cs +++ b/Content.Server/Fax/FaxSystem.cs @@ -477,6 +477,13 @@ public void Copy(EntityUid uid, FaxMachineComponent? component, FaxCopyMessage a // Don't play component.SendSound - it clashes with the printing sound, which // will start immediately. + // Frontier: check if paper should be destroyed on sending. + if (paper.DestroyOnFax) + { + DeleteFax(uid, sendEntity.Value, paper); + } + // End Frontier + UpdateUserInterface(uid, component); _adminLogger.Add(LogType.Action, @@ -550,6 +557,13 @@ public void Send(EntityUid uid, FaxMachineComponent? component, FaxSendMessage a _audioSystem.PlayPvs(component.SendSound, uid); + // Frontier: check if paper should be destroyed on sending. + if (paper.DestroyOnFax) + { + DeleteFax(uid, sendEntity.Value, paper); + } + // End Frontier + UpdateUserInterface(uid, component); } @@ -616,4 +630,16 @@ private void NotifyAdmins(string faxName) _chat.SendAdminAnnouncement(Loc.GetString("fax-machine-chat-notify", ("fax", faxName))); _audioSystem.PlayGlobal("/Audio/Machines/high_tech_confirm.ogg", Filter.Empty().AddPlayers(_adminManager.ActiveAdmins), false, AudioParams.Default.WithVolume(-8f)); } + + // Frontier: delete sensitive items on fax to prevent duplication + private void DeleteFax(EntityUid faxMachine, EntityUid itemToFax, PaperComponent paper) + { + if (paper.DestroyMessage != null) + { + _popupSystem.PopupEntity(Loc.GetString(paper.DestroyMessage), faxMachine); + } + + Del(itemToFax); + } + // End Frontier } diff --git a/Content.Shared/Paper/PaperComponent.cs b/Content.Shared/Paper/PaperComponent.cs index cd0758589db..1bb98d93f40 100644 --- a/Content.Shared/Paper/PaperComponent.cs +++ b/Content.Shared/Paper/PaperComponent.cs @@ -32,6 +32,17 @@ public sealed partial class PaperComponent : Component [DataField("sound")] public SoundSpecifier? Sound { get; private set; } = new SoundCollectionSpecifier("PaperScribbles", AudioParams.Default.WithVariation(0.1f)); + // Frontier: + /// + /// Sound played after writing to the paper. + /// + [DataField] + public bool DestroyOnFax { get; private set; } + + [DataField] + public string? DestroyMessage { get; private set; } + // End Frontier + [Serializable, NetSerializable] public sealed class PaperBoundUserInterfaceState : BoundUserInterfaceState { diff --git a/Resources/Locale/en-US/_NF/fax/fax.ftl b/Resources/Locale/en-US/_NF/fax/fax.ftl new file mode 100644 index 00000000000..c89eef5d443 --- /dev/null +++ b/Resources/Locale/en-US/_NF/fax/fax.ftl @@ -0,0 +1 @@ +fax-delete-paper-intellectual-property = NT intellectual property detected, destroying original document. diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml index 1a838fe4885..7be2b925657 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml @@ -89,6 +89,9 @@ abstract: true components: - type: FaxableObject # Not sure about it, but why not? If someone wants to waste their time printing free copies of blueprints for cash they can have their spesos + - type: Paper + destroyOnFax: true + destroyMessage: fax-delete-paper-intellectual-property # Faxable variants (obtainable from research) From 6c1c7e8cc2f565dae161f84b79094570fe890bc1 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 29 Sep 2024 11:55:27 -0400 Subject: [PATCH 10/15] NF prefix for blueprints --- Resources/Prototypes/Research/arsenal.yml | 8 +- .../Prototypes/Research/civilianservices.yml | 12 +- .../Prototypes/Research/experimental.yml | 3 +- Resources/Prototypes/Research/industrial.yml | 24 +-- .../Fills/Items/document_cases_expedition.yml | 20 +- .../Tools/blueprints/blueprints_armory.yml | 16 +- .../Tools/blueprints/blueprints_base.yml | 20 +- .../blueprints/blueprints_engineering.yml | 48 ++--- .../blueprints/blueprints_expedition_loot.yml | 24 +-- .../Tools/blueprints/blueprints_medical.yml | 12 +- .../Tools/blueprints/blueprints_salvage.yml | 16 +- .../Tools/blueprints/blueprints_science.yml | 20 +- .../Tools/blueprints/blueprints_service.yml | 12 +- .../Entities/Structures/Machines/lathe.yml | 62 +++--- .../_NF/Recipes/Lathes/blueprints.yml | 184 +++++++++--------- .../Prototypes/_NF/Research/experimental.yml | 8 +- .../Prototypes/_NF/Research/industrial.yml | 4 +- 17 files changed, 247 insertions(+), 246 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 4e0f8bb5c64..fb4af9818fa 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -124,7 +124,7 @@ - FlashPayload - ExplosivePayload - ChemicalPayload - - BlueprintSignallerAdvancedNF # Frontier + - NFBlueprintSignallerAdvanced # Frontier - type: technology id: SpecialMeans @@ -201,8 +201,8 @@ - WeaponAdvancedLaser - PortableRecharger - WeaponAntiqueLaserNF # Frontier - - BlueprintWeaponAntiqueLaserNF # Frontier - - BlueprintPortableRechargerNF # Frontier + - NFBlueprintWeaponAntiqueLaser # Frontier + - NFBlueprintPortableRecharger # Frontier - type: technology id: ExperimentalBatteryAmmo @@ -215,7 +215,7 @@ cost: 15000 recipeUnlocks: - WeaponLaserSvalinn - - BlueprintWeaponLaserSvalinnNF # Frontier + - NFBlueprintWeaponLaserSvalinn # Frontier - type: technology id: AdvancedShuttleWeapon diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 466a3d3f18d..b9a97db51c1 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -17,8 +17,8 @@ - HydroponicsTrayMachineCircuitboard - ReagentGrinderIndustrialMachineCircuitboard - PlantAnalyzer # Frontier - - BlueprintPlantAnalyzerEmptyNF # Frontier - - BlueprintPlantBagOfHoldingNF # Frontier + - NFBlueprintPlantAnalyzerEmpty # Frontier + - NFBlueprintPlantBagOfHolding # Frontier - type: technology id: CritterMechs @@ -179,7 +179,7 @@ recipeUnlocks: - AdvMopItem - MegaSprayBottle - - BlueprintAdvMopItemNF # Frontier + - NFBlueprintAdvMopItem # Frontier - type: technology id: HONKMech @@ -253,6 +253,6 @@ - BluespaceBeaker - SyringeBluespace - VialBluespace # Frontier - - BlueprintBluespaceBeakerNF # Frontier - - BlueprintSyringeBluespaceNF # Frontier - - BlueprintVialBluespaceNF # Frontier + - NFBlueprintBluespaceBeaker # Frontier + - NFBlueprintSyringeBluespace # Frontier + - NFBlueprintVialBluespace # Frontier diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 45aa31c7608..a6590f2a17e 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -126,6 +126,7 @@ technologyPrerequisites: - BasicAnomalousResearch +# TODO: migrate this tech to an _NF folder - type: technology id: RapidPartExchange name: research-technology-rped @@ -137,7 +138,7 @@ cost: 7500 recipeUnlocks: - RPED - - BlueprintRpedNF # Frontier + - NFBlueprintRped # Frontier # - type: technology # id: DeterrenceTechnologies diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 8d5c8ba16c0..bee26c204f5 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -173,9 +173,9 @@ - UtilityBeltChiefEngineer - BorgModuleAdvancedTool - BorgModuleRCD - - BlueprintPowerDrillNF # Frontier - - BlueprintJawsOfLifeNF # Frontier - - BlueprintWelderExperimentalNF # Frontier + - NFBlueprintPowerDrill # Frontier + - NFBlueprintJawsOfLife # Frontier + - NFBlueprintWelderExperimental # Frontier - type: technology id: MassExcavation @@ -190,9 +190,9 @@ - OreBagOfHolding - MiningDrillDiamond - AdvancedMineralScannerEmpty - - BlueprintOreBagOfHoldingNF # Frontier - - BlueprintMiningDrillDiamondNF # Frontier - - BlueprintAdvancedMineralScannerEmptyNF # Frontier + - NFBlueprintOreBagOfHolding # Frontier + - NFBlueprintMiningDrillDiamond # Frontier + - NFBlueprintAdvancedMineralScannerEmpty # Frontier # Tier 3 @@ -210,10 +210,10 @@ - ClothingBackpackSatchelHolding - ClothingBackpackDuffelHolding - ClothingBackpackMessengerHolding # Frontier - - BlueprintClothingBackpackHoldingNF # Frontier - - BlueprintClothingBackpackSatchelHoldingNF # Frontier - - BlueprintClothingBackpackDuffelHoldingNF # Frontier - - BlueprintClothingBackpackMessengerHoldingNF # Frontier + - NFBlueprintClothingBackpackHolding # Frontier + - NFBlueprintClothingBackpackSatchelHolding # Frontier + - NFBlueprintClothingBackpackDuffelHolding # Frontier + - NFBlueprintClothingBackpackMessengerHolding # Frontier - type: technology id: PortableFission @@ -226,7 +226,7 @@ cost: 10000 recipeUnlocks: - PowerCellMicroreactor - - BlueprintPowerCellMicroreactorNF # Frontier + - NFBlueprintPowerCellMicroreactor # Frontier technologyPrerequisites: - AdvancedPowercells @@ -242,4 +242,4 @@ recipeUnlocks: - ShipyardRCD # Frontier - ShipyardRCDAmmo # Frontier - - BlueprintShipyardRCDAmmoNF # Frontier + - NFBlueprintShipyardRCDAmmo # Frontier diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml index 154aa3d7f78..86f60338ac1 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml @@ -7,33 +7,33 @@ components: - type: StorageFill contents: - - id: BlueprintBoxShotgunUraniumNF + - id: NFBlueprintBoxShotgunUranium prob: 0.2 orGroup: Blueprints - - id: BlueprintMagazineBoxRifleUraniumNF + - id: NFBlueprintMagazineBoxRifleUranium prob: 0.2 orGroup: Blueprints - - id: BlueprintMagazineBoxLightRifleUraniumNF + - id: NFBlueprintMagazineBoxLightRifleUranium prob: 0.2 orGroup: Blueprints - - id: BlueprintMagazineBoxMagnumUraniumNF + - id: NFBlueprintMagazineBoxMagnumUranium prob: 0.2 orGroup: Blueprints - - id: BlueprintMagazineBoxPistolUraniumNF + - id: NFBlueprintMagazineBoxPistolUranium prob: 0.2 orGroup: Blueprints - - id: BlueprintBoxShotgunIncendiaryNF + - id: NFBlueprintBoxShotgunIncendiary prob: 0.2 orGroup: Blueprints - - id: BlueprintMagazineBoxRifleIncendiaryNF + - id: NFBlueprintMagazineBoxRifleIncendiary prob: 0.2 orGroup: Blueprints - - id: BlueprintMagazineBoxMagnumIncendiaryNF + - id: NFBlueprintMagazineBoxMagnumIncendiary prob: 0.2 orGroup: - - id: BlueprintWeaponLaserCannonNF + - id: NFBlueprintWeaponLaserCannon prob: 0.2 orGroup: Blueprints - - id: BlueprintWeaponXrayCannonNF + - id: NFBlueprintWeaponXrayCannon prob: 0.2 orGroup: Blueprints diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml index 940c06cfa21..b49d9b45fac 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml @@ -1,17 +1,17 @@ - type: entity - parent: BaseBlueprintArmoryNF - id: BlueprintWeaponAntiqueLaserNF + parent: NFBaseBlueprintArmory + id: NFBlueprintWeaponAntiqueLaser name: antique laser blueprint description: A blueprint with a schematic of an antique laser. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: - - WeaponAntiqueLaserNF + - NFWeaponAntiqueLaser - type: entity - parent: BaseBlueprintArmoryNF - id: BlueprintWeaponLaserSvalinnNF + parent: NFBaseBlueprintArmory + id: NFBlueprintWeaponLaserSvalinn name: svalinn pistol blueprint description: A blueprint with a schematic of a svalinn pistol. It can be inserted into an autolathe or a techfab. components: @@ -20,8 +20,8 @@ - WeaponLaserSvalinn - type: entity - parent: BaseBlueprintArmoryNF - id: BlueprintPortableRechargerNF + parent: NFBaseBlueprintArmory + id: NFBlueprintPortableRecharger name: portable recharger blueprint description: A blueprint with a schematic of a portable recharger. It can be inserted into an autolathe or a techfab. components: @@ -30,7 +30,7 @@ - PortableRecharger - type: entity - parent: BaseBlueprintArmoryNF + parent: NFBaseBlueprintArmory id: BlueprintClothingOuterHardsuitScaf name: scaf hardsuit blueprint description: A blueprint with a schematic of a scaf hardsuit. It can be inserted into an autolathe or a techfab. diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml index 7be2b925657..29363255068 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml @@ -1,6 +1,6 @@ - type: entity parent: BaseBlueprint - id: BaseBlueprintNF + id: NFBaseBlueprint abstract: true components: - type: Sprite @@ -84,7 +84,7 @@ Quantity: 0.1 - type: entity - parent: BaseBlueprintNF + parent: NFBaseBlueprint id: BaseBlueprintFaxable abstract: true components: @@ -97,7 +97,7 @@ - type: entity # Engineering parent: BaseBlueprintFaxable - id: BaseBlueprintEngineeringNF + id: NFBaseBlueprintEngineering abstract: true components: - type: Sprite @@ -126,7 +126,7 @@ - type: entity # Salvage / Cargo parent: BaseBlueprintFaxable - id: BaseBlueprintSalvageNF + id: NFBaseBlueprintSalvage abstract: true components: - type: Sprite @@ -155,7 +155,7 @@ - type: entity # Science parent: BaseBlueprintFaxable - id: BaseBlueprintScienceNF + id: NFBaseBlueprintScience abstract: true components: - type: Sprite @@ -184,7 +184,7 @@ - type: entity # Service parent: BaseBlueprintFaxable - id: BaseBlueprintServiceNF + id: NFBaseBlueprintService abstract: true components: - type: Sprite @@ -213,7 +213,7 @@ - type: entity # Medical parent: BaseBlueprintFaxable - id: BaseBlueprintMedicalNF + id: NFBaseBlueprintMedical abstract: true components: - type: Sprite @@ -242,7 +242,7 @@ - type: entity # Armory parent: BaseBlueprintFaxable - id: BaseBlueprintArmoryNF + id: NFBaseBlueprintArmory abstract: true components: - type: Sprite @@ -271,7 +271,7 @@ - type: entity # Church parent: BaseBlueprintFaxable - id: BaseBlueprintChurchNF + id: NFBaseBlueprintChurch abstract: true components: - type: Sprite @@ -304,7 +304,7 @@ # Non-faxable variants (obtainable from expeditions) - type: entity # Armory - parent: [ BaseC3Contraband, BaseBlueprintNF ] + parent: [ BaseC3Contraband, NFBaseBlueprint ] id: BaseBlueprintExpedition abstract: true components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml index 11da757ee16..f786df26b81 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml @@ -1,7 +1,7 @@ # Advanced Tools - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintPowerDrillNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintPowerDrill name: power drill blueprint description: A blueprint with a schematic of a power drill. It can be inserted into an autolathe or a techfab. components: @@ -10,8 +10,8 @@ - PowerDrill - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintJawsOfLifeNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintJawsOfLife name: jaws of life blueprint description: A blueprint with a schematic of a jaws of life. It can be inserted into an autolathe or a techfab. components: @@ -20,8 +20,8 @@ - JawsOfLife - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintWelderExperimentalNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintWelderExperimental name: experimental welder blueprint description: A blueprint with a schematic of an experimental welder. It can be inserted into an autolathe or a techfab. components: @@ -30,8 +30,8 @@ - WelderExperimental - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintShipyardRCDAmmoNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintShipyardRCDAmmo name: shipyard compressed matter blueprint description: A blueprint with a schematic of a shipyard compressed matter. It can be inserted into an autolathe or a techfab. components: @@ -41,8 +41,8 @@ # Power cells - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintPowerCellMediumPrintedNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintPowerCellMediumPrinted name: medium-capacity power cell blueprint description: A blueprint with a schematic of a medium-capacity power cell. It can be inserted into an autolathe or a techfab. components: @@ -51,8 +51,8 @@ - PowerCellMedium - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintPowerCellMicroreactorNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintPowerCellMicroreactor name: microreactor blueprint description: A blueprint with a schematic of a microreactor. It can be inserted into an autolathe or a techfab. components: @@ -62,8 +62,8 @@ # Devices - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintSignallerAdvancedNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintSignallerAdvanced name: advanced signaller blueprint description: A blueprint with a schematic of an advanced signaller. It can be inserted into an autolathe or a techfab. components: @@ -72,8 +72,8 @@ - SignallerAdvanced - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintClothingBackpackHoldingNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintClothingBackpackHolding name: bluespace backpack blueprint description: A blueprint with a schematic of a bluespace backpack. It can be inserted into an autolathe or a techfab. components: @@ -82,8 +82,8 @@ - ClothingBackpackHolding - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintClothingBackpackSatchelHoldingNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintClothingBackpackSatchelHolding name: bluespace satchel blueprint description: A blueprint with a schematic of a bluespace satchel. It can be inserted into an autolathe or a techfab. components: @@ -92,8 +92,8 @@ - ClothingBackpackSatchelHolding - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintClothingBackpackMessengerHoldingNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintClothingBackpackMessengerHolding name: bluespace messenger bag blueprint description: A blueprint with a schematic of a bluespace messenger bag. It can be inserted into an autolathe or a techfab. components: @@ -102,8 +102,8 @@ - ClothingBackpackMessengerHolding - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintClothingBackpackDuffelHoldingNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintClothingBackpackDuffelHolding name: bluespace duffel blueprint description: A blueprint with a schematic of a bluespace duffel. It can be inserted into an autolathe or a techfab. components: @@ -112,8 +112,8 @@ - ClothingBackpackDuffelHolding - type: entity - parent: BaseBlueprintEngineeringNF - id: BlueprintConstructionBagOfHoldingNF + parent: NFBaseBlueprintEngineering + id: NFBlueprintConstructionBagOfHolding name: bluespace construction bag blueprint description: A blueprint with a schematic of a bluespace construction bag. It can be inserted into an autolathe or a techfab. components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml index c19ca689d59..2fa455a60c9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml @@ -4,7 +4,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintBoxShotgunUraniumNF + id: NFBlueprintBoxShotgunUranium name: uranium shotgun ammo blueprint description: A blueprint with a schematic of an uranium shotgun ammo. It can be inserted into an autolathe or a techfab. components: @@ -14,7 +14,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintMagazineBoxRifleUraniumNF + id: NFBlueprintMagazineBoxRifleUranium name: uranium .20 ammo blueprint description: A blueprint with a schematic of an uranium .20 rifle ammo. It can be inserted into an autolathe or a techfab. components: @@ -24,7 +24,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintMagazineBoxLightRifleUraniumNF + id: NFBlueprintMagazineBoxLightRifleUranium name: uranium .30 ammo blueprint description: A blueprint with a schematic of an uranium .30 rifle ammo. It can be inserted into an autolathe or a techfab. components: @@ -34,7 +34,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintMagazineBoxMagnumUraniumNF + id: NFBlueprintMagazineBoxMagnumUranium name: uranium .45 ammo blueprint description: A blueprint with a schematic of an uranium .45 ammo. It can be inserted into an autolathe or a techfab. components: @@ -44,7 +44,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintMagazineBoxPistolUraniumNF + id: NFBlueprintMagazineBoxPistolUranium name: uranium .35 ammo blueprint description: A blueprint with a schematic of an uranium .35 ammo. It can be inserted into an autolathe or a techfab. components: @@ -56,7 +56,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintBoxShotgunIncendiaryNF + id: NFBlueprintBoxShotgunIncendiary name: incendiary shotgun ammo blueprint description: A blueprint with a schematic of an incendiary shotgun ammo. It can be inserted into an autolathe or a techfab. components: @@ -66,7 +66,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintMagazineBoxRifleIncendiaryNF + id: NFBlueprintMagazineBoxRifleIncendiary name: incendiary .20 ammo blueprint description: A blueprint with a schematic of an incendiary .20 rifle ammo. It can be inserted into an autolathe or a techfab. components: @@ -76,7 +76,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintMagazineBoxLightRifleIncendiaryNF + id: NFBlueprintMagazineBoxLightRifleIncendiary name: incendiary .30 ammo blueprint description: A blueprint with a schematic of an incendiary .30 rifle ammo. It can be inserted into an autolathe or a techfab. components: @@ -86,7 +86,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintMagazineBoxMagnumIncendiaryNF + id: NFBlueprintMagazineBoxMagnumIncendiary name: incendiary .45 ammo blueprint description: A blueprint with a schematic of an incendiary .45 ammo. It can be inserted into an autolathe or a techfab. components: @@ -96,7 +96,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintMagazineBoxPistolIncendiaryNF + id: NFBlueprintMagazineBoxPistolIncendiary name: incendiary .35 ammo blueprint description: A blueprint with a schematic of an incendiary .35 ammo. It can be inserted into an autolathe or a techfab. components: @@ -108,7 +108,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintWeaponLaserCannonNF + id: NFBlueprintWeaponLaserCannon name: laser cannon blueprint description: A blueprint with a schematic of a laser cannon. It can be inserted into an autolathe or a techfab. components: @@ -118,7 +118,7 @@ - type: entity parent: BaseBlueprintExpedition - id: BlueprintWeaponXrayCannonNF + id: NFBlueprintWeaponXrayCannon name: x-ray cannon blueprint description: A blueprint with a schematic of a x-ray cannon. It can be inserted into an autolathe or a techfab. components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml index 2d7028e6b32..9329baa46f3 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml @@ -1,7 +1,7 @@ - type: entity - parent: BaseBlueprintMedicalNF - id: BlueprintBluespaceBeakerNF + parent: NFBaseBlueprintMedical + id: NFBlueprintBluespaceBeaker name: bluespace beaker blueprint description: A blueprint with a schematic of a bluespace beaker. It can be inserted into an autolathe or a techfab. components: @@ -10,8 +10,8 @@ - BluespaceBeaker - type: entity - parent: BaseBlueprintMedicalNF - id: BlueprintSyringeBluespaceNF + parent: NFBaseBlueprintMedical + id: NFBlueprintSyringeBluespace name: bluespace syringe blueprint description: A blueprint with a schematic of a bluespace syringe. It can be inserted into an autolathe or a techfab. components: @@ -20,8 +20,8 @@ - SyringeBluespace - type: entity - parent: BaseBlueprintMedicalNF - id: BlueprintVialBluespaceNF + parent: NFBaseBlueprintMedical + id: NFBlueprintVialBluespace name: bluespace syringe blueprint description: A blueprint with a schematic of a bluespace vial. It can be inserted into an autolathe or a techfab. components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_salvage.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_salvage.yml index ea539946ce1..e0658147e90 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_salvage.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_salvage.yml @@ -1,7 +1,7 @@ - type: entity - parent: BaseBlueprintSalvageNF - id: BlueprintOreBagOfHoldingNF + parent: NFBaseBlueprintSalvage + id: NFBlueprintOreBagOfHolding name: bluespace ore bag blueprint description: A blueprint with a schematic of a bluespace ore bag. It can be inserted into an autolathe or a techfab. components: @@ -10,8 +10,8 @@ - OreBagOfHolding - type: entity - parent: BaseBlueprintSalvageNF - id: BlueprintMiningDrillDiamondNF + parent: NFBaseBlueprintSalvage + id: NFBlueprintMiningDrillDiamond name: diamond tipped mining drill blueprint description: A blueprint with a schematic of a diamond tipped mining drill. It can be inserted into an autolathe or a techfab. components: @@ -20,8 +20,8 @@ - MiningDrillDiamond - type: entity - parent: BaseBlueprintSalvageNF - id: BlueprintAdvancedMineralScannerEmptyNF + parent: NFBaseBlueprintSalvage + id: NFBlueprintAdvancedMineralScannerEmpty name: advanced mineral scanner blueprint description: A blueprint with a schematic of an advanced mineral scanner. It can be inserted into an autolathe or a techfab. components: @@ -30,8 +30,8 @@ - AdvancedMineralScannerEmpty - type: entity - parent: BaseBlueprintSalvageNF - id: BlueprintClothingOuterHardsuitMaximPrototypeNF + parent: NFBaseBlueprintSalvage + id: NFBlueprintClothingOuterHardsuitMaximPrototype name: experimental salvager hardsuit blueprint description: A blueprint with a schematic of an experimental salvager hardsuit. It can be inserted into an autolathe or a techfab. components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_science.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_science.yml index 2c59f72ca3c..4a6f8163132 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_science.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_science.yml @@ -1,7 +1,7 @@ - type: entity - parent: BaseBlueprintScienceNF - id: BlueprintRpedNF + parent: NFBaseBlueprintScience + id: NFBlueprintRped name: RPED blueprint description: A blueprint with a schematic of a RPED. It can be inserted into an autolathe or a techfab. components: @@ -10,8 +10,8 @@ - RPED - type: entity - parent: BaseBlueprintScienceNF - id: BlueprintSuperCapacitorStockPartNF + parent: NFBaseBlueprintScience + id: NFBlueprintSuperCapacitorStockPart name: super capacitor blueprint description: A blueprint with a schematic of a super capacitor. It can be inserted into an autolathe or a techfab. components: @@ -20,8 +20,8 @@ - SuperCapacitorStockPart - type: entity - parent: BaseBlueprintScienceNF - id: BlueprintPicoManipulatorStockPartNF + parent: NFBaseBlueprintScience + id: NFBlueprintPicoManipulatorStockPart name: super manipulator blueprint description: A blueprint with a schematic of a super manipulator. It can be inserted into an autolathe or a techfab. components: @@ -30,8 +30,8 @@ - PicoManipulatorStockPart - type: entity - parent: BaseBlueprintScienceNF - id: BlueprintSuperMatterBinStockPartNF + parent: NFBaseBlueprintScience + id: NFBlueprintSuperMatterBinStockPart name: super matter bin blueprint description: A blueprint with a schematic of a super matter bin. It can be inserted into an autolathe or a techfab. components: @@ -40,8 +40,8 @@ - SuperMatterBinStockPart - type: entity - parent: BaseBlueprintScienceNF - id: BlueprintClothingShoesBootsMagAdvNF + parent: NFBaseBlueprintScience + id: NFBlueprintClothingShoesBootsMagAdv name: advanced magboots blueprint description: A blueprint with a schematic of an advanced magboots. It can be inserted into an autolathe or a techfab. components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml index b2ffce7808d..821b57de609 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml @@ -1,7 +1,7 @@ - type: entity - parent: BaseBlueprintServiceNF - id: BlueprintAdvMopItemNF + parent: NFBaseBlueprintService + id: NFBlueprintAdvMopItem name: advanced mop blueprint description: A blueprint with a schematic of an advanced mop. It can be inserted into an autolathe or a techfab. components: @@ -10,8 +10,8 @@ - AdvMopItem - type: entity - parent: BaseBlueprintServiceNF - id: BlueprintPlantAnalyzerEmptyNF + parent: NFBaseBlueprintService + id: NFBlueprintPlantAnalyzerEmpty name: plant analyzer blueprint description: A blueprint with a schematic of a plant analyzer. It can be inserted into an autolathe or a techfab. components: @@ -20,8 +20,8 @@ - PlantAnalyzer - type: entity - parent: BaseBlueprintServiceNF - id: BlueprintPlantBagOfHoldingNF + parent: NFBaseBlueprintService + id: NFBlueprintPlantBagOfHolding name: bluespace plant bag blueprint description: A blueprint with a schematic of a bluespace plant bag. It can be inserted into an autolathe or a techfab. components: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index dee4063f975..33bf22ba2e7 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -750,44 +750,44 @@ idleState: icon runningState: building staticRecipes: - - BlueprintPowerCellMediumPrintedNF + - NFBlueprintPowerCellMediumPrinted dynamicRecipes: # Engineering - - BlueprintPowerDrillNF - - BlueprintJawsOfLifeNF - - BlueprintWelderExperimentalNF - - BlueprintShipyardRCDAmmoNF - - BlueprintPowerCellMicroreactorNF - - BlueprintSignallerAdvancedNF - - BlueprintClothingBackpackHoldingNF - - BlueprintClothingBackpackSatchelHoldingNF - - BlueprintClothingBackpackMessengerHoldingNF - - BlueprintClothingBackpackDuffelHoldingNF - - BlueprintConstructionBagOfHoldingNF - - BlueprintPortableRechargerNF + - NFBlueprintPowerDrill + - NFBlueprintJawsOfLife + - NFBlueprintWelderExperimental + - NFBlueprintShipyardRCDAmmo + - NFBlueprintPowerCellMicroreactor + - NFBlueprintSignallerAdvanced + - NFBlueprintClothingBackpackHolding + - NFBlueprintClothingBackpackSatchelHolding + - NFBlueprintClothingBackpackMessengerHolding + - NFBlueprintClothingBackpackDuffelHolding + - NFBlueprintConstructionBagOfHolding + - NFBlueprintPortableRecharger # Medical - - BlueprintBluespaceBeakerNF - - BlueprintSyringeBluespaceNF - - BlueprintVialBluespaceNF + - NFBlueprintBluespaceBeaker + - NFBlueprintSyringeBluespace + - NFBlueprintVialBluespace # Salvage - - BlueprintOreBagOfHoldingNF - - BlueprintMiningDrillDiamondNF - - BlueprintAdvancedMineralScannerEmptyNF - - BlueprintClothingOuterHardsuitMaximPrototypeNF + - NFBlueprintOreBagOfHolding + - NFBlueprintMiningDrillDiamond + - NFBlueprintAdvancedMineralScannerEmpty + - NFBlueprintClothingOuterHardsuitMaximPrototype # Science - - BlueprintRpedNF - - BlueprintSuperCapacitorStockPartNF - - BlueprintPicoManipulatorStockPartNF - - BlueprintSuperMatterBinStockPartNF - - BlueprintClothingShoesBootsMagAdvNF + - NFBlueprintRped + - NFBlueprintSuperCapacitorStockPart + - NFBlueprintPicoManipulatorStockPart + - NFBlueprintSuperMatterBinStockPart + - NFBlueprintClothingShoesBootsMagAdv # Service - - BlueprintAdvMopItemNF - - BlueprintPlantAnalyzerEmptyNF - - BlueprintPlantBagOfHoldingNF + - NFBlueprintAdvMopItem + - NFBlueprintPlantAnalyzerEmpty + - NFBlueprintPlantBagOfHolding # Armory - - BlueprintWeaponAntiqueLaserNF - - BlueprintWeaponLaserSvalinnNF - - BlueprintPortableRechargerNF + - NFBlueprintWeaponAntiqueLaser + - NFBlueprintWeaponLaserSvalinn + - NFBlueprintPortableRecharger - BlueprintClothingOuterHardsuitScaf - type: MaterialStorage whitelist: diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml index 3a4dc90681d..de7cc1a26c4 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml @@ -2,7 +2,7 @@ - type: latheRecipe abstract: true - id: BaseBlueprintLatheRecipeNF + id: NFBaseBlueprintLatheRecipe completetime: 4 materials: Paper: 500 @@ -11,166 +11,166 @@ ## Engineering - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintPowerDrillNF - result: BlueprintPowerDrillNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintPowerDrill + result: NFBlueprintPowerDrill - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintJawsOfLifeNF - result: BlueprintJawsOfLifeNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintJawsOfLife + result: NFBlueprintJawsOfLife - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintWelderExperimentalNF - result: BlueprintWelderExperimentalNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintWelderExperimental + result: NFBlueprintWelderExperimental - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintShipyardRCDAmmoNF - result: BlueprintShipyardRCDAmmoNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintShipyardRCDAmmo + result: NFBlueprintShipyardRCDAmmo - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintPowerCellMicroreactorNF - result: BlueprintPowerCellMicroreactorNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintPowerCellMicroreactor + result: NFBlueprintPowerCellMicroreactor - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintPowerCellMediumPrintedNF - result: BlueprintPowerCellMediumPrintedNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintPowerCellMediumPrinted + result: NFBlueprintPowerCellMediumPrinted - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintSignallerAdvancedNF - result: BlueprintSignallerAdvancedNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintSignallerAdvanced + result: NFBlueprintSignallerAdvanced - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintClothingBackpackHoldingNF - result: BlueprintClothingBackpackHoldingNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintClothingBackpackHolding + result: NFBlueprintClothingBackpackHolding - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintClothingBackpackSatchelHoldingNF - result: BlueprintClothingBackpackSatchelHoldingNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintClothingBackpackSatchelHolding + result: NFBlueprintClothingBackpackSatchelHolding - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintClothingBackpackMessengerHoldingNF - result: BlueprintClothingBackpackMessengerHoldingNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintClothingBackpackMessengerHolding + result: NFBlueprintClothingBackpackMessengerHolding - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintClothingBackpackDuffelHoldingNF - result: BlueprintClothingBackpackDuffelHoldingNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintClothingBackpackDuffelHolding + result: NFBlueprintClothingBackpackDuffelHolding - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintConstructionBagOfHoldingNF - result: BlueprintConstructionBagOfHoldingNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintConstructionBagOfHolding + result: NFBlueprintConstructionBagOfHolding ## Medical - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintBluespaceBeakerNF - result: BlueprintBluespaceBeakerNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintBluespaceBeaker + result: NFBlueprintBluespaceBeaker - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintSyringeBluespaceNF - result: BlueprintSyringeBluespaceNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintSyringeBluespace + result: NFBlueprintSyringeBluespace - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintVialBluespaceNF - result: BlueprintVialBluespaceNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintVialBluespace + result: NFBlueprintVialBluespace ## Salvage - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintOreBagOfHoldingNF - result: BlueprintOreBagOfHoldingNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintOreBagOfHolding + result: NFBlueprintOreBagOfHolding - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintMiningDrillDiamondNF - result: BlueprintMiningDrillDiamondNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintMiningDrillDiamond + result: NFBlueprintMiningDrillDiamond - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintAdvancedMineralScannerEmptyNF - result: BlueprintAdvancedMineralScannerEmptyNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintAdvancedMineralScannerEmpty + result: NFBlueprintAdvancedMineralScannerEmpty - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintClothingOuterHardsuitMaximPrototypeNF - result: BlueprintClothingOuterHardsuitMaximPrototypeNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintClothingOuterHardsuitMaximPrototype + result: NFBlueprintClothingOuterHardsuitMaximPrototype ## Science - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintRpedNF - result: BlueprintRpedNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintRped + result: NFBlueprintRped - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintSuperCapacitorStockPartNF - result: BlueprintSuperCapacitorStockPartNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintSuperCapacitorStockPart + result: NFBlueprintSuperCapacitorStockPart - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintPicoManipulatorStockPartNF - result: BlueprintPicoManipulatorStockPartNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintPicoManipulatorStockPart + result: NFBlueprintPicoManipulatorStockPart - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintSuperMatterBinStockPartNF - result: BlueprintSuperMatterBinStockPartNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintSuperMatterBinStockPart + result: NFBlueprintSuperMatterBinStockPart - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintClothingShoesBootsMagAdvNF - result: BlueprintClothingShoesBootsMagAdvNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintClothingShoesBootsMagAdv + result: NFBlueprintClothingShoesBootsMagAdv ## Service - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintAdvMopItemNF - result: BlueprintAdvMopItemNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintAdvMopItem + result: NFBlueprintAdvMopItem - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintPlantAnalyzerEmptyNF - result: BlueprintPlantAnalyzerEmptyNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintPlantAnalyzerEmpty + result: NFBlueprintPlantAnalyzerEmpty - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintPlantBagOfHoldingNF - result: BlueprintPlantBagOfHoldingNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintPlantBagOfHolding + result: NFBlueprintPlantBagOfHolding ## Armory - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintWeaponAntiqueLaserNF - result: BlueprintWeaponAntiqueLaserNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintWeaponAntiqueLaser + result: NFBlueprintWeaponAntiqueLaser - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintWeaponLaserSvalinnNF - result: BlueprintWeaponLaserSvalinnNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintWeaponLaserSvalinn + result: NFBlueprintWeaponLaserSvalinn - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF - id: BlueprintPortableRechargerNF - result: BlueprintPortableRechargerNF + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintPortableRecharger + result: NFBlueprintPortableRecharger - type: latheRecipe - parent: BaseBlueprintLatheRecipeNF + parent: NFBaseBlueprintLatheRecipe id: BlueprintClothingOuterHardsuitScaf result: BlueprintClothingOuterHardsuitScaf diff --git a/Resources/Prototypes/_NF/Research/experimental.yml b/Resources/Prototypes/_NF/Research/experimental.yml index f1472e46522..30cfc8a2e3c 100644 --- a/Resources/Prototypes/_NF/Research/experimental.yml +++ b/Resources/Prototypes/_NF/Research/experimental.yml @@ -13,9 +13,9 @@ - SuperCapacitorStockPart - SuperMatterBinStockPart - PicoManipulatorStockPart - - BlueprintSuperCapacitorStockPartNF - - BlueprintPicoManipulatorStockPartNF - - BlueprintSuperMatterBinStockPartNF + - NFBlueprintSuperCapacitorStockPart + - NFBlueprintPicoManipulatorStockPart + - NFBlueprintSuperMatterBinStockPart - type: technology id: MagnetsTechAdvanced @@ -28,7 +28,7 @@ cost: 10000 recipeUnlocks: - ClothingShoesBootsMagAdv - - BlueprintClothingShoesBootsMagAdvNF + - NFBlueprintClothingShoesBootsMagAdv technologyPrerequisites: - MagnetsTech diff --git a/Resources/Prototypes/_NF/Research/industrial.yml b/Resources/Prototypes/_NF/Research/industrial.yml index 965bfed4f7a..ad7b57bb82e 100644 --- a/Resources/Prototypes/_NF/Research/industrial.yml +++ b/Resources/Prototypes/_NF/Research/industrial.yml @@ -11,7 +11,7 @@ cost: 5000 recipeUnlocks: - ConstructionBagOfHolding - - BlueprintConstructionBagOfHoldingNF + - NFBlueprintConstructionBagOfHolding - type: technology id: HardsuitsBasic @@ -79,6 +79,6 @@ - ClothingOuterHardsuitMaximPrototype - ClothingHeadHelmetAncient - ClothingOuterHardsuitAncientEVA - - BlueprintClothingOuterHardsuitMaximPrototypeNF + - NFBlueprintClothingOuterHardsuitMaximPrototype technologyPrerequisites: - HardsuitsAdvanced From 240338518b2642850484557661b135a2a940d7ae Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 29 Sep 2024 12:03:30 -0400 Subject: [PATCH 11/15] Fix Antique laser (NF suffix) --- .../_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml index b49d9b45fac..183f64c64e8 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml @@ -7,7 +7,7 @@ components: - type: Blueprint providedRecipes: - - NFWeaponAntiqueLaser + - WeaponAntiqueLaserNF - type: entity parent: NFBaseBlueprintArmory From dd15e5b4b373d3cb719b47e428f0cdb505fdd3c9 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 29 Sep 2024 19:09:23 +0300 Subject: [PATCH 12/15] PaperVis missing layer --- .../Tools/blueprints/blueprints_base.yml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml index 29363255068..72368939bfa 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_base.yml @@ -15,6 +15,10 @@ offset: 0.15,-0.1 map: ["enum.PaperVisualLayers.Stamp"] visible: false + - sprite: Objects/Misc/bureaucracy.rsi # Need for PaperVisuals otherwise it wont stop complaining + state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + visible: false - type: Item size: Normal sprite: _NF/Objects/Tools/blueprints.rsi @@ -112,6 +116,10 @@ offset: 0.15,-0.1 map: ["enum.PaperVisualLayers.Stamp"] visible: false + - sprite: Objects/Misc/bureaucracy.rsi # Need for PaperVisuals otherwise it wont stop complaining + state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + visible: false - type: Item size: Normal inhandVisuals: @@ -141,6 +149,10 @@ offset: 0.15,-0.1 map: ["enum.PaperVisualLayers.Stamp"] visible: false + - sprite: Objects/Misc/bureaucracy.rsi # Need for PaperVisuals otherwise it wont stop complaining + state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + visible: false - type: Item size: Normal inhandVisuals: @@ -170,6 +182,10 @@ offset: 0.15,-0.1 map: ["enum.PaperVisualLayers.Stamp"] visible: false + - sprite: Objects/Misc/bureaucracy.rsi # Need for PaperVisuals otherwise it wont stop complaining + state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + visible: false - type: Item size: Normal inhandVisuals: @@ -199,6 +215,10 @@ offset: 0.15,-0.1 map: ["enum.PaperVisualLayers.Stamp"] visible: false + - sprite: Objects/Misc/bureaucracy.rsi # Need for PaperVisuals otherwise it wont stop complaining + state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + visible: false - type: Item size: Normal inhandVisuals: @@ -228,6 +248,10 @@ offset: 0.15,-0.1 map: ["enum.PaperVisualLayers.Stamp"] visible: false + - sprite: Objects/Misc/bureaucracy.rsi # Need for PaperVisuals otherwise it wont stop complaining + state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + visible: false - type: Item size: Normal inhandVisuals: @@ -257,6 +281,10 @@ offset: 0.15,-0.1 map: ["enum.PaperVisualLayers.Stamp"] visible: false + - sprite: Objects/Misc/bureaucracy.rsi # Need for PaperVisuals otherwise it wont stop complaining + state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + visible: false - type: Item size: Normal inhandVisuals: @@ -287,6 +315,10 @@ offset: 0.15,-0.1 map: ["enum.PaperVisualLayers.Stamp"] visible: false + - sprite: Objects/Misc/bureaucracy.rsi # Need for PaperVisuals otherwise it wont stop complaining + state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + visible: false - type: Item size: Normal inhandVisuals: @@ -320,6 +352,10 @@ offset: 0.15,-0.1 map: ["enum.PaperVisualLayers.Stamp"] visible: false + - sprite: Objects/Misc/bureaucracy.rsi # Need for PaperVisuals otherwise it wont stop complaining + state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + visible: false - type: Item size: Normal inhandVisuals: From bbbebe90adfaf4c148298d5c2b2b78dcf1bc36ac Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 30 Sep 2024 20:03:03 -0400 Subject: [PATCH 13/15] Shaded in-hand blueprint sprites --- .../Tools/blueprints.rsi/inhand-left-base.png | Bin 292 -> 398 bytes .../Tools/blueprints.rsi/inhand-left-text.png | Bin 233 -> 267 bytes .../Tools/blueprints.rsi/inhand-right-base.png | Bin 302 -> 414 bytes .../Tools/blueprints.rsi/inhand-right-text.png | Bin 236 -> 273 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-left-base.png b/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-left-base.png index b4385078109ede9caf628fc264ce41c65d88d9b8..3d204ca7e9cc0b5ee71c03acad712071def067cd 100644 GIT binary patch delta 372 zcmV-)0gL{m0*(WaBYy!^Nkl)%yb5`)vSyrmD8Ht@4!8;_G>bdC!yr^c!~~f?Dg3b8D@;2lLAjed~SnSoeke z^VWL*OZ)gYe}QezUha{;Q$6Y`PkAvME%takPOW#f3+%b0d1u!qA|fK9cku;j1QNM} S_YQvm0000Px#-bqA3RCt{2+R+Y!APj|JUG{2y>OP!a zkr0BU#2zEt|K04yc33-EQnn2M00000+~w|vyC19M{bVOBG8e13@glVVWua!aXXdSQ zW)~y91L~X4SZtj`QP^*GLRGt}@=D$T%Adfim8aBxzAdLry?<3Hb^+B^m}<5E0RR91 z000000N{T}=51F4jOcuCb^y}m?ZrPnTf8&V8^uP)WNpmVwUX)Z)l5H9gi-8FG0kj` zT({hKyv{xPp6I~}SqJovv_uNi>zMXw&K7vo2|x7`9K|hhzybgO01r9=v*6Hmj{j*$ Q00000NkvXXt^-0~g7x%yLI3~& diff --git a/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-left-text.png b/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-left-text.png index 423302c2711d6ea93dcc60fb118d6da476ee15f1..744a664bc47a070b721c1b2b47460e255005cc21 100644 GIT binary patch delta 239 zcmaFK*v&LSrT&tqi(^Q|oVT|OxmpYaS|6SiE4z2#@|nozGGRbQR1u@~>>SZ>6|P9( zi0S{CIXONXaYpniF@V92{J3i$T6_d2hQB-z)qCxno2UOTmaf;o?cQ9EKfC7CnJ)7v zWnqX?Ah|=6?P-JXy*E$h(YV^7VdCGW4yxNa6%J$1#~TgT3xmRk3!`@e$XrD7zWVa7CJX@|C70a zPGgH5GZ_XzgrDy3;36+)}h;;ToA$ zJ^Bp*000000N_d1XL)CiwQ?D`yj*r}%$DY8u_MyS`>s7SS4N4keb+X_IL&+Gi~k^z z7O0W=?ddPlMep5LWdoL-Ul%!(6Y*KVuM5guyV3yw0RGe)tI3Y|!e(&!00000NkvXX Hu0mjf$)8&f diff --git a/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-right-base.png b/Resources/Textures/_NF/Objects/Tools/blueprints.rsi/inhand-right-base.png index ee28a8faabb7c53fb568e4e2b70c1c57c9fbd547..a123c9de25678cc98b19e77a4739d27fab25bc8c 100644 GIT binary patch delta 388 zcmV-~0ek+g0-ghqBYy#9Nkl3i+osfi``M*mD1F{e#mxl-d00000Xfd;FX8F^792xENtGDRmEqz9B&s_r$5t-+C zN-14>7-p7JN;1#$)O*h10KBM($g(VxZ(mVLNtR`qe7omneSh~9Rn=_}s(MDRFQKXu zW6a)T&&@h~0#sG}vAXibJ5}9&uBY@HLdfOk)&B!Te)s&e^5Rb``T`+@ydT1;#jkwv z?!WX20000000000-me)W*CMce>^vHijl|Zi+9Nd{W@b6Yn9J|2V`Ge49928V_l*wg z+4Fl<)8R5%HGQ-E*VH{dHnZ$8dO3*Eyx!L=-%0TOW!2jCI2$Z_Kyn|p*_zNE0P zxvpzhQ|r1`qwQMVmnc)#oPx#=t)FDRCt{2+Di_?FbqY}6tOk0+KVfr zNKsT%J0YKndnPa_#&Oe5UQz-8000007F9h}^<3S@ooJsgZ_)Oa*6{Z18bC@ZiO3Nt zyh83R_v&#wfO5f+!mE@$dT!R+TX^R?UyAk_egvN2r@iKh)_+<&zTXod-HwV!3e3!c>dcx#t@FH@I+5w@LVAgtG=rJ!r0002| afe*i;&~?8`)(zbN0000U*Suv?Ciw-a{ zG4A@W($f6sh)c;b4F)inaGgJS&+fLh->&@Hne}k@o`uKCt1h3M7q|Mm-MRPvWsz%F z{rWN8Jb#raL^+V`zrdfo#VvW=LyLN|`O}}tsw`|5^WT61$_!k@nS6SMDV zb@BNV_me)dbH1;Ab1UuEokw@}m~5-QZg#oUWmdgwdDTY-mm{qL%L+LZZ05AWM0_*{hB!2;OQb$4nuFf3k0001{NklYPf-N-R zwyZ52K4>W`00000004hsUe+!5*0%q)pLbky<*BMhjS~I05J}TG^kMU99J2Fc>%;h$ zYtKmjAW<41bqi_*jO|lXvH`I}=RzDCcJ%Z~VbvRV}Y0000< KMNUMnLSTaY_gmTk From 8c61b6674783c7fcf043c17fcb1935975f350e0f Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 30 Sep 2024 20:07:08 -0400 Subject: [PATCH 14/15] fix bluespace vial blueprint name --- .../Entities/Objects/Tools/blueprints/blueprints_medical.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml index 9329baa46f3..acaed0fc6b9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_medical.yml @@ -22,7 +22,7 @@ - type: entity parent: NFBaseBlueprintMedical id: NFBlueprintVialBluespace - name: bluespace syringe blueprint + name: bluespace vial blueprint description: A blueprint with a schematic of a bluespace vial. It can be inserted into an autolathe or a techfab. components: - type: Blueprint From d9bd5ea7f04299d669784058aa5845a049542ff5 Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 3 Oct 2024 14:32:24 +0300 Subject: [PATCH 15/15] Cleanup --- .../Prototypes/Research/experimental.yml | 14 ----- .../Fills/Items/document_cases_expedition.yml | 48 +++++++++--------- .../Objects/Specific/Research/rped.yml | 4 +- .../Prototypes/_NF/Research/experimental.yml | 15 ++++++ .../Specific/Research/rped.rsi/icon.png | Bin 0 -> 1030 bytes .../Research/rped.rsi/inhand-left.png | Bin 0 -> 996 bytes .../Research/rped.rsi/inhand-right.png | Bin 0 -> 1002 bytes .../Specific/Research/rped.rsi/meta.json | 22 ++++++++ 8 files changed, 63 insertions(+), 40 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/meta.json diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index a6590f2a17e..dafb1e04f81 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -126,20 +126,6 @@ technologyPrerequisites: - BasicAnomalousResearch -# TODO: migrate this tech to an _NF folder -- type: technology - id: RapidPartExchange - name: research-technology-rped - icon: - sprite: Objects/Specific/Research/rped.rsi - state: icon - discipline: Experimental - tier: 2 - cost: 7500 - recipeUnlocks: - - RPED - - NFBlueprintRped # Frontier - # - type: technology # id: DeterrenceTechnologies # name: research-technology-deterrence diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml index 86f60338ac1..c48f04862a8 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/document_cases_expedition.yml @@ -7,30 +7,30 @@ components: - type: StorageFill contents: - - id: NFBlueprintBoxShotgunUranium - prob: 0.2 - orGroup: Blueprints - - id: NFBlueprintMagazineBoxRifleUranium - prob: 0.2 - orGroup: Blueprints - - id: NFBlueprintMagazineBoxLightRifleUranium - prob: 0.2 - orGroup: Blueprints - - id: NFBlueprintMagazineBoxMagnumUranium - prob: 0.2 - orGroup: Blueprints - - id: NFBlueprintMagazineBoxPistolUranium - prob: 0.2 - orGroup: Blueprints - - id: NFBlueprintBoxShotgunIncendiary - prob: 0.2 - orGroup: Blueprints - - id: NFBlueprintMagazineBoxRifleIncendiary - prob: 0.2 - orGroup: Blueprints - - id: NFBlueprintMagazineBoxMagnumIncendiary - prob: 0.2 - orGroup: + # - id: NFBlueprintBoxShotgunUranium # While funny I think we should move this to events + # prob: 0.2 + # orGroup: Blueprints + # - id: NFBlueprintMagazineBoxRifleUranium + # prob: 0.2 + # orGroup: Blueprints + # - id: NFBlueprintMagazineBoxLightRifleUranium + # prob: 0.2 + # orGroup: Blueprints + # - id: NFBlueprintMagazineBoxMagnumUranium + # prob: 0.2 + # orGroup: Blueprints + # - id: NFBlueprintMagazineBoxPistolUranium + # prob: 0.2 + # orGroup: Blueprints + # - id: NFBlueprintBoxShotgunIncendiary + # prob: 0.2 + # orGroup: Blueprints + # - id: NFBlueprintMagazineBoxRifleIncendiary + # prob: 0.2 + # orGroup: Blueprints + # - id: NFBlueprintMagazineBoxMagnumIncendiary + # prob: 0.2 + # orGroup: Blueprints - id: NFBlueprintWeaponLaserCannon prob: 0.2 orGroup: Blueprints diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Research/rped.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Research/rped.yml index 53b7eb1c31d..cceb4e2fa4d 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Research/rped.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Research/rped.yml @@ -5,10 +5,10 @@ description: A Rapid Part Exchange Device, perfect for quickly upgrading machines. components: - type: Sprite - sprite: Objects/Specific/Research/rped.rsi + sprite: _NF/Objects/Specific/Research/rped.rsi state: icon - type: Item - sprite: Objects/Specific/Research/rped.rsi + sprite: _NF/Objects/Specific/Research/rped.rsi size: Normal - type: PartExchanger - type: Storage diff --git a/Resources/Prototypes/_NF/Research/experimental.yml b/Resources/Prototypes/_NF/Research/experimental.yml index 30cfc8a2e3c..405e6f5bddb 100644 --- a/Resources/Prototypes/_NF/Research/experimental.yml +++ b/Resources/Prototypes/_NF/Research/experimental.yml @@ -1,3 +1,18 @@ +# Tier 2 + +- type: technology + id: RapidPartExchange + name: research-technology-rped + icon: + sprite: _NF/Objects/Specific/Research/rped.rsi + state: icon + discipline: Experimental + tier: 2 + cost: 7500 + recipeUnlocks: + - RPED + - NFBlueprintRped + # Tier 3 - type: technology diff --git a/Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/icon.png b/Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cd57f65eb310d99135db23637f62292fb0b16dec GIT binary patch literal 1030 zcmV+h1o``kP)EX>4Tx04R}tkv&MmP!xqvQ?;TM5sQd8WT;LSL`5963Pq?8YK2xEOkVm2O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgbaGO3krMAq3N2#2@OU5R-E(;FK0v4znP#<(1DbA| ziC9!jrB}tkD}3m{0Q%4^Gs~Ehq&QmE*FAMp-9>m->%Kp$N6lCa@QK8;%rI@@4dUrd z+u*!U9AbG{B|aw}GwFiFk6c$ge&d{TS>Tx=Gntqt4iSsFCRUo5*{h@IUxHTPr&`;Uxv5K>Lg1e2f5rU7%KRobO}Dsht4+XW&Y2_)Aq_=9BbF zLkk}Pz1zUWbwgA3fXf|V@X3%(*_HgXglragKcjC-1O2x^*P1uC`Z-P?fF#W-eghmF z0;4&~UT^X4&gQxO+f$$45B-^Pcu$Us)c^njJV``BR9J=WRzXV}K^T1-gjPhO^)g!v z+t$klEY=dFQ1z;WDxP|gLZN>l6$J4R0tN9XZM}KXgSiwBK@Wn0r?4Q>;O?bO_mbph zVh?REogU(hJG(QxG3lkS@3Q;7nQz{k`DVWah!G>k|A;ql-_gyF1^WEOOWN&PiB81R z=}A~tsax&a8~E4a0HB2p65XH=A3p&Am}Ux0+;QxV1;2m$f_ly6x=I5?H|U2?yF6ZB zf6w2SmsdhX_V+(yVPP@Au?-v)_qd53mH6t~2CCJnz?)_Yj$;RSFD$Esbb3;l!#K+- z!L~1i`GNtW8x#Om*ET|T7$q*_Wa5CQ1Z>y&To!YgR~;E}92=&YlEz+fw^9~Mz{FLH zhQTY?4%|vvhbD#ZK*4vRb5Y-Wj`pPed`qZW@cW;_}TaKcw`SlrRrm*52%xk-#F zi~kZvp{-VInkl}p|0%=vgDvG)z4ldzg%j|XfHj^da{-)O0i!|Mt(4I}FeF?;ZeTXE zM0Nc>&d=Hqh`?OmYvtIz;Sv0}y5w;JX!U{l`9)>YZ9xc;^0G@P+yQ?ZWssF2tTYG3 zy-0skk4h6|852chuY#8o<5sVj(OWKAo)2axNyBpd)V zn@z!3qj8C3GI{;p2#8A!FcZoxbOFD3j2Hm$7f)UF-AjFT)c^nh07*qoM6N<$g7Ssk A2LJ#7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..25702f772a80db358d9b9863a119b60208a228f6 GIT binary patch literal 996 zcmVEX>4Tx04R}tkv&MmP!xqvQ?;TM5sQd8WT;LSL`5963Pq?8YK2xEOkVm2O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgbaGO3krMAq3N2#2@OU5R-E(;FK0v4znP#<(1DbA| ziC9!jrB}tkD}3m{0Q%4^Gs~Ehq&QmE*FAMp-9>m->%Kp$N6lCa@QK8;%rI@@4dUrd z+u*!U9AbG{B|aw}GwFiFk6c$ge&d{TS>Tx=Gntqt4iSsFCRUo5*{h@IUxHTPr&`;Uxv5K>Lg1e2f5rU7%KRobO}Dsht4+XW&Y2_)Aq_=9BbF zLkk}Pz1zUWbwgA3fXf|V@X3%(*_HgXglragKcjC-1O2x^*P1uC`Z-P?fF#W-eghmF z0;4&~UT^X4&gQxO+f$$45B-^Pcu$Us)c^nj8c9S!RCt{2+ObO;aTEveZ%Uzd%9?<1 zwUY(A1(jwIx=5=r2yqYs2M#ro)&E40Zh~Xr$R+Jq=yIi%YzE_GJdj`WAGDobr;{Y! zh1}&`XyyCa@(aB8?&X)?Z+Hg~5fKp)5fKp)5&eVggJVe}?i1~R!-dXTbXpHRETb80 zy}0$D;MD#I8v(u5>>y({?rE}kts2LSx}{R`I83jBUot5g6fG@#XL z;_H_NHr`fdj%6*aC{#3=dIJiD)%#u0>0HbdD{Kd7Q)|HO%_XwgEZXfRwztb@x07%G zz&v(<>WP}mTcOuh(px|)77-B<5fKp)5fKqlO6D=qos=tXe)aMA|3-Dlu=eKtNcVqy z`<%)UBPvg@?)SS>4^UKRgVm}%^4afqV~xe9k;_{$o~K&1rPH}Up|A=7I6prFrX0zu zHNZYNmat){<9f2YQ&ee!<9c#*xF0%ny}s@ximAE-hKmSZmN3SsG{JE_F~&^Hm4x~s zI9^P>R>^4WfZd&9re3Rz#2L?Zw)io2T-62y1q~PGxSpJxHfFvWPfi=+xZZu7uw3@t zhuCq|{sM!+AavargYjQ3iF&P)2^txdD{6fbwG%pQo}bn%KkD6qdE_Q~Wc~vD7uCza SB`6;N0000EX>4Tx04R}tkv&MmP!xqvQ?;TM5sQd8WT;LSL`5963Pq?8YK2xEOkVm2O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgbaGO3krMAq3N2#2@OU5R-E(;FK0v4znP#<(1DbA| ziC9!jrB}tkD}3m{0Q%4^Gs~Ehq&QmE*FAMp-9>m->%Kp$N6lCa@QK8;%rI@@4dUrd z+u*!U9AbG{B|aw}GwFiFk6c$ge&d{TS>Tx=Gntqt4iSsFCRUo5*{h@IUxHTPr&`;Uxv5K>Lg1e2f5rU7%KRobO}Dsht4+XW&Y2_)Aq_=9BbF zLkk}Pz1zUWbwgA3fXf|V@X3%(*_HgXglragKcjC-1O2x^*P1uC`Z-P?fF#W-eghmF z0;4&~UT^X4&gQxO+f$$45B-^Pcu$Us)c^njAW1|)RCt{2+RtkfK@6cmarrh=_=Yh=_=Y?y&m$mL!>fZ`zk7eeo=qCg)7p zjcm@6$4{P3jDL5(gg$fIO6BE=1^0U$jD~~IobLw>W^C993C|A@>R`DrYVbCuwQHeip9mtQ*d(f)pBrfwMMjxhin zAMIxVVCnhmu^rLlrllDtwl@e|Eq-mS4ge?=o=UN}I5BTE>v+`!jTo?YQ!0wQQsaw&Ti&_irbfvi0>X+55C@Bu1hF_<0MV|D2$dGExNF zaYZQ=8Owyk1=xG^5vA^nv1Gi-ZEngRd%WJ(8-W{mJxMPd=$1)+&2^ft=f!AJ2DI=#~bEB5gg$#>jLZZ)L+?=%f@IkTJ^CvRm Y5AEC7FtIj)O8@`>07*qoM6N<$f|jn^BLDyZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/meta.json new file mode 100644 index 00000000000..99acaed8489 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Research/rped.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands created by EmoGarbage404", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}