From 053674645ae24e994334b2f7a1a8bc74e05d29dd Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Thu, 13 Jan 2022 20:06:31 -0500 Subject: [PATCH] Added Syndicate Smokes (#6149) * Added Syndicate Smokes * Removed BOM (maybe?) --- .../Prototypes/Catalog/uplink_catalog.yml | 6 ++++ .../Smokeables/Cigarettes/cigarette.yml | 16 +++++++++ .../Smokeables/Cigarettes/packs.yml | 19 +++++++++++ .../Cigarettes/Packs/syndicate.rsi/closed.png | Bin 0 -> 5265 bytes .../Packs/syndicate.rsi/equipped-BELT.png | Bin 0 -> 159 bytes .../Packs/syndicate.rsi/inhand-left.png | Bin 0 -> 293 bytes .../Packs/syndicate.rsi/inhand-right.png | Bin 0 -> 275 bytes .../Cigarettes/Packs/syndicate.rsi/meta.json | 32 ++++++++++++++++++ .../Cigarettes/Packs/syndicate.rsi/open.png | Bin 0 -> 5436 bytes .../Cigarettes/Packs/syndicate.rsi/trash.png | Bin 0 -> 5369 bytes 10 files changed, 73 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index e625ebe507..ade6ae5883 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -237,6 +237,12 @@ itemId: Pen price: 2 +- type: uplinkListing + id: UplinkCigarettes + category: Misc + itemId: CigPackSyndicate + price: 2 + - type: uplinkListing id: UplinkSoapSyndie category: Misc diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml index 25fcc1b637..3b14f98b8a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml @@ -22,3 +22,19 @@ - type: Construction graph: smokeableCigarette node: cigarette + +- type: entity + id: CigaretteSyndicate + suffix: syndicate + parent: Cigarette + name: cigarette + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 20 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Omnizine + Quantity: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index 24b80a6e0b..44984e2c1e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -92,3 +92,22 @@ - type: Item sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi size: 6 + +- type: entity + id: CigPackSyndicate + parent: CigPackBase + name: Syndicate Smokes packet + description: Elite cigarettes for elite agents. Infused with medicine for when you need to do more than calm your nerves. + components: + - type: StorageFill + contents: + - id: CigaretteSyndicate + amount: 6 + - type: Sprite + netsync: false + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi + layers: + - state: closed + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi + size: 6 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..2b2cb8acf7fce81df323a146dedda9f1fdf6c66b GIT binary patch literal 5265 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 aEzHYJ4z!-&ywzwD7#|OR_j1>$4gUoj+4lMX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..d49b6f112c062ca4deab896a5acd022e4f6faeaa GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=X`U{QAr*7p-rC4}KtX`TF=Z!% z)^cvG#cWA3R%TW+Q!&FNfuKXy64h3+TD zWAi%)LnrQe?(TU5E$ zJqkLo@4d6;)7%SlicO7|PI;$y=#0tv&wri&9eB#=v0bR|@q`lTTgjE4UYfjV&ji0( zPfN}G6c_!J31Tw?gH2C;{iOG{&gN_XEB~pyY;twIYRpgf2Ssx4A3pZ{SNc&qJZ1am l3jVczpZMD^TQV^0c*JU0kZoG>dZPfy2v1i(mvv4FO#tjIdqDsI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..263f797355d36556de8c5472a55fe21f191b7925 GIT binary patch literal 275 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png new file mode 100644 index 0000000000000000000000000000000000000000..89222ad9b2a5a8664fb3256d8555619c7e50e01a GIT binary patch literal 5369 zcmeHKdpJ~U7auf{ZbY6zoimO4k{Yw;f|+4lr_5BCCWPv+&Fo=hE@lQpbWl@K61qq? zlB07735BF0xpcaqh{)+eIZ3(H`AE*5q1*GFe|nzp{MS3rp4of7YyH+*zqQ`?ogL3| zb)Kzlq>VrzW-}RdHvEfLURu-PZ)s%YFaj~{L8QBvj17jP#S#&Z9}J;o5n>1p$@x44 zLf+oLVROpjWm?2KXJjXq3HFgj<|_GG}B=jk%>drg?z&E_zp>;oygqqMj_6YndV zedTFVSMRfjJR4${UU+zM`8MPLBWgb>)tUf}Un+EPe^<+33c`-zU;?a$>eT z&lpx@^u4<#ue>vet-7o$8(5LK?#_@wi_qa(t9qyUXlPzmaS$#ExNmXm2D5Ku&E03C zKKZI77mfdQtzpPEA3VeE>KV{*E zRtKZgjz2q==l`(HZLyTp9&9gJjZB%-wgiaobL=hce=U3Ed2VQNA;AHq@Qo_XzJ0kc zd=v6imaPC;nO5D#GTFc9hhY01Zw2nO+3y2IC$D(KWb8cnB!Pqq+l1NKl*B+Uy`#SB zy1dh&C}L(zd|`>B;XE{=g>gW8VQnxS;3Dl8{&t@GgMEy9gd_772HEDm@9dj|yY&qX zX|8F`fW|ztm9yHq^VRZ>&HunDySA%5f#-n@@+slt*pj>Kgo9cMoi!3di9hdN`iPmu zhO^l|XG`vNU7Qj3OKDTyz56}`ZRedNH#!#1s+{`+Vek&Ap>UnEapxblCpK4Jj2P*O z9y}2L7rwFBJK$*a-MHmvFUbx(A_Mqe2RGY~P4_G8KMJf!Y| z`UhFqJ|~RD(FByr?tZi-j*|@nvp%*26I)-MIbP|#um2Pr9 zl@&X;?`^E@lcNDo_2;}1n`C9i4WWNEW?|8Uc; zt&$^G{=BlZsN3@TxP!Mp=3d2(1+SWGLk!>PWuJOS*e4iKlrL%NU+6qm6z!Y%V#BQR zb$SkaV%zHs>8nDY3H6#YIe>P)n(d%zL{(Sgu%^YR!Ei6q(5(K@2c&xOqIf*ZqaA@z zQ}CUfSWG9UkDDC4wH=F2p)smi`U_FWo3TN9}6}_*!qSbb+Qt&-n z$r&$7kGTG)CRpe(s}d8V6{EYi;U=MH@iOG2(efPOZx!U*g9BsdF+pAa_V$ZUKs)(* zA{{qT`}E%E$EM5c&E8Pnq%k!YZ+lw)_>FPzsYdnNd()2$+k_nOS`k**bTy9~RI|PY z@6o)>w=ObI()BpcBPcJ_bz8OgCtvR#>e)q$&+T5q(8}kUM!nyj z?~6I?m`^}a3|NZk4@S0ET^)Gfqo|*OTXqal?z^CugVO3(|GoT4)Q{G#L({ZuH8w}<7dkT1fcw%yDq9%_gG>eVj}}sQ`0&QDA*m=-!hu$XK|-0ymk?aeCwpMwQN&fxzaUaKF<2n7c|D z)^c&7(nXw5Wq3?F4Wsl=<%&3bE>(3)BI2!xmJ~de=Z}Z5B#M;W3j!37LQ+9-In-4m zi2#Jl$rpeD5Kb%%P)#Tar#i5hGz`HU_$*-sgEAg$K*Ox%3q$3fC*1i0XuS+nvWd4O z5db2|f@nn{k^l>f&q|(`xFLHS-`naog@$_6G_}f zqF@?E84_A)scLVu&16v+d?~CEq3rmno?j1zOg>F6fndIB3XN8^EzI(y6Db%5aaE3B zyU8g|ASeug;PpM#P#@*|e<&6}ppgB!@TwyaEXY_Aj|X8v5?p>OB9DltfCLheI7!w z?{s|=1K*_ly}Q2C^-T9SI@M{PF3Ot%*0wi_1pG3gHOUez2w6f(4#D^($46r4|!DqH#y^uhqik$N?z6vZJ5ZK zH}pr;_L*abDYF**F(<=Y%O>JO-$ZI}0W0d==*V)i^$V-H-kJ7neVJh&9)QP+qjt%$ z@NjT<-wR$Sw%mSIF)nt_u-@CpNAzf+?89pQY%Ss)KU(NPoB-Tj7v)pho6K=gR> jMB4&__NuF