From 5db94dbb07e918c17bc15b489801c15d39d4099f Mon Sep 17 00:00:00 2001 From: Swept Date: Thu, 3 Sep 2020 21:17:32 +0000 Subject: [PATCH] Adds inhands and removes vir and genetics satchels. (#2003) * Satchels now have a nice RSI * Adds inhands for all the satchels * Annnd we're done! --- .../Entities/Clothing/Back/satchel.yml | 99 +++++------------- ...ped-BACKPACK.png => equipped-BACKPACK.png} | Bin .../satchel.rsi/{satchel.png => icon.png} | Bin .../Back/Satchels/satchel.rsi/inhand-left.png | Bin 0 -> 577 bytes .../Satchels/satchel.rsi/inhand-right.png | Bin 0 -> 489 bytes .../Back/Satchels/satchel.rsi/meta.json | 20 +++- ...ped-BACKPACK.png => equipped-BACKPACK.png} | Bin .../{satchel-captain.png => icon.png} | Bin .../satchel_captain.rsi/inhand-left.png | Bin 0 -> 688 bytes .../satchel_captain.rsi/inhand-right.png | Bin 0 -> 688 bytes .../Satchels/satchel_captain.rsi/meta.json | 16 ++- ...ped-BACKPACK.png => equipped-BACKPACK.png} | Bin .../{satchel-chemistry.png => icon.png} | Bin .../satchel_chemistry.rsi/inhand-left.png | Bin 0 -> 537 bytes .../satchel_chemistry.rsi/inhand-right.png | Bin 0 -> 543 bytes .../Satchels/satchel_chemistry.rsi/meta.json | 16 ++- ...ped-BACKPACK.png => equipped-BACKPACK.png} | Bin .../{satchel-engineering.png => icon.png} | Bin .../satchel_engineering.rsi/inhand-left.png | Bin 0 -> 656 bytes .../satchel_engineering.rsi/inhand-right.png | Bin 0 -> 628 bytes .../satchel_engineering.rsi/meta.json | 16 ++- .../Satchels/satchel_genetics.rsi/meta.json | 17 --- .../satchel-genetics-equipped-BACKPACK.png | Bin 355 -> 0 bytes .../satchel_genetics.rsi/satchel-genetics.png | Bin 361 -> 0 bytes ...ped-BACKPACK.png => equipped-BACKPACK.png} | Bin .../{satchel-hydroponics.png => icon.png} | Bin .../satchel_hydroponics.rsi/inhand-left.png | Bin 0 -> 669 bytes .../satchel_hydroponics.rsi/inhand-right.png | Bin 0 -> 639 bytes .../satchel_hydroponics.rsi/meta.json | 16 ++- ...ped-BACKPACK.png => equipped-BACKPACK.png} | Bin .../{satchel-medical.png => icon.png} | Bin .../satchel_medical.rsi/inhand-left.png | Bin 0 -> 575 bytes .../satchel_medical.rsi/inhand-right.png | Bin 0 -> 612 bytes .../Satchels/satchel_medical.rsi/meta.json | 16 ++- ...ped-BACKPACK.png => equipped-BACKPACK.png} | Bin .../{satchel-science.png => icon.png} | Bin .../satchel_science.rsi/inhand-left.png | Bin 0 -> 591 bytes .../satchel_science.rsi/inhand-right.png | Bin 0 -> 603 bytes .../Satchels/satchel_science.rsi/meta.json | 14 ++- ...ped-BACKPACK.png => equipped-BACKPACK.png} | Bin .../{satchel-security.png => icon.png} | Bin .../satchel_security.rsi/inhand-left.png | Bin 0 -> 584 bytes .../satchel_security.rsi/inhand-right.png | Bin 0 -> 583 bytes .../Satchels/satchel_security.rsi/meta.json | 16 ++- .../Satchels/satchel_virology.rsi/meta.json | 17 --- .../satchel-virology-equipped-BACKPACK.png | Bin 358 -> 0 bytes .../satchel_virology.rsi/satchel-virology.png | Bin 359 -> 0 bytes 47 files changed, 131 insertions(+), 132 deletions(-) rename Resources/Textures/Clothing/Back/Satchels/satchel.rsi/{satchel-equipped-BACKPACK.png => equipped-BACKPACK.png} (100%) rename Resources/Textures/Clothing/Back/Satchels/satchel.rsi/{satchel.png => icon.png} (100%) create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-right.png rename Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/{satchel-captain-equipped-BACKPACK.png => equipped-BACKPACK.png} (100%) rename Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/{satchel-captain.png => icon.png} (100%) create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-right.png rename Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/{satchel-chemistry-equipped-BACKPACK.png => equipped-BACKPACK.png} (100%) rename Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/{satchel-chemistry.png => icon.png} (100%) create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-right.png rename Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/{satchel-engineering-equipped-BACKPACK.png => equipped-BACKPACK.png} (100%) rename Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/{satchel-engineering.png => icon.png} (100%) create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics-equipped-BACKPACK.png delete mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics.png rename Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/{satchel-hydroponics-equipped-BACKPACK.png => equipped-BACKPACK.png} (100%) rename Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/{satchel-hydroponics.png => icon.png} (100%) create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-right.png rename Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/{satchel-medical-equipped-BACKPACK.png => equipped-BACKPACK.png} (100%) rename Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/{satchel-medical.png => icon.png} (100%) create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-right.png rename Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/{satchel-science-equipped-BACKPACK.png => equipped-BACKPACK.png} (100%) rename Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/{satchel-science.png => icon.png} (100%) create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-right.png rename Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/{satchel-security-equipped-BACKPACK.png => equipped-BACKPACK.png} (100%) rename Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/{satchel-security.png => icon.png} (100%) create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology-equipped-BACKPACK.png delete mode 100644 Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology.png diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 43db28946b..dfafbb49b3 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -1,168 +1,121 @@ - type: entity - parent: BackpackClothing - id: Satchel + parent: Clothing + id: SatchelBase name: satchel description: A trendy looking satchel. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel.rsi - state: satchel + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel.rsi - state: satchel + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel.rsi - ClothingPrefix: satchel - type: Storage - capacity: 300 + capacity: 100 - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelEngineering name: engineering satchel description: A tough satchel with extra pockets. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_engineering.rsi - state: satchel-engineering + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_engineering.rsi - state: satchel-engineering + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_engineering.rsi - HeldPrefix: engineering - ClothingPrefix: satchel-engineering - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelMedical name: medical satchel description: A sterile satchel used in medical departments. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_medical.rsi - state: satchel-medical + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_medical.rsi - state: satchel-medical + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_medical.rsi - HeldPrefix: medical - ClothingPrefix: satchel-medical - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelChemistry name: chemistry satchel description: A sterile satchel with chemist colours. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_chemistry.rsi - state: satchel-chemistry + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_chemistry.rsi - state: satchel-chemistry + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_chemistry.rsi - HeldPrefix: medical - ClothingPrefix: satchel-chemistry - type: entity - parent: BackpackClothing - id: SatchelGenetics - name: genetics satchel - description: A sterile satchel with geneticist colours. - components: - - type: Sprite - sprite: Clothing/Back/Satchels/satchel_genetics.rsi - state: satchel-genetics - - type: Icon - sprite: Clothing/Back/Satchels/satchel_genetics.rsi - state: satchel-genetics - - type: Clothing - sprite: Clothing/Back/Satchels/satchel_genetics.rsi - HeldPrefix: medical - ClothingPrefix: satchel-genetics - -- type: entity - parent: BackpackClothing - id: SatchelVirology - name: virology satchel - description: A sterile satchel with virologist colours. - components: - - type: Sprite - sprite: Clothing/Back/Satchels/satchel_virology.rsi - state: satchel-virology - - type: Icon - sprite: Clothing/Back/Satchels/satchel_virology.rsi - state: satchel-virology - - type: Clothing - sprite: Clothing/Back/Satchels/satchel_virology.rsi - HeldPrefix: medical - ClothingPrefix: satchel-virology - -- type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelScience name: science satchel description: Useful for holding research materials. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_science.rsi - state: satchel-science + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_science.rsi - state: satchel-science + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_science.rsi - ClothingPrefix: satchel-science - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelSecurity name: security satchel description: A robust satchel for security related needs. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_security.rsi - state: satchel-security + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_security.rsi - state: satchel-security + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_security.rsi - HeldPrefix: security - ClothingPrefix: satchel-security - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelCaptain name: captain's satchel description: An exclusive satchel for Nanotrasen officers. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_captain.rsi - state: satchel-captain + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_captain.rsi - state: satchel-captain + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_captain.rsi - HeldPrefix: captain - ClothingPrefix: satchel-captain - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelHydroponics name: hydroponics satchel description: A satchel made of all natural fibers. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi - state: satchel-hydroponics + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi - state: satchel-hydroponics + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi - ClothingPrefix: satchel-hydroponics diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel.png rename to Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2f5f5f35cd9b9f80fd44b65f19b8012e8093c02d GIT binary patch literal 577 zcmV-H0>1r;P)T*0sw%u7Jc6%P18f8p%dZ1zu9cud_E6tan!re0>&7pwMJdn0D$dw zi?S>o0BEfNz*SZC=F+-e-}j-djtX7?0BGA5Ns_=?i~W8Ntu>TVXqqOtZWKkZ)lQ^3-0!L2E%5ws4gk8YJNm5aI(&TpC|>tfT73RA`iuX!_e1NxN@LARJiwHTAik&W z?{3|Pn;QVYr^%}+)@hOnbBZw`)VzF@k zEZ=7Ye3Q~7^9W*FAc~^HS$)H?a_VOwndg@XVnv1 z06*@-v-~Ok1*Xa)h`Pp^{#1E{VApIwB99<8qTjxLagup}mzpY%K>v%MyB8=}f&ap@ P00000NkvXXu0mjf(XI>q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7952889f7d695cef1abe5b0c1ea6059c7a29e09f GIT binary patch literal 489 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 O0000a}Y?bnP0)uiFwpmFy)! ze!&ckOiWD7EQzKM7XgLNd%8G=NJzdtcsl5?fq?75!VRAxJNh+pCK-WL1C8J94xJ&ySW$}y2e(o);t{0O1qC-NjF7RHYTJ-U# zH{Y+6JL0O#=M-`Jbp>6Xl*M_jYZKSGZqdsozW&DOPMIAAfG@lw!WJMQ48qT0TD#pSe=?N9q^X tmEMoMt_bmT1vN_x_Ehy(B+rsNWxnb;`+=Sf6ZU`t#?#f$Wt~$(69Bg|k7@t_ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics.png b/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics.png deleted file mode 100644 index ceb3eedb7b38d1d4b264b33942b3e04a1600cf74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5uS0FvDeHM^pNc*p)rDdG< z-+1PKTU%QPASn2sl9JNa);4$U+{1?tU%PhA_?_-Eph~8aAirP+4QI8~LqOh3PZ!4! zjq}L~5*Y__av0LrN9An2k#+UVOyLDJ>x#{v@165IEww-*B;oAs^vd&}-pw^S=hMJ- zXZN)4I^W-FrtLToIibsXxx^VYr=Asd#X9dJ&&_*_}ZqzgI+zozJZ7M1cSCPG0fJgHlJ}?HWCzCp00i_>zopr E0NnqZ?*IS* diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics.png b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3a99826f69a6df9c6fb5f885b438f64a9f5a2df1 GIT binary patch literal 669 zcmV;O0%HA%P)}!X=u$a~t>W&T^FNabx}ib-!|B82|v(c8+jzypM&9 z-DyjJ>@@N4CM&tiE3YCA^&0PBkd z3)U~!IqFVbpHiwdi1GjqD$z0g__4A!_If_EZ3|By$B??OUf06jpT2Ujvacrk{@4w= zu3Go6)UR2N8~CS&u)ZCn#^Dk*4wqftzWNbP)-p3{ka&sm)3@48;K5+$as%o{^@&Ulln^!#(9EKNp1ZA3Tkfs}CnkH$w zL2k1FzY|LPX{8z?XA797*?GTGjg7n}+ZNDtgPh~>-Nqu)FV^tvVGcl)Yl#ldJObMm zn9-+ENT$$gH}THDhE}`DRk}yLoa?)mlSinRb0gJbdjbY!1iZkRM_?O(ZJ##Moe}Wj zU%;z80;}^l&h{#gpzJ&w@G6hs3U?l0SYG83#Q)+u1vyqA{q0j500000NkvXXu0mjf D6W}us literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f486b2d0b923a40f1106fb59413b4ac7df0d44ff GIT binary patch literal 639 zcmV-_0)YLAP)_p zNZ_IlLP#l+9#Wg54uYa0ybkFFgLg@;xyxPJ?`O&J-pjq;``x=+-VY!mA|fIpA|fIp zJEOA&F*;iie#haa2TlerJz2!!+zf)8gvZa0#NFRc+9u%cLYLEqxV=6{<@l<%2t5{_ z9!K=$Hvs@4S?!nv+XO@uNyM}H=C*&c_8p&h4^aP6K|GsBM3Dly3(SW!HuV&f^Xnax zFx;*)mq;R>-N2)fah%pxkj|?(yQw3WNMdq+-QCDt@^fSfV^hG~^OG($63oS$?H8q}?f?CfD#rwXuH$UG1I+hbKhdE>zt)IUFaz zubP3%@fB{b&pk;(*CL7}QstO1x4oum&FfS-CcLN_h$xZ>$*RyaO@w4sxcw@$Jsq~v z@0x*XF#~0@fYaIvl+CR_bE(3u!&yhKK(&~`f;@p-B8jt`I`*WkmYRWTG2=!|_gKy4 z7RNilkD385=W>()KWYXpO3@*Gr}f)n7`okXZ~0j>5Qw9BziS2pkp#bM2F&^UJum&M Zegk7@Qq`sbjdK71002ovPDHLkV1fijE?)ou literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json index dc674418b9..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json @@ -1,17 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "satchel-hydroponics-equipped-BACKPACK", + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", "directions": 4 }, { - "name": "satchel-hydroponics", - "directions": 1 + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical.png b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bb089a8d4403a4c2bf1877f2e17c2ac404c33e33 GIT binary patch literal 575 zcmV-F0>J%=P)Ks5I38Fh(;-6$#mPXEEvrLjlT0Dd&4ALaLqLZMbm`z=p&bHd za1?aPdP0^Eb#r(b${9^AA>Qx(u7P|%%W)^Xd-s07JBRlGA|fIpA|fIpB8sBf?n<-W zmH(Z`x;|(GX|}uadE*m$caBE56}7r2%f~mVR`+D+Pi5#&W&7JtS-!3jS43p!PpuTd zc*%m*Z+V?3zwPa8;m_YIRChPmzE2Pr0CJfm0Kjn^^)2>MBS_2ZU~gv&xl9uId>(_r z0Hg5?Ew6)YI%O31^q_*#c(y2lHsf!Ae{+k|gUVtDlu9K456SyCw?=Uf&n}S5BrzJ# zOj8YIT!3skwMcF>o}tlbtei*P0gvO_qVi6?^!Imuc8GqzAL%}i<3{}o{ z-8Al-6qc;U1K2Er`j&ECR}zT?0AN0!N8bKnakXL*5fKp)5fKp)5s{`i<^;6n5me>_ zmVN#HTY7hn)goxlBd8bPs9eBgGSLpZB51fCl?yPPM^J4v1PT25ae^=V$H=Br>isrZZw|Z+MaD^dcGR3KrF_5TkY(L_I-aEA9zaAyL_|bHL_|b7w(E=S z`jU1YCOwJs=ioAjqr-hn-H>mFS zta)&r%O?0AZ+>NYD5WHy&jSEvvl%*_PA1EKky1(?L!LxLL_|bHL_|bHkJF}l29k;q zt3P0wP4o=dt}nr54zDl18IKWr0dDsUoE`50K;oOFk(#{#5fKp)5fKp)5$(e{7yBsUzn_!A=i+cU#9NE79oYcT*5;aQz9sMP*pTdgUMuqrfHz65D{FLr^&g!UN3dbdnMn16L*CW ze#hKBsSpBA+!el+wz-y)H=r!bBLEQq>bl0r)YzTWv~ci;P| zxlhurVJ*Huo11WC9XRM*#23p~0DzyJANaETXtKtja}lkwh=_=Yh=_=Yh=|D2A$kH& zwvSMth^iWk7Kd}rnXO^c4_K?JD$cOlbOqYdRv#gmh^((=?4yYLb_4!qefoFT5|OB? zk6zQH9{>Q}`?!9Ve|eeV-G^gLr&j6PEc*y%KLHWJd#RA;If|k{p66E4TdeyCW;Y;& zfPrr?ZR^-?S@#jlHemh5|Lh3dKI1plRv*FCA)e{C)kjEn$N?<+2xeFG4L(K7KEOk@ d)kmQJ#V;koIchLGih=+D002ovPDHLkV1lH-5t#r0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a3d1c9fe225f195b155b9be664dd185f6ddd90e4 GIT binary patch literal 603 zcmV-h0;K(kP)BjE7zW@s#X}ZD!DH#FL0d2xG~AS*;6O)vI5K2up_%*xZfbtOfdYoE?%W^n4F-pj zOakAa4xI%BFW#<0qoi&u*NUY`Dep5GpSkbV@yW}501*)p5fKp)5fK&X!+Nc?Z#qYn zUX}Ur8Gzw%h&CTWAJzldIpfv?P)glzk|c?rV+H3N7K_DxDQk2FKty~LMQizs6dr)q z+8bk_l=6L8ABG`rafr!e0%J^TyI_vh{pZnW^v|4~ZHpoTV+?w|9!^g~e4Z*~SqKrS zC~iHRa|nW9r<{cya1$RxDFqQhmSvbur^vDlA_AopZsOxgLsuz(_+4@qcEFLohI7A{ zopWnz&N&?EYkZ3RyoRme5K0Y50L{z{jJIyqgqw&zjZ!flO|>c&aXPSybN*vv4bEm5D`Bfk1M(TDfJ38H8T)J5v;X{ zq6i;U0;N=Cdzb2fre+3ach}tjFfiGp+WRPV08Pvc-0ivc-v3?u*)%yb(2A@1re_A~ ps8zaUo1PiS>tEqLX8@=IzW~`9Hot8_`|JP!002ovPDHLkV1leg3XlK* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json index 8c4a68e1f8..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json @@ -1,16 +1,26 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "satchel-science", + "name": "icon", "directions": 1 }, { - "name": "satchel-science-equipped-BACKPACK", + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security.png b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2311df1b11351156f74b9988c749ccfc231815ff GIT binary patch literal 584 zcmV-O0=NB%P)fZ@qJGM)s>%bv z`F!4_xvLwHrm4^K9IvmhD9aKaYA&>{>${5%xmlK>swzK@5|41M22DTS`<5JeG;F*m>GZEhUL==&Z`)2yy{>7ztQQ55L9ZhjtyVgB7(yDB%1 zV~pd7EX&X|&FWg0RyW|s>iYeDk0eRvqu`u_wH8mttjZ0$YO5n4@(~08r4*cVI3AC1 z&Os?9mfQC|;y4z`TM{_}VYTu+pU=Ow7RH#}GjR8ZaGARWkp=+3lQ9UV{c^e7_2K(d z?mut2+G|#Si=2lz0saN>C*h){^N5Iuh=_=Yh=_kDtVMZWH5)8wD zD2k-w-;tb05Nkl5=LoAGwrAV6Qt>nCc?8k%#zxWQG WH6i_*(gSV)0000cN^eop0NqqWi7cg^G;fIW z6l~)RU`OZcu;sZw2nyc|5D^g(5fKp)5m6uC_l=a&%$oq*jLzZQT;}}XQlx2ycDBihF-UVBHRaMYhU(NICOHc>_r4+W?EtFCaLb%Iz z1h)8F^St;7ymrroVb~q|$af#W;5;uj0QlVm0MJ_Fr6?SvIUcRGyF5R=7T$OLsGR1x z1I$;z?4G3fXUUU@h=_=Yh=_=Y=s8WbGw@@ie|rb-2mH<0I|IJ&o6iuVjN}J5VCtQL z^E2Z(Mv^2>V+@+{Nh!_gbV3wG-5lP|;_NKm_1sWOX;!NhJkRTfvxmdMS&XZ*!MEnv z8K~0qX#u$uAKq3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json index 01776a4c20..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json @@ -1,17 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "satchel-security-equipped-BACKPACK", + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", "directions": 4 }, { - "name": "satchel-security", - "directions": 1 + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json deleted file mode 100644 index a29abae487..0000000000 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "satchel-virology", - "directions": 1 - }, - { - "name": "satchel-virology-equipped-BACKPACK", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology-equipped-BACKPACK.png deleted file mode 100644 index 49725f781dfd191b4671b3667dbe7a0b88c0970b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!Yyx~jT!D0*^lBfYx?1Vg*REYN z5_C#QNdXEnq%klwFfdGJ(9+T}p2=WqYYP;gJ9qB9dGoGby><7E`qHk>4ua{GFkN`d8=fm|v!Idea~7cL!OPALdLyvh%EDL7R~E^7E2j zb69FSogYa(KGLMeU3UJM=*mKlT{<`R)~V^atd=?Ra^r(1kF_l(duu+L@WQxm#gs`u zwe#0@#UGoIb=xTY%BmSlZXIFmjC_Ad`t+xOeT?$T>=hHfUuy*Vj=|H_&t;ucLK6TC CFqE+X diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology.png b/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology.png deleted file mode 100644 index 809f1b86e011f4bf06200b2c50a7b03003b0f827..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmV-t0hs=YP)S-!^76r*7#F+<^TWy0(4SN zQvfJKCS}3^008GnL_t(2&tqU1Xuxc20B5gSY_-^GRcL4cl+ShUir*98H%pzvp#p2( zKCgRTckh&OX#rH=-u1fYwQo-`!v)TQRNOhmU>*oDqWjG8y5}`#b}TT4m}+&R`-smG zpB+6=0p_SPCt93TJbKP7HU=v&UA218Wz9*pr*}aFn4`|UJAF2D+MPY`-YkF$yxx5; zE$!{@eGmcD(AE3)zI~*3@Am6m5F-NCyxV*4-MhE9-