From 6bfd1d8f11c48b8f6b0095ce82e64840856deaf9 Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Fri, 31 Mar 2023 14:46:06 +1000 Subject: [PATCH] Missing box icons (#14891) * boxes * holo box --- .../Catalog/Fills/Boxes/ammunition.yml | 79 ++++++++++-------- .../Catalog/Fills/Boxes/general.yml | 6 +- .../Catalog/Fills/Boxes/medical.yml | 4 + .../Catalog/Fills/Boxes/security.yml | 3 +- .../Syndicate_Gadgets/guardian_activators.yml | 1 + .../Weapons/Guns/Ammunition/Boxes/toy.yml | 24 +++--- .../Storage/boxes.rsi/box_security.png | Bin 337 -> 285 bytes .../Objects/Storage/boxes.rsi/boxwidetoy.png | Bin 0 -> 253 bytes .../Objects/Storage/boxes.rsi/flare.png | Bin 0 -> 223 bytes .../Objects/Storage/boxes.rsi/forensic.png | Bin 0 -> 335 bytes .../Objects/Storage/boxes.rsi/holo.png | Bin 0 -> 272 bytes .../Objects/Storage/boxes.rsi/inflatable.png | Bin 0 -> 278 bytes .../Objects/Storage/boxes.rsi/magazine.png | Bin 0 -> 219 bytes .../Objects/Storage/boxes.rsi/meta.json | 31 ++++++- .../Objects/Storage/boxes.rsi/shelltoy.png | Bin 0 -> 248 bytes .../Objects/Storage/boxes.rsi/swab.png | Bin 0 -> 220 bytes .../Objects/Storage/boxes.rsi/trashbag.png | Bin 0 -> 290 bytes .../Guns/Ammunition/Boxes/magnum.rsi/cap.png | Bin 0 -> 189 bytes .../Ammunition/Boxes/magnum.rsi/capbase.png | Bin 0 -> 307 bytes .../Ammunition/Boxes/magnum.rsi/meta.json | 8 +- 20 files changed, 105 insertions(+), 51 deletions(-) create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/flare.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/forensic.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/holo.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/magazine.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/swab.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index 6b30184d17..571abe50e0 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -1,8 +1,19 @@ # As opposed to MagazineBox these are boxes of magazines so BoxMagazine # CaselessRifle - type: entity - name: box of .25 caseless magazines + name: box of magazines parent: BoxCardboard + id: BoxMagazine + description: A box full of magazines. + components: + - type: Sprite + layers: + - state: box_security + - state: magazine + +- type: entity + name: box of .25 caseless magazines + parent: BoxMagazine id: BoxMagazinePistolCaselessRifle description: A box full of .25 caseless magazines. components: @@ -13,7 +24,7 @@ - type: entity name: box of .25 caseless (high-velocity) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolCaselessRifleHighVelocity description: A box full of .25 caseless high-velocity magazines. components: @@ -24,7 +35,7 @@ - type: entity name: box of .25 caseless (practice) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolCaselessRiflePractice description: A box full of .25 caseless practice magazines. components: @@ -35,7 +46,7 @@ - type: entity name: box of .25 caseless (rubber) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineCaselessRifleRubber description: A box full of components: @@ -47,7 +58,7 @@ # LightRifle - type: entity name: box of .30 rifle magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineLightRifle description: A box full of .30 rifle magazines. components: @@ -58,7 +69,7 @@ - type: entity name: box of .30 rifle (high-velocity) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineLightRifleHighVelocity description: A box full of .30 rifle (high-velocity) magazines. components: @@ -69,7 +80,7 @@ - type: entity name: box of .30 rifle (practice) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineLightRiflePractice description: A box full of .30 rifle (practice) magazines. components: @@ -80,7 +91,7 @@ - type: entity name: box of .30 rifle (rubber) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineLightRifleRubber description: A box full of .30 rifle (practice) magazines. components: @@ -91,7 +102,7 @@ - type: entity name: box of Vector magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineMagnumSubMachineGun description: A box full of Vector magazines. components: @@ -102,7 +113,7 @@ - type: entity name: box of Vector (high-velocity) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineMagnumSubMachineGunHighVelocity description: A box full of Vector (high-velocity) magazines. components: @@ -113,7 +124,7 @@ - type: entity name: box of Vector (practice) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineMagnumSubMachineGunPractice description: A box full of Vector (practice) magazines. components: @@ -124,7 +135,7 @@ - type: entity name: box of Vector (rubber) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineMagnumSubMachineGunRubber description: A box full of Vector (rubber) magazines. components: @@ -136,7 +147,7 @@ # Pistol - type: entity name: box of WT550 .35 auto magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolSubMachineGunTopMounted description: A box full of WT550 .35 auto magazines. components: @@ -147,7 +158,7 @@ - type: entity name: box of pistol .35 auto magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistol description: A box full of pistol .35 auto magazines. components: @@ -158,7 +169,7 @@ - type: entity name: box of pistol .35 auto (high-velocity) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolHighVelocity description: A box full of pistol .35 auto (high-velocity) magazines. components: @@ -169,7 +180,7 @@ - type: entity name: box of pistol .35 auto (practice) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolPractice description: A box full of magazines. components: @@ -180,7 +191,7 @@ - type: entity name: box of pistol .35 auto (rubber) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolRubber description: A box full of pistol .35 auto (rubber) magazines. components: @@ -191,7 +202,7 @@ - type: entity name: box of machine pistol .35 auto magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolHighCapacity description: A box full of machine pistol .35 auto magazines. components: @@ -202,7 +213,7 @@ - type: entity name: box of machine pistol .35 auto (high-velocity) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolHighCapacityHighVelocity description: A box full of machine pistol .35 auto (high-velocity) magazines. components: @@ -213,7 +224,7 @@ - type: entity name: box of machine pistol .35 auto (practice) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolHighCapacityPractice description: A box full of machine pistol .35 auto (practice) magazines. components: @@ -224,7 +235,7 @@ - type: entity name: box of machine pistol .35 auto (rubber) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolHighCapacityRubber description: A box full of machine pistol .35 auto (rubber) magazines. components: @@ -236,7 +247,7 @@ - type: entity name: box of SMG .35 auto magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolSubMachineGun description: A box full of SMG .35 auto magazines. components: @@ -247,7 +258,7 @@ - type: entity name: box of SMG .35 auto (high-velocity) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolSubMachineGunHighVelocity description: A box full of SMG .35 auto (high-velocity) magazines. components: @@ -258,7 +269,7 @@ - type: entity name: box of SMG .35 auto (practice) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolSubMachineGunPractice description: A box full of SMG .35 auto (practice) magazines. components: @@ -269,7 +280,7 @@ - type: entity name: box of SMG .35 auto (rubber) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazinePistolSubMachineGunRubber description: A box full of SMG .35 auto (rubber) magazines. components: @@ -281,7 +292,7 @@ # Shotgun - type: entity name: box of (.50 pellet) ammo drums - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineShotgun description: A box full of (.50 pellet) ammo drums. components: @@ -292,7 +303,7 @@ - type: entity name: box of (.50 beanbag) ammo drums - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineShotgunBeanbag description: A box full of (.50 beanbag) ammo drums. components: @@ -303,7 +314,7 @@ - type: entity name: box of (.50 slug) ammo drums - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineShotgunSlug description: A box full of (.50 slug) ammo drums. components: @@ -314,7 +325,7 @@ - type: entity name: box of (.50 incendiary) ammo drums - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineShotgunIncendiary description: A box full of (.50 incendiary) ammo drums. components: @@ -325,7 +336,7 @@ # base BallisticAmmoProvider boxes - type: entity - parent: BoxCardboard + parent: BoxMagazine id: BoxAmmoProvider abstract: true components: @@ -438,7 +449,7 @@ # Rifle - type: entity name: box of .20 rifle magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineRifle description: A box full of .20 rifle magazines. components: @@ -449,7 +460,7 @@ - type: entity name: box of .20 rifle (high-velocity) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineRifleHighVelocity description: A box full of .20 rifle (high-velocity) magazines. components: @@ -460,7 +471,7 @@ - type: entity name: box of .20 rifle (practice) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineRiflePractice description: A box full of .20 rifle (practice) magazines. components: @@ -471,7 +482,7 @@ - type: entity name: box of .20 rifle (rubber) magazines - parent: BoxCardboard + parent: BoxMagazine id: BoxMagazineRifleRubber description: A box full of .20 rifle (rubber) magazines. components: diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index a1c30d9d2e..a8645dd050 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -220,7 +220,7 @@ - type: Sprite layers: - state: box - - state: writing + - state: inflatable - type: Tag tags: - DroneUsable @@ -252,7 +252,7 @@ - type: Sprite layers: - state: box - - state: writing + - state: flare - type: entity name: trashbag box @@ -272,7 +272,7 @@ - type: Sprite layers: - state: box - - state: writing + - state: trashbag - type: Tag tags: - DroneUsable diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index ddf3e907d0..4a352b4990 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml @@ -97,6 +97,10 @@ contents: - id: DiseaseSwab amount: 30 + - type: Sprite + layers: + - state: box + - state: swab - type: entity name: body bag box diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml index 2fb402acae..1c35b12501 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml @@ -70,4 +70,5 @@ amount: 10 - type: Sprite layers: - - state: box_security \ No newline at end of file + - state: box_security + - state: forensic \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml index 6a8ceb04f5..f052743b46 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml @@ -38,3 +38,4 @@ - type: Sprite layers: - state: box + - state: holo diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml index 762352b173..64f29a6eee 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml @@ -18,7 +18,7 @@ - type: entity parent: BoxDonkSoftBase id: BoxDonkSoftBox - name: foam dart box + name: box of foam darts components: - type: BallisticAmmoProvider whitelist: @@ -27,20 +27,24 @@ capacity: 40 proto: BulletFoam - type: Sprite - sprite: Objects/Fun/toys.rsi - state: foambox + sprite: Objects/storage/boxes.rsi + layers: + - state: boxwidetoy + - state: shelltoy - type: entity - parent: BoxDonkSoftBase + parent: BaseMagazineBoxMagnum id: BoxCartridgeCap name: cap gun cartridge box components: - type: BallisticAmmoProvider - whitelist: - tags: - - CartridgeCap - capacity: 20 proto: CartridgeCap + capacity: 20 - type: Sprite - sprite: Objects/Storage/boxes.rsi - state: box + sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi + layers: + - state: capbase + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: cap diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png index eb5120f8123e7f2a716fb80b672c06dd12779fdc..e66b288c347a25792dc840cba5d9005d276eb461 100644 GIT binary patch delta 269 zcmcb}G?!_DWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hcfKQ04 zyQgzwZBs#U&bk!~%aW7Z8KjRfYgIDvOr1J)2ZQvHBS*Gx-wsq;t9!*5Nb!~g`33(+ z0t~hczR98}^>Fcmhb-QQIjv^+9`O0mSg|j88{NByqX#UJxGHUH$i=OZwsh~bo~>VIVi#xFn{89ZIt{9M*K HB{Ts5S1MnVeQJ)QqkV!_Vs zd-2-ALX06+CiV>Pzr7;KVnHr3hGS&@TlBqNRqYfY{4KOf3;&i|qpsOuUmf^?F zP{{!^7cL^p0mJ~J9H1|yz`(%3z;N-|0|rekO}uKaU%QT?o_{J1fEnhn{RV^muIG5w z9sK)|;eaQ?(NuGQ(e{%J2HRINd?cXGfPsPGlV>Qy-(=z(Ky)^=XW%DRDM@OH4gnZY zQc}VzfA8KslFTF70i;?$bq6po;0^_H97mP|s2K`GC&GgS(?5A?i4K9k$>9taJX079 z38*^{RZDdTFgh?WFdXpIV0cfUfVueW0fRmXW)kH95R^KpeSd7M`SSr1K(i~W;~w1A_XWI>6JO04es8Aiv=MV89^d&Flsg z;wxz2K6Vd9ifCr$~b*7kv|2FL5+1WR~sGVqi2gW6!lvI6;>1s;*b3=DjSK$uZf!>a)(_{7u2F(ktM?d6SGhXO>7ecUhT%-Pgz79x08 zgkAQ{g|NG|D(2fBW!NqcV^+><|X z+cfVdcLUM?q{DL$v)6l+_t> eb?Vs7u>apHvt6H6xPcyLVDNPHb6Mw<&;$UwEry@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/holo.png b/Resources/Textures/Objects/Storage/boxes.rsi/holo.png new file mode 100644 index 0000000000000000000000000000000000000000..366c8a0ca770a5f611cb79831b9252090fca43fe GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;8IT)$B+p3x0kf}m<$Ej9z^OfZ4zoaSTtwe zib>T8yY?}qs9w2xUElaFCud(~lfuvaDMtNWc4eGEtqD_#-z|FTo@<(E_K;V3Is5U= z{2kk5cF*}-nOon(zu}0)^lMT4D^r)9R+B!Pwl&O4^Xr7FDL)yCE(8QVmo5^-7}k+Dn6O9c$UUp?6AMV0xh5`bE{P#ewtNeD|zr zN(<26v!VCavF1G+`atFeWxfDXLM1_d!T-?#!=wHCg@Cf01s;*b3=DjSL74G){)!Z! zptq-sV~B-+vVaPMo2bKq6-*os!3PeUIKq+Y#JGwnO)Si;j8B7|DL~YqsHpJs0;$GT y4b%JM8$?4n&hqx~^ice-`0J+~BSEQ6=3pUXO@geCwlm14L6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/magazine.png b/Resources/Textures/Objects/Storage/boxes.rsi/magazine.png new file mode 100644 index 0000000000000000000000000000000000000000..ed8cda38141ba7990cd446a4106391ca8b958e4f GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbU?d|PVRaH4SI6^~1fnxW+-M$K>SWANZg8u^n!|!c;!9W4d0*}aI z1_r*vAk26?e?7X>!|KU23rkX!u3)`O3=dw#uWuu|Yo zx~#@MLE?fMf0AtOu4b1Tzl9lA>Wazin(+7G)q`QCj1`Ie%fnN(uK>+s@O1TaS?83{ F1ORGBML7Tf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 9f2187d57d..a20436fcf3 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively", "size": { "x": 32, "y": 32 @@ -35,7 +35,7 @@ "name": "sechud" }, { - "name": "bottle" + "name": "bottle" }, { "name": "box" @@ -43,6 +43,9 @@ { "name": "boxwide" }, + { + "name": "boxwidetoy" + }, { "name": "box_hug" }, @@ -70,15 +73,27 @@ { "name": "flashbang" }, + { + "name": "flare" + }, + { + "name": "forensic" + }, { "name": "glasses" }, { "name": "handcuff" }, + { + "name": "holo" + }, { "name": "implant" }, + { + "name": "inflatable" + }, { "name": "latex" }, @@ -91,6 +106,9 @@ { "name": "lighttube" }, + { + "name": "magazine" + }, { "name": "mousetraps" }, @@ -109,9 +127,15 @@ { "name": "sterile" }, + { + "name": "swab" + }, { "name": "syringe" }, + { + "name": "trashbag" + }, { "name": "writing" }, @@ -161,6 +185,9 @@ { "name": "shellslug" }, + { + "name": "shelltoy" + }, { "name": "ziptie" } diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png new file mode 100644 index 0000000000000000000000000000000000000000..24cdffb4446a2717d0498f58b0126a6286794270 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST8Pfh6&-^cAD3zX`zG^1J|Nq>l4lsN@toP?~Hc-g~fBgs`#Z?mI z7yKUv7&e{JIS&-&EbxddW?05ar{5)cl?cp zH8$0B#4QB9k^>bP0l+XkKU1wOM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/swab.png b/Resources/Textures/Objects/Storage/boxes.rsi/swab.png new file mode 100644 index 0000000000000000000000000000000000000000..48f35c7dc71f4f16cd6436e56f50b2f92fd6d634 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V4~}QdRNQJ zYU}0;S1(=+eSV_-8-rM;?7!wqEqwDQa0vOy3+5ypn4m@i~OB78SlJ&AH+0T0WD|n MboFyt=akR{0CiYQ>i_@% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png b/Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png new file mode 100644 index 0000000000000000000000000000000000000000..39c87250da1707e90e0f268bbd8d85a601314da2 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;C4?J$B+p3w-+~Z9WoGLdk}xTPc?ZNPgKEY z)?Z9_-*o?!Nz-C|Zs(}Jl<(}dh29EtZ+ZIeWjBa)*}>n(U9Ko2Zg5N@x##b#wxSK2 zbmrSVuk2fvxnOHwRkpX~4V&{f3(H+YL%*Mn3^t9qa>X_9O{>7%ATG~I3vzGIE`Aqs z{cH2O8r?GHxl=CXC-#0!lvI6;>1s;*b3=DjSL74G){)!Z!V34PaV@QO1vIOhm1d*PmKm#tfgBl8=66gQ? zx7X3(JtfU>K)B|q{RzPUy`v4BUXxk!-tFQ_4dgpf#9(@G1+z!lf$8ee2P+_2+c*;v a7#Q+X1X7E0dEWs|XYh3Ob6Mw<&;$UuyEa<@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png new file mode 100644 index 0000000000000000000000000000000000000000..902234628d0903080d21f02b5c16592bbdfd8d77 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST8A2HtY#0pNRqgu}1)>=;4+L8n85wA4X{)LNl^j2I?hKIPDhcun z{tp8To6hK*2a0kQctjR6Fz_7)VaDV6D^h@h9iA?ZAr}5mFF5iwDDb#kywr5-cYK7F zMlj>uorPgD{wHxP(f=(Ku!3EJ=~24F8Rm-(U)2k~G+H>mEf&yHXo|jRrSRzF*FYA} zo_Q4sw*E_Em)_LL>SyxjYKW3&TDoOUEmK8o(97TrMPB>L55#f(7D#XxaAI7i9B_9V nPtErO|B7ChUwAL>P|7|xSME;gGNwkLn;1M@{an^LB{Ts5^5SgE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json index a85b6144c4..5473222995 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi. capbase and cap modified from base and rubber by potato1234x (github) for ss14", "size": { "x": 32, "y": 32 @@ -10,9 +10,15 @@ { "name": "base" }, + { + "name": "capbase" + }, { "name": "mag-1" }, + { + "name": "cap" + }, { "name": "hv" }, -- 2.51.2