From 4c43e20af3432ea13dc79afd800a141bd9b31239 Mon Sep 17 00:00:00 2001 From: Sailor <109166122+Equivocateur@users.noreply.github.com> Date: Tue, 20 Jun 2023 23:30:27 +0300 Subject: [PATCH] Vend contraband/emag inventory expansion (#17503) * Vend contraband/emag inventory expansion, do a 2-year TODO * Map checks failed real --- Resources/Maps/fland.yml | 2 +- Resources/Maps/nukieplanet.yml | 2 +- Resources/Maps/origin.yml | 2 +- .../VendingMachines/Inventories/boozeomat.yml | 2 +- .../VendingMachines/Inventories/chemvend.yml | 2 ++ .../Inventories/clothesmate.yml | 3 ++ .../VendingMachines/Inventories/lawdrobe.yml | 2 ++ .../VendingMachines/Inventories/youtool.yml | 3 ++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 15 +++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 15 +++++++++ .../Random/Food_Drinks/drinks_bottles.yml | 2 +- .../Consumable/Drinks/drinks_bottles.yml | 2 +- .../Objects/Specific/chemistry-bottles.yml | 16 ++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 20698 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1767 bytes .../Jumpskirt/tacticool_s.rsi/icon.png | Bin 0 -> 606 bytes .../Jumpskirt/tacticool_s.rsi/inhand-left.png | Bin 0 -> 448 bytes .../tacticool_s.rsi/inhand-right.png | Bin 0 -> 478 bytes .../Jumpskirt/tacticool_s.rsi/meta.json | 30 ++++++++++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 20351 bytes .../tacticool.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1815 bytes .../Uniforms/Jumpsuit/tacticool.rsi/icon.png | Bin 0 -> 552 bytes .../Jumpsuit/tacticool.rsi/inhand-left.png | Bin 0 -> 514 bytes .../Jumpsuit/tacticool.rsi/inhand-right.png | Bin 0 -> 527 bytes .../Uniforms/Jumpsuit/tacticool.rsi/meta.json | 30 ++++++++++++++++++ 25 files changed, 122 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING-monkey.png create mode 100755 Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING.png create mode 100755 Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-monkey.png create mode 100755 Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING.png create mode 100755 Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 66ebfde0bb..b11be3a774 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -133887,7 +133887,7 @@ entities: - pos: 57.464855,-58.31391 parent: 13329 type: Transform -- proto: DrinkBeer +- proto: DrinkBeerBottleFull entities: - uid: 12134 components: diff --git a/Resources/Maps/nukieplanet.yml b/Resources/Maps/nukieplanet.yml index 7d13aa0966..c2b220ab97 100644 --- a/Resources/Maps/nukieplanet.yml +++ b/Resources/Maps/nukieplanet.yml @@ -5735,7 +5735,7 @@ entities: - pos: 3.9415665,-8.34479 parent: 104 type: Transform -- proto: DrinkBeer +- proto: DrinkBeerBottleFull entities: - uid: 161 components: diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml index e86748633c..d053f900e0 100644 --- a/Resources/Maps/origin.yml +++ b/Resources/Maps/origin.yml @@ -93874,7 +93874,7 @@ entities: - pos: -25.524792,55.598667 parent: 2 type: Transform -- proto: DrinkBeer +- proto: DrinkBeerBottleFull entities: - uid: 14041 components: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 6f2e7db5b2..452300dae2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -9,7 +9,7 @@ DrinkShaker: 5 DrinkAbsintheBottleFull: 2 DrinkAleBottleFull: 5 - DrinkBeer: 5 # Needs to be renamed DrinkBeerBottleFull + DrinkBeerBottleFull: 5 DrinkBlueCuracaoBottleFull: 2 DrinkCognacBottleFull: 4 DrinkColaBottleFull: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml index bf7af4ad11..f3dc778d3a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml @@ -21,3 +21,5 @@ JugSodium: 2 JugSugar: 2 JugSulfur: 2 + emaggedInventory: + ToxinChemistryBottle: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 29fd3cc7bf..e263903ef5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -58,3 +58,6 @@ ClothingHeadFishCap: 2 ClothingHeadRastaHat: 2 ClothingBeltStorageWaistbag: 3 + contrabandInventory: + ClothingUniformJumpsuitTacticool: 1 + ClothingUniformJumpskirtTacticool: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index c28a6be535..888061226a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -14,3 +14,5 @@ ClothingShoesBootsLaceup: 2 ClothingHeadsetService: 2 ClothingNeckLawyerbadge: 2 + emaggedInventory: + CyberPen: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index 85ffaf4adf..154723c9f5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -13,3 +13,6 @@ FlashlightLantern: 5 ClothingHandsGlovesColorYellowBudget: 5 AirlockPainter: 3 + # Some engineer forgot to take the multitool out the youtool when working on it, happens. + contrabandInventory: + Multitool: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 5ec3bc4464..12ef43b63b 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -579,6 +579,21 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtTacticool + name: tacticool jumpskirt + description: Uniform for subpar operative LARPers performing tactical insulated glove theft in deep space. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/tacticool_s.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/tacticool_s.rsi + # Too cool for sensors to be on + - type: SuitSensor + randomMode: false + mode: SensorOff + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtAtmos diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 7622a84b1a..465a587510 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -887,6 +887,21 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/operative.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitTacticool + name: tacticool jumpsuit + description: Uniform for subpar operative LARPers performing tactical insulated glove theft in deep space. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + # Too cool for sensors to be on + - type: SuitSensor + randomMode: false + mode: SensorOff + - type: entity parent: UnsensoredClothingUniformBase id: ClothingUniformJumpsuitMercenary diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml index 40f6e927cb..819320a80f 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml @@ -29,7 +29,7 @@ - DrinkVodkaBottleFull - DrinkWhiskeyBottleFull - DrinkWineBottleFull - - DrinkBeer + - DrinkBeerBottleFull - DrinkAleBottleFull chance: 0.8 offset: 0.0 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index f47edb6abd..4779150801 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -351,7 +351,7 @@ - type: entity parent: DrinkBottleBaseFull - id: DrinkBeer # Needs to be renamed DrinkBeerBottleFull + id: DrinkBeerBottleFull name: beer # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e description: An alcoholic beverage made from malted grains, hops, yeast, and water. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index 016733d8db..c0c7047c00 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -254,3 +254,19 @@ - type: Tag tags: - Bottle + +- type: entity + id: ToxinChemistryBottle + name: toxin bottle + parent: BaseChemistryEmptyBottle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Toxin + Quantity: 30 + - type: Tag + tags: + - Bottle diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..af77e0b5746d89e5e4b19447572a8472d78e65e5 GIT binary patch literal 20698 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/equipped-INNERCLOTHING.png new file mode 100755 index 0000000000000000000000000000000000000000..7e280a1074a37addb28418b2fd085dd310a4da0b GIT binary patch literal 1767 zcmV(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ?ZAnByRCwC#o6U3L=n;n>A@S)E@)`?dJY!s&*-WxYrIH+S&T%gD*ZMO5K~AaK zWV4mAy{R=ecmQD;Nq_-;yg4w^V2`~67s9koDlHw=Ry2q+W^j7FnRURNj-kYyReFgBVA_vw3{M=qBm3`6qyJf7#R zt-ovr0AQLX0J1FO`#$-6J}xqjQaW zsDE&9AZ*)yd`acVx z-EKdaK4BQf75J_>jw3ma^XS!oNWV}hFquql{k^XKTDQWQrZF0g*xK3xh>uTU(aPTn zLQ(F`gpC83PNyth+q20HLdr0mPUA}>Nt;fm$g&(493RlJ8F)z_BDzkuegYW~(KiPZoZ*z0ja{-zW?m1}0>A&d#%a^Ua;8*ww*fYq1(Ciz^2p~D zsyokaoj=^)q1m>u+}X^eC4ULLo7p_*}U&K*Achi?839ebk3+ zR%SQ}0iPfcj3+*Wp@$y`di}x5`pPO!)OAggBq{9m2XU&u`>D6^tt?3FtMCVXBnfe! zz7T>S2&GHYPNoP(&li#mav9sS{@RbkRwca&dq}gcYfl5%434B)oP2U#8W|N zG#X-2yW8!O&1R|B>msoMiN)ZB5b>Zyx7)?@Jl?!{!`ruS6Nk`fG{o!IuQ@t8BAd-p ztJSF0YIHiCwIHmV0g+hLj(-09Io)oTqoX5&AV_@mCzHvo;9IR0<#IXpt<`EJdkJ(p z9Sp;u)oR7PK_LX?ayf2cCuxO3fnu@9csvFmo6W`x(dl%OFM_2~>ElH&L@Zh^m$|;a zev%BR)oP5#<4*!El}fDIlwBFX;wl%5MO0O#*X!|1ShZTkbzNN7#c`aqGH_)8p6B6t zUJN4=bsQ)0<|xb?u+b_nf?u~CzY>6GAYySwuT&~=b#?V*mp~8%l*?tt<1v*=C9VZ9 zAIx}YW?^F)uoygW%Ymo1yV|O%uG}V9RxLnZPWuvaM& z3c+ORAplv<;CTVlna}mWNj&Xs+eO#r!%wrBkDU1!r-Veeca4;hsO#EN9ix@z1Hv%m z`_uW}`@fcj=LejgnfO7-#rpx8rXtH3*zkP7q7Ok3a(aG6KBsWrv6;?%PMdu^Kj7U@ zCbjBU^Btl;`0R|}(g33VJb+%&u$>Wmx=Op}Qm<_@YWCUL(bnqEFKdfFY?X@KOs44D zC3@E*G_{C3p0Tx6jD1+Pi@fT50Da350L{y}(2wVRBnf)`0ZF&cBOgZN8v)R@=96Kq z?mX46?IFG&tTZF=vj86WvB9t5R}>rbA$=m00!RU*0KRDZ{{R8`!P73MDB}PC002ov JPDHLkV1oWaPz?Y8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..d88a810d8e39d9c249361752bd826d746813ea90 GIT binary patch literal 606 zcmV-k0-^nhP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-pNg_lf*A@A_veZTK9LTk-E!{E-*05kv%KoovT6p2~^f*{ZUzV8#q zF-j@A-7f8Rn>^3i?RJ=^iRXDlQ3Swdvk|p=U^1BiVB0q55}y}9yWPe#%_^@}5BR=+ zE^Q@=Qi?3gP)ebcB1saGB*C`rD!(>>IF6B0Ruzy^VwswYI?$fQDRUA+fH7>45JbD$^+_WM0WQB-YuDbq~>&PE&z1{j8c zWm&hMg!4~BeRjX=x(FfYbUHYWL$BAXy5XF6ZCo`6zD!3N;QdgZzFq^DGXFa}<`IBj ztF5SAg2ime&+k6o13W)^IL49Z#~z*oKb}U+Kf1U58TC3XUS8K^*^%Y?jj}BHz1>l2 z&CBbW;RpM60KvFVyer7%k*BW#i}@JKGFi+=e4C9yYqsw>!MIQD9=MFpLH_|boJ4m{ s&xD(||LOwKT+17P2A~1BH^83(0CjWNGmY*#5dZ)H07*qoM6N<$f=6rvmH+?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ebb3b515aab46f880bb8824bc201e6fcc5283aa9 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zt2|vCLn`LH zy?N1#$x-6y$NiFms}o#=w;mn9$WJ>F|yq5FD|k+_)R-8}L4f4}`b z&nuLCq`JTO-IB^wAGyZ68}Hmn;AoUkzWnkFNJK56T*jH>b|I?-U%Pwn>e4vL&CUV~ zZsss;h+2EjXnn^^ww!$nZO)$uGEZvQ+TB@a|5?>@l1N?M)s8)T)7jUj&J917!!&RH zrMIu2{4y_-o3>|9-5i^I`N_^7{=I8^qy2BE9slV=uS1`Ac0j?2X^{s5Ojm!qu|<5v zq|oY^)0`V}`hEY2t)G<&5nGRM hwPCp`*WEESKR#JKE5AH%8!$>3JYD@<);T3K0RUbI%jEz7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cb143902bd1ecd1400ca6282c119ed9cfc1ce66b GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zXL!0ehE&XX zd-I|flcU7ZkNYJBwInXK=+4l;!2IQ(|Haq|8J7;sT4J=O>+Y1sv)6X)UK;$oeCh68 zGRO0uC-HZ{z#r|cdxSkFtyz9qli_Zjc*DmEo&yCIXa3&XCvvuWPI=PChznU;8D4z< z&G4nl)@^a1>%`TeChN;ndknLac`|1)UC1$GEI4;DZ~Mk;No#FqXlhLUexiKC<(CO- z@9wGJ%@8>)aqUrw;Gg{(i+$qW>u#_$doNyaZeptB=xhA7;p%$qi7;f5&p?p33a&y_fs@&)%K1`}gugiS=F=_uTXS@aa*{7uDY- zHSea~d;D80I!+J@CfeS5c``4jx3ELMx-oa7=`qEo|66ZJJr1~c{E;1yyRa$05yU+x zED)V6leOGe;8AwZ{>`76j$D(dSFgxP&hBx3Yr+WDXzpmbLFtqDUM78B^{jbsUpWIK OjKR~@&t;ucLK6VhGUgNj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/meta.json new file mode 100644 index 0000000000..94d2cd0d9d --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/tacticool_s.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey derivative made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..5e4d0b0867bb76e70b2c5f1c5be91bd6b8d49c1c GIT binary patch literal 20351 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 b|Ay=-&F+|Ralt6(SLCG(NYk%Q$er?Eq}&Kr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING.png new file mode 100755 index 0000000000000000000000000000000000000000..d846c10634f6b3f3a2c420f628e1eeb8f6da0c5a GIT binary patch literal 1815 zcmV+y2k7{TP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ?ok>JNRCwC#o8NESR20X*j_t&D>ii(_kEXxZLTN!T7y=$ZV(>B{O^AOK9{Rup zLPHF}1R6}x722(X(yVjh#f=@ujpI0%hhdX6*=W)@AkF9HrnhOo_k8X-=icOAGlUR4 z%f{dtw-`VSAO;Wvhyla^VgSR9qNxAnpmVw0!0xSHuMZvUzisqJihxq7L;%3HZ7eJ- z;PCJ;Y-eU>002ivN0Ctr^cjYMD2ic!qtSpM2xJ`nGXsz$iFlp|RaF5XbUJ7Yg#t89 zgCt2r*Y$}*=+&>)YG^bX;qN+~&e;0QS;hZuVHgIw-7X|aLMoL4&+}+Dn=lLmk|aUb z^@&3`tmfbaXDX*%q0x7%p9+b~Tts1@gmfrEEDXaytJUfQkj-YH>pFB@r{?D7Nbq;(HPbZV`+lFk zZQGzI3Jmkl@O$+a7Z-_Xn&*#zfOc=i1pu0+;rl)u$AKUSA%xy#NfgB=&emBih_=)E z!BWg|9BkXhkUhbf^`8ph!Gi}+4WE2I57%{vXasB(dkpZ~)f`o^{uM0jmoN00OVm#b-C}M4JM|oDgoTiup9|+^bMhK1~je9$|fD7O!oT@aID# zG62P#0EVW)GBk?$G&J3&DvugODT<+fW4=#+)NipyOM(0hoK|PR*{^@tLoq)Sx${xzj|AZJZ+{!W z`{S?WseN%6g?{|4a10;@5Cez-!~kLdF@P9A3?K#&130slN+rUw>_Gp)!NF8M7%eR= z4cvP0Ja4SK3Cww%R}>}euT&~iow?K6EX$%)Dv`)8Nc1{S2njDrR4NsCo`lSFT*a*47qSmW84yP!t84ri}%G8Hc>4Y2k77{QNvBl?t}Dw!)+GD6Q3M z^*LWImyyY2!m*Xh_1)1E1Oc^L zZE7jt`#v(63>?Qnp->2G0r2=@#<2a#L?fWrc>sL_n6{nP7DaL7V{&HH0yN|{21HTB z-rgS8*ViN85G^k+V|RBKvMj^0tZ)hJ9b;qwT-U{Hx&u*2g?%?FClEyuvMghFcQ^7` z51bEb&>O4y$Kmg|e{am(Xj9@KbRUUBsNjJ79Y4v)Y%H?vTSNHb)8ZKX&$K^}&`1H$dD$)q}^viAP>N}g{ zomb{iQuC%>OT{P`B zOxwjvFRa2e@BJsMz^qcjt?hjfLLl($SpQ=z0I5U*ON$a{A%~xL_CP15|6qmRCHQ$~ z4=YRapgaereKI`&4{8?NZWo(tX-LI1D%Hl+0eBrBiY!9Pv)H-U#G_+-dH_z_&FzD! zhrrG41L~vqUq1JP&rb#Ll;>^!FAoz@kpg%Y?3oAf*8qBXb7MvpTulG~002ovPDHLk FV1hyhN6Y{K literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ac63a361fddce3bfc6cffb46555f9386b5664456 GIT binary patch literal 552 zcmV+@0@wYCP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-u1Q2eRCwC#mcfeCP!xv0+p9@R1D7`3HdH!-QgI=JAaq~E2ha!g1zfmy0sEJ4j0l;)R ztpTzuV>X+yTCHsMeIJ1JdMyB&?ibNSD1<<3T?2$+$acFW%QAf5w>by`q9_8u7$aH* z7>~y_fYzEMNhr&b!C-*vx)ephZnr~9iBbw<3;>(WMzlHuVHg77dEUMEJw;c_vzHC0OC zx~{dNQtDn^Yc4oNQ53{+{Kxs-{E$|h)q*!KCqz+1RaFE*V2`S*xPGRrQ~v4uK@svZnfwhqIo?400009kK5Hb$zAx z4AmU({kC=3etW3~*PLPz*Mm7`%AP_DmrQCuZC>+P?y|*^>izS5)IvgCr={|+F&{EW z*?yZ*z*UgJbCS)=rE5R?y)@zdaF2PyvX}D5zgGE9Qb~ynyZ`-CsaDRLulinO^I4#&@4r@sgdR=Xtk|V=?6G0ytbdo6XU#45d8}G+ zBEzKWYNfrghhSKUkI#+KLZ_4YJ-hNpB>@M59yFwKSSLL?namrj; zVw?ArLFe}4Fg}Jiw;o^PW5~G$WIMdw*b(uQQKuqiq37e6#lT2q@O1TaS?83{1OP-2 B><0h< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..18756ef6a09d7280f6aef14df8a833f2d9b98152 GIT binary patch literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zPkOpIhE&XX zdvjy=tpu54AM=+;^)UJ?&hZFdf4KBj(P`i9cjE8uEy$kU*TkYU(c^=Oz@?WhmzUHo z4*I<9e0t!gteQU`_wm^&C_%xe_`+9W%PwcmOqEQOFq(g!^YDbLS*!<=Hm<0>zje;6 z?L~?lO+pK9znzpSx$phtRLRXZdo;QjIv(#Zb+%A{fAOdS$ElMkPJtpSo`(_)4wS~0 z?UrSj_nc9{HBh^)An%^vQC`N5$3I>a?u`?674)3+CcZrP`Ln+T6^g#WpKR*CGv=G$ z$lLy;(r@1LC7D$p^^3cTKVQpx2sAZry?dZYj+wO0`D7b8;p2tc+x{&K{wycksI~aw ziz3heO=^|e>>vJA#53`R{ zF>`kC=YQWgYIc2nSswS(sPIL3oaC3?Hum@8O@64(owU7(;r_n=B@FZA-c?lXc>MO~ z>Hed;zi!*0yS@VoPKcWRT7PESu^TOg8Mmd9gWVc)vwLP6tU8thq%5-9SKqiMVSX`V z_pNIZvkk16LV?1sCHM~jHH0jdO^8m;S@cnG!&<|C!jBnOG>T5Fzo@_2H)dh#qi!8w P3^RDT`njxgN@xNA1q}Gv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json new file mode 100644 index 0000000000..1a3bbef77b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file