From 4f5c7fd7632c6ddb106ae80751f4121f5161d759 Mon Sep 17 00:00:00 2001 From: Shaman <56280352+Sha-Seng@users.noreply.github.com> Date: Sat, 15 Feb 2025 13:27:39 -0700 Subject: [PATCH 1/4] PRIbar+ (with wrench) a tier 2 research a tier 2 arsenal research called Enhanced Security Devices that currently costs 3000 points because it only gives you one thing right now, but in the future it could upgrade other seclink utility items it unlocks a secfab-printable PRIbar+ Conversion Kit that you can slap onto a pribar to give it a swappable wrench functionality and a new sprite done with pivotbash's permission to help out, since their pr is going to be pared down to only fix the seclink category misplacements --- .../Audio/_Impstation/Items/toolslap.ogg | Bin 0 -> 6874 bytes .../_Impstation/research/technologies.ftl | 1 + .../Entities/Structures/Machines/lathe.yml | 2 + .../Entities/Objects/Misc/conversionkits.yml | 19 ++++++++- .../Entities/Objects/Tools/crowbars.yml | 39 +++++++++++++++++- .../Construction/Graphs/tools/pribarplus.yml | 13 ++++++ .../_Impstation/Recipes/Lathes/security.yml | 16 +++++-- .../_Impstation/Research/arsenal.yml | 14 +++++++ Resources/Prototypes/_Impstation/tags.yml | 3 ++ .../Objects/Misc/conversionkit.rsi/iconpb.png | Bin 0 -> 4503 bytes .../Objects/Misc/conversionkit.rsi/meta.json | 3 ++ .../Objects/Tools/pribarplus.rsi/icon.png | Bin 0 -> 4923 bytes .../Tools/pribarplus.rsi/inhand-left.png | Bin 0 -> 419 bytes .../Tools/pribarplus.rsi/inhand-right.png | Bin 0 -> 428 bytes .../Objects/Tools/pribarplus.rsi/meta.json | 28 +++++++++++++ .../Objects/Tools/pribarplus.rsi/storage.png | Bin 0 -> 4529 bytes .../Objects/Tools/pribarplus.rsi/wrench.png | Bin 0 -> 4937 bytes 17 files changed, 131 insertions(+), 7 deletions(-) create mode 100644 Resources/Audio/_Impstation/Items/toolslap.ogg create mode 100644 Resources/Prototypes/_Impstation/Recipes/Construction/Graphs/tools/pribarplus.yml create mode 100644 Resources/Textures/_Impstation/Objects/Misc/conversionkit.rsi/iconpb.png create mode 100644 Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/storage.png create mode 100644 Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/wrench.png diff --git a/Resources/Audio/_Impstation/Items/toolslap.ogg b/Resources/Audio/_Impstation/Items/toolslap.ogg new file mode 100644 index 0000000000000000000000000000000000000000..b7af4e83578da3fa8dae2f99fd535dafc41899af GIT binary patch literal 6874 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 EABxp+@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Misc/conversionkit.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Misc/conversionkit.rsi/meta.json index c84a8c088c99..c67004b9a1b8 100644 --- a/Resources/Textures/_Impstation/Objects/Misc/conversionkit.rsi/meta.json +++ b/Resources/Textures/_Impstation/Objects/Misc/conversionkit.rsi/meta.json @@ -12,6 +12,9 @@ }, { "name": "iconhb" + }, + { + "name": "iconpb" } ] } diff --git a/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/icon.png b/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..491ff7ae1ff71ba5803731b85e17009b89f2cbe8 GIT binary patch literal 4923 zcmeHKYg7~077kFrf`BzBSP?>~QfeldOkR^I2tp9J8o-DO2$jiX0t4hhGLV3eTa>D3 zeXgab_1$XG>jirOMQahOsA#nU;O%&$`Pv#}PAD z7Zr95$L@cAYT1(a9OLtM$QLaR{F!p>w)tsW!pMu`e3md6HjAmSu-K@uu)c~w9a|Qx z4T?Mw;#D(uMg@DlYtD$QGqK6#E0&`hJ{o;Il$u!HmSSl25K@tfBrp3bix&H=nCa+| znmjJae)1!`lgWAoy>{fQBKO3TX8ljAO`YDRcE-*Ga^E$kUEF!3zOZuRxzgqNvxg1a z>Bb!Kfx4~s2j%E(&A)n2s=67TyP@-N@aY{2cuW(skeDXn+;O>cO+K~dXpEPdjPjl2 zzfE|5(aF_GMac`BlML}qn{dA`w)wjS40MqQY*r7?YL zMSJaBPfpszF(nON;kHvF+4k=tZN)pBoTn#>6w|(I`f5yNJ@zt@xv}em@9OH<5g}<~ zD=QzS{o$=YY&Sf(b)Bzt-S$1P9NYHP4tZ|M{n4KB#(5d-%^fyp6tmAss*n4^pX~ZA z8!%()eA>P#=kLMkF@`T|y&5I=2g+kG0)x$ZoX8+) zmXb`Rv_b6lZ;!EAlq!flTO^0&`YRGxDP2h`bC!s$vIEatbtK06;_1ILoZb z)EY5!5Zj82fqRRY$7Wew=!_tCygZf_rZbQ%Ay>$Sp>Q*mgRmz#u>uV$HKveF>4gBJ zAa)u}>oFeBWHND00f>cVQw?+Z7 zU-P6X^#EC~)h!6-!NGKu*2t}nL2*(Ln#8-;Mq?A7hDoSglaVqA?lhWX+Bu}qRwN6+F$0o-{1+ft>JYb2<#A!7M0DFMa zs&ppfz*HQiA!pFIg-^ajAQg*XM2I3%5h_6joMw>*BhaD+l@D_TLhFpBF&HQZP>WlX z3IMEjPz@GlAaPn}h|}pZgV>g&SeD5CX*t+XDxAh;I86dj7!hGGg7HOhd;!LXF`)#4 zB^W%&U#Ftfx&O`EvVB;AJx!0Kj9~p-tEp#C%^p!!vt`_-whmFU$#L-~9&9+D(V+KQx?P)n=Bx5$9s!qjeSB&C z%IUl+FZbW?!7)|c&QBh`YC1o!^yY);Jn#@5*E}NNpE)b8$N$Z@;5eqR-JovVzI5%H z`kV?m64YUIE(qK{{}#S)@5^s&7tZf!yZ7t&e{wV$*L&}DKQEgjDMfv1U}lx)nuB6H z=;skD&P|OL*vX$MS(_pY9Xs0}sk_5sWQj+74;~vmZ`u#f?2AUNOyjs#*L+r{x?dmV=Rp}+S!!kg* z*Jh4dRj};To$@QAyu*J9*!2C(3lUSQH>c+_A8*_$u8a4onBLNHHuvlw+%CuDADb39 zaLhT-(rZ*h{Yr19f5qIRm&eDH7UvtQrDbjnS*UXSm-qjCS8~94zo>1$&9O@!HVJjZ zB0`@&O>cFmyUPEhrdD>g>K^C8{Flhnb-(X-vANYWqub-TUCS$<;Y*It+kr?JQQ^_D JlF*bz{|2x)57qzx literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/inhand-left.png b/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9e12eee8d8ca67245ea65e00aed5ea235c5822af GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCh9@d%8G=RK&f#wK0pyQQ+7|!`8VfdlfWwR1}rMk|wL!P4ItY{6jADQcH*< zkD&L&CFV=Ki$5LIz0py=+uFVB|N6*vJNC{^{5DIH8E7~VOvt%8U-a|6;6OXIlUvVQ zhCiKk_0{?f>pib8n|yr9;n#lycR!ug61Fp~++ISw{4o3Pd+*p! zn(dujaLXa~&HTmH?Rvh)XY6cPB~o$jCnL}bYw>_kAnQ6;hiw1OCtLmmPoD6%U}Z65 zXlp&sXJ&?mh&1=98|F+ZdOm#)&>Ftf2+uTMUj{88n*(b3rQpdRmZz(q%Q~loCIG>4 Bu~Ps5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/inhand-right.png b/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f50b9f41869da8665c9383a3f671d41f01c29d6d GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WChCEc)B=-RK&f#wb6^&QKa>uG`DqUtwKaZ3ybTTrrut=3I30af5@4cP10g< z-8f~z-lX)+MTdL@H*Jb}y|sEaZ}08B zYqmUJw^VQ0^rOd161wm2`K0~lW?jB%UAgv(=j)`ud`PHBS?_=T+b1*ry7jBo7Jp8v zsY;rEy1aUhEz9x!9~+zM>;KM>J7>D*xw@m}uXgsO!hyS3|2bD&{4v$J(#ebY*}gw} zXXFa-Jm(k4ZI3z6pj*AtiW%Y#Ai1HpiY+PoLu}Yh`2bg2=2x;ED-Uj0y!!vjyoTFP z|E~J9N-67==ZB+FSAXAGd(A{o>e!VBuY*2Z*~_&xyg@v;IbSKYA~TmYC);)9Y5o5p zlP|nrFAr`0p6;`5FBd~Yp3!e+^U67s_;=Vf0qx>TjqptK^<~fkvN@nGxD-4Y#PW3Y Kb6Mw<&;$UqLa+D$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/meta.json new file mode 100644 index 000000000000..bd8e748e7e2b --- /dev/null +++ b/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Kazne and Pivotbash", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "storage" + }, + { + "name": "wrench" + } + ] +} diff --git a/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/storage.png b/Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/storage.png new file mode 100644 index 0000000000000000000000000000000000000000..4357b0862fd3de9d6223b02b7f73f14f2cfe2c82 GIT binary patch literal 4529 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 Date: Sat, 15 Feb 2025 13:33:23 -0700 Subject: [PATCH 2/4] updated the research icon to show the pribar+ instead --- Resources/Prototypes/_Impstation/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Impstation/Research/arsenal.yml b/Resources/Prototypes/_Impstation/Research/arsenal.yml index deee4fe740aa..c60ada3e7362 100644 --- a/Resources/Prototypes/_Impstation/Research/arsenal.yml +++ b/Resources/Prototypes/_Impstation/Research/arsenal.yml @@ -19,7 +19,7 @@ id: EnhancedSecurityDevices name: research-technology-enhanced-security-devices icon: - sprite: _Impstation/Objects/Tools/pribar.rsi + sprite: _Impstation/Objects/Tools/pribarplus.rsi state: icon discipline: Arsenal tier: 2 From 6f4d5eba54e15507df2a4814d7b178ee944d6b2f Mon Sep 17 00:00:00 2001 From: Shaman <56280352+Sha-Seng@users.noreply.github.com> Date: Mon, 17 Feb 2025 22:54:54 -0700 Subject: [PATCH 3/4] updated icon (landshark is smart) --- .../Objects/Misc/conversionkit.rsi/iconpb.png | Bin 4503 -> 4712 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_Impstation/Objects/Misc/conversionkit.rsi/iconpb.png b/Resources/Textures/_Impstation/Objects/Misc/conversionkit.rsi/iconpb.png index 4ca562efd95fdcbb44a06f7dc8bb895ca5da3464..b2d3936548fb81b47cc2f0d5ecd19614e7e54aa9 100644 GIT binary patch delta 815 zcmV+~1JL}JBj_ZMBmu;cB_Dr54#Xe`y!(oMf-)1G#OKi-O29H3%ox{>c84vQicK?{mFWT;Md zQ7Mj-9sxgp!~j*ZjC3L{=JKmz?<)ihA%G}GBxdT#%wiUvF%V@x+J;tk^HrloVN^X^ta-B_xr82pM%$P=$pEtr{sN z(zGA<@Q*qE6uD$_RlvxxfErXtjvxFFes^mYXQthxU>pd%*!IT+(7Ow?8n*p?Y}>69 z!2b+fX&ry93Cw+x-souIBVceFxVY|U@*Z%x1B^cDk|8;gpQcbO0`F(^O?hDW7U*Ad zdu#6}30B#F}`3eYX1#B!n>Fs(41 t;menAL>czw%QuE;h3V8!1CuckQWW>rgY*j{g`WTb002ovPDHLkV1lpBQvCn` delta 773 zcmV+g1N!{vB$p$QBmu&aB_DrL4#OY_{pS=rf&wZY$F45f4R-vY(59|?iBI5>Cj$NR ze!*h^BLk-*x#k=cT)AS?K!Tx7j)5mnpi7!BbvOmo66sBrO7{Mv9!~?innvkjBu^K% zRjBO#@?+#L)0k+)yBk$EA~YeoL9=g#T%}yUu=TJ)?7$$Fb?jSSbbBm&(su~4Q>36w z#5MqplYrU`n#w#HXPl@gBV{+!h5Xyo0r&#hJy{T3F29|T@gWXNMJgTaAmR|PI@!f9 z9FrgcKYz>ts%9DKL|n|}SH<8f1cVX52&N@w>dDMv7M|nl9zMR_#dwzYxj#q0QZO0d z6N%@TZdk+{#50?g&Uv3W!pf3Dd`>)W&;^Mfxh}i>#<}FMz%wI8Ha$-qAr?zrEO#+0 z8!GV>aa2(?$`^7jE1b7DtJOMd-;=*ERM1v3Tz{uIj0BdDL<%Bg)KNhd7Gkt&q?kz4 ze%!-9~)WK_jdR8@0oUgKhnK&&8hMX-2ea$cC&;6iUK4wF)}k^ zFl90=Ibt|sEi^b}Wi2^kH)Sm_Wo0umVqr98H#IktG6kv&H90vjG&eRdHa9Sn=LK>K zG*mJ&IyE;sGB%TA1|$kJR5CI;H8(mkHnWii4FR)#2w(_89emi700006VoOIv0MY=` z0MhKH#ozz{010qNS#tmY3ljhU3ljkVnw%H_000McNliru=>iW0IU8LTC1C&n0Y#G^ z5vNSXaGRM8gH0}ABGqyR1_lPzzrRpuN*uv7(B%MG4nU3qx;g+B42=_EOTg&0MX0uoXbcHWD+N|Tna00000NkvXXu0mjf Dehx$O From 7cb0555fa6953227ad3828c31a9db3e5fe478097 Mon Sep 17 00:00:00 2001 From: Shaman <56280352+Sha-Seng@users.noreply.github.com> Date: Wed, 5 Mar 2025 12:07:28 -0700 Subject: [PATCH 4/4] added to special means instead --- .../en-US/_Impstation/research/technologies.ftl | 1 - Resources/Prototypes/Research/arsenal.yml | 3 ++- .../Prototypes/_Impstation/Research/arsenal.yml | 14 -------------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/Resources/Locale/en-US/_Impstation/research/technologies.ftl b/Resources/Locale/en-US/_Impstation/research/technologies.ftl index db105e5abec3..75b9af86bfab 100644 --- a/Resources/Locale/en-US/_Impstation/research/technologies.ftl +++ b/Resources/Locale/en-US/_Impstation/research/technologies.ftl @@ -1,3 +1,2 @@ research-technology-advanced-sidearms = Advanced Sidearms research-technology-basic-fishing = Fishing -research-technology-enhanced-security-devices = Enhanced Security Devices diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index c5be3c0761ee..d16d5af55099 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -127,12 +127,13 @@ id: SpecialMeans name: research-technology-special-means icon: - sprite: Clothing/Back/Backpacks/electropack.rsi + sprite: _Impstation/Objects/Tools/pribarplus.rsi #imp, changed so people won't gloss over it (nobody wants electropacks) state: icon discipline: Arsenal tier: 1 cost: 5000 recipeUnlocks: + - PRIbarPlusConversionKit #imp - ClothingBackpackElectropack # Tier 2 diff --git a/Resources/Prototypes/_Impstation/Research/arsenal.yml b/Resources/Prototypes/_Impstation/Research/arsenal.yml index c60ada3e7362..4f2f24e80f95 100644 --- a/Resources/Prototypes/_Impstation/Research/arsenal.yml +++ b/Resources/Prototypes/_Impstation/Research/arsenal.yml @@ -12,17 +12,3 @@ recipeUnlocks: - FullAutoConversionKit - HyperBurstConversionKit - -# Tier 2 - -- type: technology - id: EnhancedSecurityDevices - name: research-technology-enhanced-security-devices - icon: - sprite: _Impstation/Objects/Tools/pribarplus.rsi - state: icon - discipline: Arsenal - tier: 2 - cost: 3000 # Cheap because it only does one thing right now - compare to Advanced Tools which is 10000 - recipeUnlocks: - - PRIbarPlusConversionKit