]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cabinetification (#34293)
authorPs3Moira <113228053+ps3moira@users.noreply.github.com>
Tue, 4 Feb 2025 07:52:10 +0000 (23:52 -0800)
committerGitHub <noreply@github.com>
Tue, 4 Feb 2025 07:52:10 +0000 (00:52 -0700)
* Resprite Boxes and Icons + Remove Boxes

* Update Meta

* Update Flatpacks

* Update Shotgun Ammo Boxes

* Remove Leftover Ammo Box Icons

* Update Donk Pocket Boxes

* Update Briefcase

* Update Happyhonk + Remove Open Sprites

* Update Medal Case

* Update Cigarette Packs

* Update Cigarette Cartons

* Update Medkits

* fix positioning for medkits

* Update Junk Medkit

* Update Present

* Tweak Rad and Burn Medkits

* Tweak Briefcase

* Update Toolboxes

* Update Decoy Boxes

* Fix Meta for Healing toolbox

* Update Cow tool box

* Update Donut Box

* Removal of left over rubber bullet sprites and duplicate ammo box sprites

* Removal of Duplicate Ammo Boxes

* Update .20 rifle ammo box

* Update .35 ammo box + fix meta

* Update .45 magnum ammo box Sprites

* Update .25 caseless ammo

* Remove leftover box

* Update cargo_service.yml

* Fix Icon Cigs

* fix big .20 ammo box

* Update Black Cigs Pack

* Update Cig Placement

* Update Blue Cigs

* Update Cig Packs

* Re-Add Big Ammo box for the USA guns vending machine lol

* Remove 10x24 mention in migration.yml

* Update Big Cig Cartons

* Remove Toolbox Changes

438 files changed:
Resources/Prototypes/Catalog/Cargo/cargo_service.yml
Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png
Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png
Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png
Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png
Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png
Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png
Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png
Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/stonk-box.png
Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png [deleted file]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/open.png [deleted file]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png [deleted file]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/open.png [deleted file]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png [deleted file]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/open.png [deleted file]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png [deleted file]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png [deleted file]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png [deleted file]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/open.png [deleted file]
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json
Resources/Textures/Objects/Decoration/present.rsi/meta.json
Resources/Textures/Objects/Decoration/present.rsi/present.png
Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png
Resources/Textures/Objects/Devices/flatpack.rsi/base.png
Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png
Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png
Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png
Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png
Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png
Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png
Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png
Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png
Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png
Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png
Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png
Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png
Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-left.png [deleted file]
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-right.png [deleted file]
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png [deleted file]
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png
Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/icon.png
Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/meta.json
Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-open.png [deleted file]
Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box.png
Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/meta.json
Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-open.png [deleted file]
Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box.png
Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/meta.json
Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-open.png [deleted file]
Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box.png
Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/meta.json
Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-open.png [deleted file]
Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box.png
Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/meta.json
Resources/Textures/Objects/Storage/boxes.rsi/agrichemkit.png
Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
Resources/Textures/Objects/Storage/boxes.rsi/box.png
Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
Resources/Textures/Objects/Storage/boxes.rsi/box_id.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
Resources/Textures/Objects/Storage/boxes.rsi/candle.png
Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
Resources/Textures/Objects/Storage/boxes.rsi/clown.png
Resources/Textures/Objects/Storage/boxes.rsi/darts.png
Resources/Textures/Objects/Storage/boxes.rsi/disk.png
Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
Resources/Textures/Objects/Storage/boxes.rsi/envelope.png
Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
Resources/Textures/Objects/Storage/boxes.rsi/flare.png
Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
Resources/Textures/Objects/Storage/boxes.rsi/france.png
Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
Resources/Textures/Objects/Storage/boxes.rsi/headset.png
Resources/Textures/Objects/Storage/boxes.rsi/heart.png
Resources/Textures/Objects/Storage/boxes.rsi/holo.png
Resources/Textures/Objects/Storage/boxes.rsi/implant.png
Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
Resources/Textures/Objects/Storage/boxes.rsi/internals.png
Resources/Textures/Objects/Storage/boxes.rsi/latex.png
Resources/Textures/Objects/Storage/boxes.rsi/light.png
Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
Resources/Textures/Objects/Storage/boxes.rsi/meson.png
Resources/Textures/Objects/Storage/boxes.rsi/meta.json
Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png
Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
Resources/Textures/Objects/Storage/boxes.rsi/pda.png
Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/shelluranium.png [deleted file]
Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
Resources/Textures/Objects/Storage/boxes.rsi/swab.png
Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png
Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
Resources/Textures/Objects/Storage/boxes.rsi/vials.png
Resources/Textures/Objects/Storage/boxes.rsi/writing.png
Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
Resources/Textures/Objects/Storage/boxicons.rsi/beaker.png
Resources/Textures/Objects/Storage/boxicons.rsi/bodybags.png
Resources/Textures/Objects/Storage/boxicons.rsi/box.png
Resources/Textures/Objects/Storage/boxicons.rsi/box_of_doom.png
Resources/Textures/Objects/Storage/boxicons.rsi/circuit.png
Resources/Textures/Objects/Storage/boxicons.rsi/disk_kit.png
Resources/Textures/Objects/Storage/boxicons.rsi/donk_kit.png
Resources/Textures/Objects/Storage/boxicons.rsi/flashbang.png
Resources/Textures/Objects/Storage/boxicons.rsi/glasses.png
Resources/Textures/Objects/Storage/boxicons.rsi/handcuff.png
Resources/Textures/Objects/Storage/boxicons.rsi/implant.png
Resources/Textures/Objects/Storage/boxicons.rsi/latex.png
Resources/Textures/Objects/Storage/boxicons.rsi/light.png
Resources/Textures/Objects/Storage/boxicons.rsi/lightmixed.png
Resources/Textures/Objects/Storage/boxicons.rsi/lighttube.png
Resources/Textures/Objects/Storage/boxicons.rsi/meson.png
Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
Resources/Textures/Objects/Storage/boxicons.rsi/mousetraps.png
Resources/Textures/Objects/Storage/boxicons.rsi/pda.png
Resources/Textures/Objects/Storage/boxicons.rsi/pillbox.png
Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png
Resources/Textures/Objects/Storage/boxicons.rsi/solution_trays.png
Resources/Textures/Objects/Storage/boxicons.rsi/sterile.png
Resources/Textures/Objects/Storage/boxicons.rsi/syringe.png
Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png
Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png
Resources/Textures/Objects/Storage/boxicons.rsi/vials.png
Resources/Textures/Objects/Storage/boxicons.rsi/ziptie.png
Resources/Textures/Objects/Storage/donkpocket.rsi/icon.png [deleted file]
Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-left.png [deleted file]
Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-right.png [deleted file]
Resources/Textures/Objects/Storage/donkpocket.rsi/meta.json [deleted file]
Resources/Textures/Objects/Storage/medalcase.rsi/closed.png
Resources/Textures/Objects/Storage/medalcase.rsi/meta.json
Resources/Textures/Objects/Storage/medalcase.rsi/open.png
Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon-open.png [deleted file]
Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon.png
Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/meta.json
Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png
Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png
Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png
Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png
Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png
Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json
Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json
Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json
Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json
Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json
Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json
Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-2.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-3.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-10x24.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-b.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-2.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-3.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-2.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-3.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber-b.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base-b.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-2.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-3.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-b.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-big.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-2.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-3.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice-b.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png [deleted file]
Resources/migration.yml

index 42b44535734289a5e347a22a3ece0f2b07651a1f..ac7f02bd220e8e408b51ed956b25cae441f13b10 100644 (file)
@@ -52,7 +52,7 @@
   id: ServiceSmokeables
   icon:
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
-    state: closed
+    state: icon
   product: CrateServiceSmokeables
   cost: 1500
   category: cargoproduct-category-name-service
@@ -62,7 +62,7 @@
   id: ServiceCustomSmokable
   icon:
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
-    state: closed
+    state: icon
   product: CrateServiceCustomSmokable
   cost: 1000
   category: cargoproduct-category-name-service
index 7c515eafacfe5eef05ef282c8cbf734f8a7c5eef..f5ba7b65f91f95bc0f8bf3cc69baa961155058fb 100644 (file)
       - id: FoodCondimentPacketKetchup
   - type: Sprite
     layers:
-      - state: box_olive
+      - state: box
       - state: writing
 
 - type: entity
index 236cf6f27f524d7c5c71c83202c80d64c31a51a2..fe690d8bd1d5e6605793d031ed96a303d0bd3daa 100644 (file)
     state: box
     layers:
     - state: box
-      map: ["closeLayer"]
-    - state: box-open
-      map: ["openLayer"]
   - type: Item
     sprite: Objects/Storage/Happyhonk/clown.rsi
     heldPrefix: box
index 6dcb627652a59828b7eddf9f72e931369cc3d42b..869cb341804f85dbb3e8e3dbe7101e5f0281bd6a 100644 (file)
@@ -6,11 +6,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
-    layers:
-      - state: closed
-        map: ["closeLayer"]
-      - state: open
-        map: ["openLayer"]
+    state: icon
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
     size: Normal
@@ -37,8 +33,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi
-    layers:
-      - state: closed
+    state: icon
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi
   - type: StorageFill
@@ -54,8 +49,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi
-    layers:
-      - state: closed
+    state: icon
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi
   - type: StorageFill
@@ -71,8 +65,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi
-    layers:
-      - state: closed
+    state: icon
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi
   - type: StorageFill
@@ -88,8 +81,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
-    layers:
-      - state: closed
+    state: icon
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
   - type: StorageFill
index 8fe03f3c6e15cc9e1701164b43615c3e2bf28f04..ab071c7a18f1b993d02f63788e20401fd1197509 100644 (file)
   - type: Appearance
 
 # Boxes
-- type: entity
-  parent: BaseMagazineBoxAntiMateriel
-  id: MagazineBoxAntiMaterielBig
-  name: ammunition box (.60 anti-materiel)
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 30
-    proto: CartridgeAntiMateriel
-  - type: Sprite
-    layers:
-    - state: base-b
-      map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   parent: BaseMagazineBoxAntiMateriel
   id: MagazineBoxAntiMateriel
index 3af2b7affbbb5eeadb609fd58f61f7d5212726d1..89ac57e9f6b96e362c36d112357e49f2f54da6a7 100644 (file)
   - type: Appearance
 
 # Boxes
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifle10x24
-  name: ammunition box (.25 caseless)
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 200
-    proto: CartridgeCaselessRifle
-  - type: Sprite
-    layers:
-    - state: base-10x24
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag10-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag10
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifleBig
-  name: ammunition box (.25 caseless)
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 200
-    proto: CartridgeCaselessRifle
-  - type: Sprite
-    layers:
-    - state: base-b
-      map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRifle
index bcd56c1d64a8639b6ca5803a2cfb04033fbb2559..96e922230614d30ed664c7f783abba82a0b36dc7 100644 (file)
   parent: BaseMagazineBoxLightRifle
   id: MagazineBoxLightRifleBig
   name: ammunition box (.30 rifle)
+  suffix: Big
   components:
   - type: BallisticAmmoProvider
     capacity: 200
     proto: CartridgeLightRifle
   - type: Sprite
     layers:
-    - state: base-b
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
+    - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
 
 - type: entity
   parent: BaseMagazineBoxLightRifle
index 98e063e297fdafff2354363586dba3a3eb10f211..e631b9849a101cd7fa0ca44adeab880992a19e93 100644 (file)
   parent: BaseMagazineBoxRifle
   id: MagazineBoxRifleBig
   name: ammunition box (.20 rifle)
+  suffix: Big
   components:
   - type: BallisticAmmoProvider
     capacity: 200
     proto: CartridgeRifle
   - type: Sprite
     layers:
-    - state: base-b
+    - state: base-big
       map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
+    - state: mag-big-1
       map: ["enum.GunVisualLayers.Mag"]
   - type: MagazineVisuals
-    magState: magb
+    magState: mag-big
     steps: 4
     zeroVisible: false
   - type: Appearance
index e5c2987ec3e5e9ca92cf5272104cceb7823c08e8..a26ef19c81cff54cf8adf5c0490154649905152b 100644 (file)
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunBeanbag
+    - type: MagazineVisuals
+      magState: mag-beanbag
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-beanbag-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: beanbag
 
     - type: BallisticAmmoProvider
       proto: ShellShotgunSlug
     - type: MagazineVisuals
-      magState: mag-alt
+      magState: mag-slug
       steps: 5
       zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-alt-1
+      - state: mag-slug-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: slug
 
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunFlare
+    - type: MagazineVisuals
+      magState: mag-flare
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-flare-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: flare
 
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunIncendiary
+    - type: MagazineVisuals
+      magState: mag-incend
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-incend-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: incendiary
 
     - type: BallisticAmmoProvider
       proto: ShellShotgunUranium
     - type: MagazineVisuals
-      magState: mag-alt
+      magState: mag-uranium
       steps: 5
       zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-alt-1
+      - state: mag-uranium-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: uranium
 
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunPractice
+    - type: MagazineVisuals
+      magState: mag-practice
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-practice-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: practice
 
   components:
     - type: BallisticAmmoProvider
       proto: ShellTranquilizer
+    - type: MagazineVisuals
+      magState: mag-tranq
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-tranq-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: tranquilizer
index 11649f3db3ce6f3bcc1f6598542aba02689230c9..e91746109533fe1a0e49a317fd0c871a4cff5667 100644 (file)
   - type: BallisticAmmoProvider
     proto: CartridgeCap
     capacity: 20
+  - type: MagazineVisuals
+    magState: mag-cap
+    steps: 4
+    zeroVisible: false
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
     layers:
-      - state: capbase
+      - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-cap-1
         map: ["enum.GunVisualLayers.Mag"]
-      - state: cap
+      - state: capbase
index bd85e2691b977e7b97c264797f2fa4d268580449..1853962544576f59cfd7c983adb9f1a31832110c 100644 (file)
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazinePistolHighCapacityRubber
-  name: machine pistol magazine (.35 auto rubber)
-  parent: BaseMagazinePistolHighCapacity
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistol
-  - type: Sprite
-    layers:
-    - state: rubber
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazinePistolSubMachineGun
   name: SMG magazine (.35 auto)
index f8064c8a1e3bd23cf9c2e9ccb20e9aebf6c43d5b..25c2a7f538f03edc6b5ee9f05b6c00314e6bb8cd 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png differ
index c2c7c7a503b776c25db1fb36ded475dde10884ff..f4b7bc3409baf365908e93b29c5be15c4c87f0f8 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png differ
index c84d483006f82ba29d72845ff3f6fb0f2990a300..23898baeec77fc8d42bb106fa58910b55a2ca5ee 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png differ
index aa82f12f19c9e1a612f97be49180115022f44308..18103fd70b7c11a2ab5be809fed5ebe20942e1a6 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png differ
index eba69a81bdf21227ea852946a9fdff069a189ac9..89fa566daa1cc5bc1ca650dc690f6556d95db38a 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png differ
index a2228b340ede3df39945e89587416adb5a750d6c..3cbfe7d8e826c7055472764e11dac21d32178c6b 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub).",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub), modified by ps3moira (GitHub)",
   "size": {
     "x": 32,
     "y": 32
index 422474a670274db8485c15086464d268809d2e95..7075a537f113bac17ae4ef3c125d00d3d5134abc 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png differ
index fc539e9bf44c05dd7001cb490f29278c3cdea6e8..ceb45b7a45afb5e94ced18bf90c79cf12df314e6 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png differ
index c69cbd91562c8f862ec768edeba45a90b89c7ddc..16d562fc35798f3baf123625042da96fbd6b23be 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/stonk-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/stonk-box.png differ
index 3585f3f569d4bebd68225beefcb2ba8730bd1f22..750a1c23c71d19ea15b9f3a532cd57413e33266f 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png differ
index c6f6d44f174d59fab5b0a6a5642d1e071ee9c206..e0285dc941f888ca7581a3902f36f7eeac938515 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png differ
index f1a41cf55ba82f03e86f18e90d5cb25f6b4841e0..4710baadb865b0695c235654f527b0e19a473d0d 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png differ
index 025fe8e3dac5006c4cb7dd5dc5f2d73a4c7ff216..137f8b119495d24bb25520a3544ab8a6b46e8e0a 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png differ
index 16121a0c87dd70685eb51053b5e62b8b91b1149e..17264c3a9c17e42e073fbef9ed79a57558f39686 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png differ
index f8a1e823d11dbea2ddb2a221a4057d727f31d958..818f634f7e3d3a8ec69e4bbe34a6c817dda844ca 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png differ
index aa4b401e32308a0b771e2e3c129f623ff7e68356..a47f285299d2467695c3af047ada7c469f95fab0 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png differ
index 3e56e8cdcbf426c4acd6e33bd57ce8eeaa5436ba..253d2ffe319a4529e1739c79b63bceb2c4b96d16 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png differ
index 54cee84dddca00eb652f76a8e8922047ff946e90..e6bd50c9b278bfff41a5273d4055ce825a7e1392 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png differ
index 6bf91e3f5467f12f3c95f3af93749f6f4c44427c..837de9f8e8cfd26805d8666b598e669c08934e9c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, further modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
index 2b414ee5c64c5ec1a1678a732d815770c2656727..725ef66704349114f3d9fc7a93846f966b8b6c09 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png differ
index 1357348e8e77e2a18d1d191fa354e74b87e02bff..9d596296341bd807ae4f4184a20a5d5e63a9b4db 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png differ
index 53175f926389289a44605266d31956a867c2f1c5..d1af5c0b39402316d8cf5c29a4472bd32ec1fef1 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png differ
index e3b5cebcf516e7e2c1e4802d47619b5f77ce6d18..3fcb309665f9ab43edabc8660f2702e74924e4b2 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png differ
index c1a63e01ed2c95669fc7bb942c3eba216646fe0d..386b6fe07615169465e5d0ee1d5b0fad6d8702f6 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png differ
index b9e81b894d6f41ba75fe05605fdf3c30090ffbff..755bdd33691ba0344e5c1612926b4334be9b493b 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png
deleted file mode 100644 (file)
index a2d0089..0000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/icon.png
new file mode 100644 (file)
index 0000000..b39c84b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/icon.png differ
index fa238f8de733fc09a11f0fb87eacb21cad686e3f..58b4056c777061f651cd798fcf1e27a6686ccdc4 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png differ
index 263f797355d36556de8c5472a55fe21f191b7925..1f4db596b35f6e1a451946e34646170eb23d844b 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png differ
index 00190d8818e2812e522efbb81d5d497737e8fad2..fb6ce03e39123bad95513bc7f69d795ea399b199 100644 (file)
@@ -1,17 +1,14 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "open"
-    },
-    {
-      "name": "closed"
+      "name": "icon"
     },
     {
       "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/open.png
deleted file mode 100644 (file)
index be3e5ff..0000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png
deleted file mode 100644 (file)
index 830e4c6..0000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/icon.png
new file mode 100644 (file)
index 0000000..cdfe3ff
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/icon.png differ
index 4022576f4edfba60105ff9c349c4386250237984..94b0334e81ba36e97afeb28eb43afc678dc7e399 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png differ
index c369df8d2cf92395c3f95f0205ed766f861914b8..bc7bada0ec231b8b879eca57f7d49894ba747e41 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png differ
index 00190d8818e2812e522efbb81d5d497737e8fad2..fb6ce03e39123bad95513bc7f69d795ea399b199 100644 (file)
@@ -1,17 +1,14 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "open"
-    },
-    {
-      "name": "closed"
+      "name": "icon"
     },
     {
       "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/open.png
deleted file mode 100644 (file)
index 78a710d..0000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png
deleted file mode 100644 (file)
index 61cc987..0000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/icon.png
new file mode 100644 (file)
index 0000000..9254f71
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/icon.png differ
index 27f428832adebf4ece79e7412691ed49fd36c6eb..ff3c5b713f7d069b491a32728835d5174f1b4b81 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png differ
index c4007a335518dc0ef3c13491aec63c07074ac743..e7778986039df47a04c9d88aee4ff745ee045237 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png differ
index 00190d8818e2812e522efbb81d5d497737e8fad2..fb6ce03e39123bad95513bc7f69d795ea399b199 100644 (file)
@@ -1,17 +1,14 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "open"
-    },
-    {
-      "name": "closed"
+      "name": "icon"
     },
     {
       "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/open.png
deleted file mode 100644 (file)
index 14eb8b6..0000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png
deleted file mode 100644 (file)
index d059801..0000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/icon.png
new file mode 100644 (file)
index 0000000..1f9dd7a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/icon.png differ
index ea9384ff290f7bd7b5912a1edb6b36941de03b42..4a9b516e20ec85b27ec3045814eacf6d30b14f58 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png differ
index 14ea17075c08046414c67670ca19c2f4a82f8be0..5309bd5336b7fd4dfb4c19009512948269e5f30f 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png differ
index 10a573f423a6d1a7c03ccbea41b39517a3717285..1afc0df7587cf0ff5c9eca020900f4e52c18525d 100644 (file)
@@ -1,17 +1,14 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "open"
-    },
-    {
-      "name": "closed"
+      "name": "icon"
     },
     {
       "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png
deleted file mode 100644 (file)
index fe7e453..0000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png
deleted file mode 100644 (file)
index 79e47ba..0000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/icon.png
new file mode 100644 (file)
index 0000000..f1b8138
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/icon.png differ
index 683e37bb459ba44411f199541d26baed92580acb..c31e90a57ce67815b0426579a5bf9e6084eb42be 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png differ
index 57468a3b1b5fe6f6d9a66e4059bdd80a226efc32..1a5afb48f580509593131a9e290e5bc34ae49295 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png differ
index 00190d8818e2812e522efbb81d5d497737e8fad2..fb6ce03e39123bad95513bc7f69d795ea399b199 100644 (file)
@@ -1,17 +1,14 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "open"
-    },
-    {
-      "name": "closed"
+      "name": "icon"
     },
     {
       "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/open.png
deleted file mode 100644 (file)
index ad4eb63..0000000
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/open.png and /dev/null differ
index 0b18a29cdadc89a0e601167b1e0472629d169cb0..f8da9f87633c87ec883fc8dc2a775f2853a620ff 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png differ
index d49b6f112c062ca4deab896a5acd022e4f6faeaa..8412a415e1f15a71175f91ef9c373ea3f224744a 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png differ
index fa238f8de733fc09a11f0fb87eacb21cad686e3f..58b4056c777061f651cd798fcf1e27a6686ccdc4 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png differ
index 263f797355d36556de8c5472a55fe21f191b7925..1f4db596b35f6e1a451946e34646170eb23d844b 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png differ
index 892cbe9a3181992b416143426538fb4f6dbf9243..eadeef0774854f20b16d06227ffaed9c4669eafa 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
index 482f53e0d62a4d2e4ab6fddc8d650ec1248bc9a5..ae1b2f52ad7874bc85c46c7abf2255f69884dfc2 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png differ
index 601d8927fbd166d56cbe88520e4780d0bb1078ec..1b96f9a177c40de56b2094bf06b5c24afd8fd9b0 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png differ
index 21a07b90c88011ce52a10dc0e0080ff954516383..e7ea2c85c2105d132a58eacc6b13f356e201db0e 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png differ
index d49b6f112c062ca4deab896a5acd022e4f6faeaa..1eaa2dfd8438637259437219a16bb187dd1320de 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png differ
index 4022576f4edfba60105ff9c349c4386250237984..94b0334e81ba36e97afeb28eb43afc678dc7e399 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png differ
index c369df8d2cf92395c3f95f0205ed766f861914b8..bc7bada0ec231b8b879eca57f7d49894ba747e41 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png differ
index 892cbe9a3181992b416143426538fb4f6dbf9243..eadeef0774854f20b16d06227ffaed9c4669eafa 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
index 60c7f9975de2ea8c505f8f0ce70dca9a7f91a4ce..7be3b8461267cbd7fdb92cd09dfb82ffb1c95677 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png differ
index a80b8ec86080cf69037136ce3a63194186ae8042..a2a1bfd949e2bf7c90415d61bc9ff5d722ed6908 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png differ
index fa5fa930c1048146ae70e8e30c451413a0bbac84..c2407a0475bf635df5baa96b44d33807804551fa 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png differ
index d49b6f112c062ca4deab896a5acd022e4f6faeaa..b95d877dedc03217c14df939befaea20e5d07e82 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png differ
index 27f428832adebf4ece79e7412691ed49fd36c6eb..ff3c5b713f7d069b491a32728835d5174f1b4b81 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png differ
index c4007a335518dc0ef3c13491aec63c07074ac743..e7778986039df47a04c9d88aee4ff745ee045237 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png differ
index 892cbe9a3181992b416143426538fb4f6dbf9243..eadeef0774854f20b16d06227ffaed9c4669eafa 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
index 463e51db962491c9c6bd1ff6bef48cb5b2518f50..62df18380ff6cfd49b7ae29469b081fb27b9a0c5 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png differ
index 65470ecb3f4a291c38659035a75869e701ead328..78323f265bad4c368da6b73b947206d978fa4f73 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png differ
index 992b30b7aa26cf31fda230d580b4148add0da95c..09153f3251770fcbb4fe436141e0224cf0cf17aa 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png differ
index d49b6f112c062ca4deab896a5acd022e4f6faeaa..6e6ea0a8082b3702c4d7de5634a4327bc2a910c7 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png differ
index d879baa48bb2eda077534f94869c0cdcf6de8232..4a9b516e20ec85b27ec3045814eacf6d30b14f58 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png differ
index 4e239e6532b45d5b2ac91bead89099703b0217b9..5309bd5336b7fd4dfb4c19009512948269e5f30f 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png differ
index 892cbe9a3181992b416143426538fb4f6dbf9243..eadeef0774854f20b16d06227ffaed9c4669eafa 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
index 5f076005e32efacf4c1a247e153caee9ed62f8da..3f358004ff4a395e9821a946cc3e5e1751c67662 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png differ
index 874c15245b1840f88caac54cec3acf68fd1af716..d0d519fbd414cbc4f461e71f3e6e8bf1a5c45b3e 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png differ
index 6faf9c056761c97601108ed6a97e368629c7807e..364beae4211db597cd20796ac495cea012b2f490 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png differ
index d49b6f112c062ca4deab896a5acd022e4f6faeaa..0404328f3a20697f9599d21b13f179da485a1a2e 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png differ
index 683e37bb459ba44411f199541d26baed92580acb..c31e90a57ce67815b0426579a5bf9e6084eb42be 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png differ
index 57468a3b1b5fe6f6d9a66e4059bdd80a226efc32..1a5afb48f580509593131a9e290e5bc34ae49295 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png differ
index 892cbe9a3181992b416143426538fb4f6dbf9243..eadeef0774854f20b16d06227ffaed9c4669eafa 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
index 977b9bb1f97b8cfbecb629c2f59b39f32b1ac72b..d98ac648f0e669732b6e1f142e2838c4a774bc1d 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png differ
index d3ded3558d034c7387bba39b359f643731bc4475..3fa0f2bc46345219750dfe36e243b311f2d941ce 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png differ
index 2b2cb8acf7fce81df323a146dedda9f1fdf6c66b..37abebd398574448fc170facd586a9c57a4ce3f9 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png differ
index d49b6f112c062ca4deab896a5acd022e4f6faeaa..983ee61e781b7d000ed10e9bba1acf74962e1857 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png differ
index fa238f8de733fc09a11f0fb87eacb21cad686e3f..cc089e2378b10069a95bc6d9b622a7b23d0719be 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png differ
index 263f797355d36556de8c5472a55fe21f191b7925..a35c71bd523337280c09d4bde5da31553f0edbe3 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png differ
index bd6e6c3748e04fdbacacfa45257dbf7846d92df2..6b70636a070fa7a8f051a979999659db87a20a5f 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Modified from sprite taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
index be3d3778075106136b251dc3ab5a599117ed110e..9d5e3cbbdbfd4253f8d2a58c0a927da2b6369493 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png differ
index 89222ad9b2a5a8664fb3256d8555619c7e50e01a..6eeb31fd76ccba116935dac0e859ccb841010575 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png differ
index cc8c846f3890bfdc891b099b858a19dff763c461..9cc892742625d7d7ac8a12e9b2a19a639ddcaf31 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png differ
index 446d606c89a16e6907f7c0b53e95e087626d7f81..fecc21f89cf4b7d2daba2ed4bc08c8904336ef51 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png differ
index 72e1aa40d45ded437115f0c125671dd4cc399cd5..d7568b10e6091558e9b92353b07942f41d07d1af 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png differ
index 0d9b28188e69cf13575b58ae8909e50f45b6c416..8693f90fa9ab6dd606a3b436002148615f182717 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png differ
index b79eef3d2df8a549480ba47d6760bf1d26fcb10d..ed9be4002d5d4ed1f30611cee6d7ab12d3cee3ef 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png differ
index 8f39716ef266b18cdbb7adac7b4399f3b1bcab85..05de69192225dfffabcd5db29aef66f128e8e041 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png differ
index 9e0bb8c848677b0b16d32b9155c9e264ee2324a1..d5fe85aa8fdaae2becb062347703307db8e114e2 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
index aa1e0acf4c4748701ed04057a9ab1d7881d41885..a86780f63c69abe3ec1db8e6abea2052dc100f65 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made with love by Shaeone",
+  "copyright": "Made with love by Shaeone, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
index 2763474a10941682b57e6206bc003f89d503d84d..bd70a5c6b03cd050740fae7fc79bee3f4c86194e 100644 (file)
Binary files a/Resources/Textures/Objects/Decoration/present.rsi/present.png and b/Resources/Textures/Objects/Decoration/present.rsi/present.png differ
index 320d84905cac876a2502ac957f15296e8065abd8..3116c6c6e5504ea148d62596a47be24bd4e63101 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png differ
index 628808adc7cf33292e6b2e88b763ed92908f2f91..fc8002fa4377e30c1bc31ca6979e9a8a31f423c8 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/base.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/base.png differ
index 63c0450e730199ddd53fce86f27060ca797d6324..83d334c6e71a10e31854b02111430416378a90a7 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png differ
index c663886f9cce33df769cbe389312c741626769c3..d1b4191052f10e9fa93a1be8f703e9af4a16d45a 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png differ
index 428918e73103bb12c6fd84ed3cbd52c18847456a..c7872e1916e7a40eac7332bd8aca2b6c70ef0530 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png differ
index 847aab55366ca2d1608537db0e1bc583b8ec7d83..e4b67a0966edae1a2979be6aafe74be4b277642c 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png differ
index da9da035a06495de4b261a65c028eda03c43ae2a..a7aa8023f3e9412bb1e9c161299b71e1d8a608c2 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png differ
index bb5b49e18505c8eb946b21c53a285b497a900a04..947aca7a33d443c924cd0bf7d28d395e72315a9a 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef",
+    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef, modified by ps3moira",
     "size": {
         "x": 32,
         "y": 32
index c066933cd55dde2707066227cf1308617781b02f..e9dfa58efb300ba6c0009dfbaa79ee1eed9293b6 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png differ
index 34411a4c745195f3dfafe343f6cea67b15d44280..40cf75ad49104e250317160de585711af479c3e0 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png differ
index b73a2cac28778a2695222eddbb36026a4ed6065a..62449e689114a9cb512ed06d5b39af54a1b0d3d2 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png differ
index b72b053e4f579756fb3cfd0ce54b77694deb9858..bb68ec126cf5b2f3f522d5b32d42f2c12e44609a 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png differ
index bc7672e7aa73cfd7893ca3f58297a553686570b6..3fde6b84882d3f96d7b9469cee105bf8f3687ddb 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png differ
index 053a9c1e467b5c928798c9bd463135284d032d87..627270da41d3306ac66de573008c0d07b13087fd 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png differ
index 047723cf4f9b3c37665ce0faae7e18896f90da88..b0fa3af4556caa9cec62a59a34797d34adb1f2e8 100644 (file)
Binary files a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png differ
index b4898354731548034dbaa4866bb61456acca0901..e06588eaad622ee39746d64cb3a9fff521f9ac2e 100644 (file)
Binary files a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png differ
index 83e91597166a7d1c28ad0225d7c65255c0700f0f..695bc489f9543c6f1bbc2be84b4a55c19ba33225 100644 (file)
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png differ
index cfa19a007aa4422a0dae7c3ed1c6fc8237fc7909..f97f0a2e8a646d6b16b38a92ac76574eda1d119d 100644 (file)
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png differ
index 7456850c08f24214473d4e75273b81a143301674..3d853400ba4e7dd40a2e8eac2f291e23f0bc46dd 100644 (file)
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png differ
index 796eaf83b05d85f87b788e9e0f24a7c027d52820..9751e35227b4a56889eca9dbf1b6c52e9669f8dc 100644 (file)
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png differ
index 3fe117f2ac6a20ac04a09aa996b49e769b5d7ad4..fd3d0cd1d4c29f8ffc275a1e0b43acc4420378db 100644 (file)
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png differ
index 244e4e2b5b9c64cea387407176b3a1b74362b78e..75a87e0ab72b71b5619d43f6ff69fcbc880a41c9 100644 (file)
@@ -1,7 +1,7 @@
 {
        "version": 1,
        "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. Rad, toxin, o2, fire and adv by peptide",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. Rad, toxin, o2, fire and adv by peptide, modified by ps3moira (github)",
        "size": {
                "x": 32,
                "y": 32
       "name": "toxinkit-inhand-left",
       "directions": 4
     },
-    {
-                       "name": "purplekit"
-               },
-               {
-      "name": "purplekit-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "purplekit-inhand-left",
-      "directions": 4
-    },
     {
                        "name": "blackkit"
                },
index 59919b8585570407e25bcea726eb57e6a6516cb3..53f73ffc4029906d164dac76661fd288025a0f84 100644 (file)
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-left.png
deleted file mode 100644 (file)
index 156ac29..0000000
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-right.png
deleted file mode 100644 (file)
index 43b0142..0000000
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png
deleted file mode 100644 (file)
index 778a319..0000000
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png and /dev/null differ
index 0bab485fa95130e3bb5da80276b4918d0b0b1109..d17de451573d1fb7a35fb594971967564941f61b 100644 (file)
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png differ
index e0e563022ab30ecf9227785af84f1e8493fc9767..7eb45f419150bac3ecbbcbbc5e60f125fd95c051 100644 (file)
Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png differ
index b80dd151b43653f3c16245a8b872c28dc481cb44..f908c97d6822cbf5affb135f6dcaceeea6e5e458 100644 (file)
Binary files a/Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/icon.png and b/Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/icon.png differ
index d8c80a1fd6f56eef1b561f8d1ac9c4d968f444fc..18c65e9d890bbfbf3687123f4d971714abf07d54 100644 (file)
@@ -1,14 +1,14 @@
 {
-    "version": 1,
-    "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        }
-    ]
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/000286d446f40d3897816bc4776a7c754aa93d7d, modified further by Flareguy (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
 }
index b88da920474240651c98523c37cc7d6e04ed4738..5cbc71950ba6c42c497776de69ae8b2120525ee5 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png and b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png differ
index aabb510bd039023f21e3d129989d95ea92c29f5f..d1c736ee32a90afda264e88db85c7ff2b9804f83 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09",
+  "copyright": "Made by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-open.png
deleted file mode 100644 (file)
index a763565..0000000
Binary files a/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-open.png and /dev/null differ
index 3c2f7060c0cc67e9a6f843fe0869165020e385b3..933a7e862e11b803e920fbd026dfaa9d3ecdd866 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box.png and b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box.png differ
index a9c36ac409f1408aabdac7c449c577b283c35f26..253cddc2c275505effa08209a66806b254d93ca4 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "made by brainfood1183 (github)",
+  "copyright": "Made by brainfood1183 (github), modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,9 +10,6 @@
     {
       "name": "box"
     },
-    {
-      "name": "box-open"
-    },
     {
       "name": "box-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-open.png
deleted file mode 100644 (file)
index 709ad57..0000000
Binary files a/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-open.png and /dev/null differ
index 98791e3959335954cc7824b76e81bd37e07e730a..1738b3537bf75634a932a8eb0293872086e4a4fb 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box.png and b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box.png differ
index e3c80c2ae38be08cf769d7e00178a3ba784483bb..253cddc2c275505effa08209a66806b254d93ca4 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183 (github)",
+  "copyright": "Made by brainfood1183 (github), modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,9 +10,6 @@
     {
       "name": "box"
     },
-    {
-      "name": "box-open"
-    },
     {
       "name": "box-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-open.png
deleted file mode 100644 (file)
index ab36fcc..0000000
Binary files a/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-open.png and /dev/null differ
index 6dee8d1517efef24104165845b75d8bd3478ad6d..e1e04e25802d34c5f6fec3995ba698ea20f2cfee 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box.png and b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box.png differ
index e3c80c2ae38be08cf769d7e00178a3ba784483bb..253cddc2c275505effa08209a66806b254d93ca4 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183 (github)",
+  "copyright": "Made by brainfood1183 (github), modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,9 +10,6 @@
     {
       "name": "box"
     },
-    {
-      "name": "box-open"
-    },
     {
       "name": "box-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-open.png
deleted file mode 100644 (file)
index 14e8a11..0000000
Binary files a/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-open.png and /dev/null differ
index 8c0c2058c3d967e52f5e1425a8f8edd5850a2e3d..a014eb4d47872c5e9669b8702db1720422a3f9eb 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box.png and b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box.png differ
index e3c80c2ae38be08cf769d7e00178a3ba784483bb..253cddc2c275505effa08209a66806b254d93ca4 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183 (github)",
+  "copyright": "Made by brainfood1183 (github), modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,9 +10,6 @@
     {
       "name": "box"
     },
-    {
-      "name": "box-open"
-    },
     {
       "name": "box-inhand-left",
       "directions": 4
index 771580750ff44ef1f6d94f07bd36557231a15042..7c852b9c15b5300c323bd5abe2ecebe3f10d495d 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/agrichemkit.png and b/Resources/Textures/Objects/Storage/boxes.rsi/agrichemkit.png differ
index 6fe24bba2f3fd3e8eeaf141f880e42932e12e22e..8ac528f873060aa0fa29164e2b0126356602fa59 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/beaker.png and b/Resources/Textures/Objects/Storage/boxes.rsi/beaker.png differ
index 80612572aa4933daf6dac35577e50f275151b188..50730fec7045867f819c36c7b82d15e94241cf07 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png and b/Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png differ
index 02c8323b4030d9f141032f751c246fea0a9b9f88..1d6c81a97a7b5326fd122113c1bd34147c84afe3 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/bottle.png and b/Resources/Textures/Objects/Storage/boxes.rsi/bottle.png differ
index e62e0f699fb4970c743ebe5ddfbf10f47a0f6318..5d1a0a9f1364ca5b3773c134db8aa4834e3c9e25 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box.png differ
index f9f0e4dbf3d4554746911228558ef46807683909..c208f68ead81677b9597dfad404e88548d9f196d 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png
deleted file mode 100644 (file)
index 699aeb7..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png and /dev/null differ
index 50379bb475272e426e32194bac6e6589fdb51b40..98a129d0030ec229f907c7eca9678548ccbde04a 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png differ
index 00833bb163c78ec86b760755508043149c1b89bd..314e206b7f8978910f22237d0507c19b1c331acb 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png
deleted file mode 100644 (file)
index 4ddd8ac..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png and /dev/null differ
index de33c9b97e5ce547385e07d09bd470fe251ce156..ee5104c619e5dce6a8805d86b89feea73571f928 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_science.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_science.png differ
index e66b288c347a25792dc840cba5d9005d276eb461..b7be41febde27d2bec444083abd8cfb764f4ca51 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png differ
index a8572edeab58e6bb32b3c721d51d56996b949656..538106107040e64e5d1d1bc92ad4753f6c818958 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png and b/Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png differ
index 4bff0aa2507498204bd132e8da1b191a9ebfee1e..622bcc9a647856a176d788371b83b0f3965b3cee 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png and b/Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png differ
index 05bb8437c0958ee8048ce392dcc193dba6fd120f..4a238f0953765fdfc1c0ba14273ead889c1934f9 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/candle.png and b/Resources/Textures/Objects/Storage/boxes.rsi/candle.png differ
index a713f672549cd7d735b64e10ebadd404e86b7c95..6e87ff462cd58ecfde893ce8f3d84b7674520aab 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/circuit.png and b/Resources/Textures/Objects/Storage/boxes.rsi/circuit.png differ
index d4f0527018d6d98710c6329d87fe2fdfd85e938c..f624551f550a38f77ff849c2cff8afd02ab5a99b 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/clown.png and b/Resources/Textures/Objects/Storage/boxes.rsi/clown.png differ
index fa839457f995e2cd323dff96dc574d1f033c65e0..0d45901457baa7468128ff380e5fa6b774d3a152 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/darts.png and b/Resources/Textures/Objects/Storage/boxes.rsi/darts.png differ
index 219e8942f4b945d7f1111fdb175f08c97fc4905c..4bbc56c2eea0227e466843cf00137c0dc0697739 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/disk.png and b/Resources/Textures/Objects/Storage/boxes.rsi/disk.png differ
index 0e6108b91339c5c8a8a6eb25ad3636a622d33de6..ee804287593c7cc7fc59c4309daa4c86fd79bddd 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png and b/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png differ
index f65b517021ba2b4f4d49ca8c7c928a4fed092ba1..5705e71908346c97280698ebe37a66e4550c24e9 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png and b/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png differ
index 93d52099fc2feb4c11840f0a4caf5dcbc41e18ca..06947d4071641d65e8033cad257588a80c2a324a 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png and b/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png differ
index 5146156969bca46f5d48351c33560001d7b5031b..520385e3ec5b3b5fa00f4c94236d22cf86e019bc 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png and b/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png differ
index 3ddae9b2ca13751d34e32db8f870456d54396163..6c4e23df263eb1a13c60d136745f854cba0a633b 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png and b/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png differ
index bb1b247b673bdead9c76c9590a9dcd69bcd949b5..07cff902c440109320667cfe2ec4857f47d10e9e 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/flare.png and b/Resources/Textures/Objects/Storage/boxes.rsi/flare.png differ
index 7feb84489d21c6f5dbb0c3001e063e9c50997109..c7b202228cb3f55289adfeac022fd2c67e34f481 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png and b/Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png differ
index 1a407395b04898e65e8d0e1c0e232af9c83e7c35..2f060ada098628754a3e0216828811c21e05b6d8 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/forensic.png and b/Resources/Textures/Objects/Storage/boxes.rsi/forensic.png differ
index f18dd0ca93f8f72e9b872e378c5ef8e1f76fbbfb..3916ae646c3d418ec7108dca9763cd81e2a86a8b 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/france.png and b/Resources/Textures/Objects/Storage/boxes.rsi/france.png differ
index d5d151a7b80e45f9176a869da2bb6e4d4673dfc7..ec4907c0bc2730589d06c2950d127e02892a21d5 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/glasses.png and b/Resources/Textures/Objects/Storage/boxes.rsi/glasses.png differ
index 625b865dd1c13ff9d716a6615cce64cf6bfb4c11..6881850f372efea1fe07546116f0d9a49d499263 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png and b/Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png differ
index 3802689d34917ee60dac11e2ae58fcf4150982c8..76bcfdf203aa471c5a8bb97783761e1323ca6f2c 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/headset.png and b/Resources/Textures/Objects/Storage/boxes.rsi/headset.png differ
index 1cbf6867821302c0e9800bd8ab19801b34db05fa..0381c8ff0884c9dfc7fb6b250011a9498e42eacd 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/heart.png and b/Resources/Textures/Objects/Storage/boxes.rsi/heart.png differ
index 366c8a0ca770a5f611cb79831b9252090fca43fe..803c2cc92b664bc4296a8a2c9b187211e8a6e8a1 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/holo.png and b/Resources/Textures/Objects/Storage/boxes.rsi/holo.png differ
index bb99baa954e984ddcb4ceeeb0ac1f8e92d0e6f87..3e11be9c07681eb3034e7ea3adaf79409a4a1eb1 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/implant.png and b/Resources/Textures/Objects/Storage/boxes.rsi/implant.png differ
index e05e91e90f8fcb45f982781ba841b27fbc7cfc39..7045b0db44eb22f53de052d45bfa22a0b8cd257a 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png and b/Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png differ
index f6974a90c7a9bfad8365f5a9106717482b24823c..4a6e4da74afb5fd09f9dd7353e60ebcf5bbd067c 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/internals.png and b/Resources/Textures/Objects/Storage/boxes.rsi/internals.png differ
index 46a4cbbfad7ec5a86fac6c80f06f31ea617dd3c5..d501a206094941156977b7d2105c305b4811804a 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/latex.png and b/Resources/Textures/Objects/Storage/boxes.rsi/latex.png differ
index ddb5fa3147ad31b4485bbbd89fa0c4dbe70c9954..95d68c447ebb44efe3de6b52e28d68f417acdb27 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/light.png and b/Resources/Textures/Objects/Storage/boxes.rsi/light.png differ
index 8df25a0b7bb412063658c4a35f3b52c0f7e0488c..b5f556329c40a13f833629579a05e97b17e98033 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png and b/Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png differ
index 8832163fd61ceede85124867b15bb7a2827e5f3d..438bd70c8fa49b0c1f22ed03046f92df52d4cea8 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png and b/Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png differ
index ed8cda38141ba7990cd446a4106391ca8b958e4f..af4e7810ef17d2700d60699cc3591cedef8604c5 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/magazine.png and b/Resources/Textures/Objects/Storage/boxes.rsi/magazine.png differ
index 57c7818d217b200225bdef2dc9a310c7a3054562..a73f90cbfbdd0343a7855c21e479135fa9008bb5 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/meson.png and b/Resources/Textures/Objects/Storage/boxes.rsi/meson.png differ
index f3f0f4ee4dd841fd36770574fdaafedc2fa3b0dd..20f3c057af0a4448d20a68c26528f264b9bb609b 100644 (file)
@@ -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. 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, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), 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, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -52,9 +52,6 @@
         {
             "name": "box_hug"
         },
-        {
-            "name": "box_id"
-        },
         {
             "name": "box_of_doom"
         },
@@ -67,9 +64,6 @@
         {
             "name": "box_science"
         },
-        {
-            "name": "box_olive"
-        },
         {
             "name": "circuit"
         },
             "name": "hug-inhand-right",
             "directions": 4
         },
-        {
-            "name": "shellbeanbag"
-        },
-        {
-            "name": "shellflare"
-        },
-        {
-            "name": "shellflash"
-        },
-        {
-            "name": "shellincendiary"
-        },
-        {
-            "name": "shelllethal"
-        },
-        {
-            "name": "shellpractice"
-        },
-        {
-            "name": "shellslug"
-        },
-        {
-            "name": "shelluranium"
-        },
-        {
-            "name": "shelltranquilizer"
-        },
         {
             "name": "shelltoy"
         },
index 2d19c7d55be752107ce8ac008b20ed5845f98dde..b777906f4e511df3c266d00f9cd91bfe0c3b2a52 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png and b/Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png differ
index 61e0c89c96c79ecfd1d0570071a31206c1330e16..30042ca767f201e77258e23c27020b8fdaaa6fcd 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png and b/Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png differ
index e179be543c2742e60684c74a5870df0e809cf14d..3df06c7402626260eadc93a1fd506a53c1a016b0 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png and b/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png differ
index 71381ae597ae9d8f723c74ba898eb10b7d940f36..1947f9c71f2c5e766ba7f9ea9c34042f721b32d9 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png and b/Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png differ
index 349cab8e1e28cadab5c58e6d0ee4042ea8cdba3a..07098d77dd905c1ad86f790477809def23539228 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/pda.png and b/Resources/Textures/Objects/Storage/boxes.rsi/pda.png differ
index 572cfd01f4b27f7ade617abb8d69e0d0c3eab3ee..64652611948bc0610255a69b2e572a17a0addc49 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png and b/Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png differ
index 0f52ce46bdf57956fa6852b689f306263c07d7b4..d92a5ea120413a63ded588e351a7738856107cec 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png and b/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
deleted file mode 100644 (file)
index c9f3e3a..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
deleted file mode 100644 (file)
index af0e1d0..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
deleted file mode 100644 (file)
index 6503583..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
deleted file mode 100644 (file)
index dd11b17..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
deleted file mode 100644 (file)
index 30e9bc7..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
deleted file mode 100644 (file)
index 9d3551e..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
deleted file mode 100644 (file)
index dee3f55..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png and /dev/null differ
index 24cdffb4446a2717d0498f58b0126a6286794270..a484f316645b0106c57d130952a8d149bc4eb92b 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png and b/Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png
deleted file mode 100644 (file)
index 9699009..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelluranium.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelluranium.png
deleted file mode 100644 (file)
index 2a4e1de..0000000
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shelluranium.png and /dev/null differ
index 4e6b6beb3af482c7290e075e4114046c1318d6ac..0a6d7fa65398108bf1c91c0c83c192d3a94f4d0d 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png and b/Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png differ
index f78f0813ba96c362debc06ae6c433ecea58a5bf9..54fcb4f532c41415a6079e372768e32f5f9708ba 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/sterile.png and b/Resources/Textures/Objects/Storage/boxes.rsi/sterile.png differ
index 48f35c7dc71f4f16cd6436e56f50b2f92fd6d634..e9d2331a231cb510d76c7a20a8415b3ae20cfe63 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/swab.png and b/Resources/Textures/Objects/Storage/boxes.rsi/swab.png differ
index f047d818913fdd32ccf5cbea3394f8cdd6ae455b..c03a7b237cf42074891fed596ca7a5439ebf465d 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/syringe.png and b/Resources/Textures/Objects/Storage/boxes.rsi/syringe.png differ
index 834410a43ef64bd0f3dbfd9d852247d464cbd5f0..5841c2ff1af6fc27fd773d9ec16c1ac1148ad264 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png and b/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png differ
index 39c87250da1707e90e0f268bbd8d85a601314da2..4697263144283f01f6e3a4fa88fcf7d037ae2a9f 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png and b/Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png differ
index daf97dc2e45552ffddee66ba35838a499ff7db49..7f1c127ed05d9706c4b2f749364d704e66919c08 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/vials.png and b/Resources/Textures/Objects/Storage/boxes.rsi/vials.png differ
index bdd60fa809c932a73df3ee3de829e92be4fabfc9..b985fbd375150ea7b5b6a9e79afe2ad0d4b3cfa5 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/writing.png and b/Resources/Textures/Objects/Storage/boxes.rsi/writing.png differ
index fd1977d96bb9868dd12db5d0ad746ee871073529..d1e797f8702a7bade3299d38962a66fa0465671a 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png and b/Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png differ
index 48676bdc825a227ea61f916aa0b9e91c8726217e..526e3d0b6fcde76dd2c91ab75e2332f03715838c 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png and b/Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png differ
index 7bbb9eaa1dc35667999c2951c2fbe4010ed087dc..33043ae0732117f494f7e5d78a2c487a5d03311f 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/beaker.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/beaker.png differ
index 756a606caf093e40e2b136c96ee1e1fdff607b00..cedd7ea59e46971fc848513561b46c9a6175181f 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/bodybags.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/bodybags.png differ
index 0a12d0e141828a8d8f42c333d8b131edb8f2d27c..ddbb198945ff739f0b31ecdcf12a0ee4f50774f2 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/box.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/box.png differ
index 89ecc16cde473cb15baf1fdfb384d501227138ef..2f7f9eabf0e439965836fdb5745c2fbc8a712b7e 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/box_of_doom.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/box_of_doom.png differ
index f7c448ee77106076959452fa88d14f382ef57587..357b0c15bfd080d2a1a96e4451b39e79aab1d050 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/circuit.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/circuit.png differ
index c6ba75525666c47677b61dc7b9787573fce3c472..0ceb7409285c9770c464d60233012ff9450db03e 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/disk_kit.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/disk_kit.png differ
index 615408735d1245bec2ce6424964f5d798f4b11ef..191dd727ab88b2154fbf600b4347752794839693 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/donk_kit.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/donk_kit.png differ
index 3d2f1dda561729603d9799a553b313bd6ef95caa..663be2e9312bbf8dd1912f3be5649e74b8925482 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/flashbang.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/flashbang.png differ
index 3819d40b22996735b615ecb2e5484ab8f15da997..5ea7300f9211131fb0a10638b01396fbcf284ad8 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/glasses.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/glasses.png differ
index 1e695be9d211a26f91a60eec5624cebdcdf4f1f1..f26841ae477bcccf8587ab684e9238fd07429b49 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/handcuff.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/handcuff.png differ
index 183cd48b2de1c2d4f7192c273c14da431c77acde..790dd6dd6f5affcdaef6f1ffa0df535a23a2dce6 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/implant.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/implant.png differ
index ae5d788f8c68c7f7af27f2160d9f2d849649010e..3f27c888ec0233b5c3371489ba0bf16610a2b47e 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/latex.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/latex.png differ
index f16e4fdcebc267c9f37a05a2bac5e27eba1f725c..1615b9cea81cc75861f343bfa632656a948d5b61 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/light.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/light.png differ
index aab16a45575e1d6d490352a6695c60a61eb1dfe6..90fd838ada90eafe7c305802987a6901432083be 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/lightmixed.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/lightmixed.png differ
index b257bd68e5ce7cfe1d734a4a364d6fd5ee57062c..b4b94775c1d672c3c5d9542a35bd46cd09c76269 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/lighttube.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/lighttube.png differ
index a124ba5d967cc4fb82a7b750d84f0191646fecd5..ba5fc1ad8c9aa667802e38bce346cca1480daafc 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/meson.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/meson.png differ
index 935b0b9f8b3ec72e16da22796700d609351133f4..25e914234da46c9b4795cf09b1ce7e3f67520a3b 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43, throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen).",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen), modified by ps3moira (github).",
   "size": {
     "x": 32,
     "y": 32
index 4f9cda8b50af77f09b00163c996da788737a78df..ecef711b6d4461f5102a20d62b0b62310ec44559 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/mousetraps.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/mousetraps.png differ
index 4c625ad35441b32268c0cb8e7f1aeb13be474c7a..4d7dabb5412843f5cb4a493840d6088fdcc71a2d 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/pda.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/pda.png differ
index bde84ad2b35b70d539bc08d07df55950e3163d20..408ade8fad57546bac4254192e5c960d24b4cda8 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/pillbox.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/pillbox.png differ
index 6695a14b0ace6f03406a97bf990c76880e143d49..5d81fffb218bfe774dd90a7f23086f682c1bc4e6 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png differ
index 66267f50adcfcbc953d6a966a1756e0a8dd25c6e..da81f15b4f8679a9682f1a76eb6c3d6feaf86b4f 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/solution_trays.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/solution_trays.png differ
index 60f2b86001b22801d03d0d2a63b6496f6d495439..ebbd464f91fff9f3dda9379da544a35f3897a347 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/sterile.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/sterile.png differ
index 90872462f1aee44dfaedad6fa503b44f0e2bfa1b..fd99b6eea30becb28d94b7442de783fdc3e36b12 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/syringe.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/syringe.png differ
index b2af7bce88436ed9b060cec8bd6f97019537caa9..ecb3efdf3e31688179b573e8cac6e137c83b40f1 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png differ
index debd093265f49e126a75a3a85aad443ab5a2ff4d..9979779a9b115f08a71f0834a6c40cd70ea38342 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png differ
index 07a428bbb4a96bdcf89ea1945897ea100902a33b..4d8f9d19618712e18423f878405c90b4abf26c85 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png differ
index 4c708769e87e123cd6f5077e45895420d3092c3a..aff2c415a300806a4c0c30044a2e0f963785cca1 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/ziptie.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/ziptie.png differ
diff --git a/Resources/Textures/Objects/Storage/donkpocket.rsi/icon.png b/Resources/Textures/Objects/Storage/donkpocket.rsi/icon.png
deleted file mode 100644 (file)
index c84d483..0000000
Binary files a/Resources/Textures/Objects/Storage/donkpocket.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-left.png b/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-left.png
deleted file mode 100644 (file)
index 8e81bd0..0000000
Binary files a/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-right.png b/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-right.png
deleted file mode 100644 (file)
index 2dfb972..0000000
Binary files a/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Storage/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Storage/donkpocket.rsi/meta.json
deleted file mode 100644 (file)
index 53eb12d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-  "states": [
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    }
-  ]
-}
index 712d458c94c7c678412d70424acc7996f32f3d8f..7bae81b79942869c55b2b8737afb37c51e3a9e8f 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/medalcase.rsi/closed.png and b/Resources/Textures/Objects/Storage/medalcase.rsi/closed.png differ
index 2d2240805631edfb7619957334fbd543fbba8318..8c9647fc3e88a7ea20b53e61f30f54ac5d738cab 100644 (file)
@@ -1,17 +1,17 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Beestation-Hornet at https://github.com/BeeStation/BeeStation-Hornet/commit/d06dde90f7bb6e6ba1b4a34bcc2a4624dbb1518c",
+  "copyright": "Taken from Beestation-Hornet at https://github.com/BeeStation/BeeStation-Hornet/commit/d06dde90f7bb6e6ba1b4a34bcc2a4624dbb1518c, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "closed"
+      "name": "open"
     },
     {
-      "name": "open"
+      "name": "closed"
     },
     {
       "name": "inhand-left",
index ed80d96b7413f76229f578a3c054429a5b4502d8..b9e3ac2fea41d3e6cc143bce4b7edb7b8b7313f4 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/medalcase.rsi/open.png and b/Resources/Textures/Objects/Storage/medalcase.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon-open.png b/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon-open.png
deleted file mode 100644 (file)
index e66d0bc..0000000
Binary files a/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon-open.png and /dev/null differ
index d4d40051793cf55eaef8d136a963f886cd9b7ed0..40aa58ddc96702777d3fc14db57b862e6123c0e5 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon.png and b/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon.png differ
index 47e2e44ab7e26b36abc082f2639fbd7b6a9e443b..4b62000f9397b5711c20cfd1b1f447a40f66308b 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "@trerri#0107",
+  "copyright": "@trerri#0107, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,9 +10,6 @@
     {
       "name": "icon"
     },
-    {
-      "name": "icon-open"
-    },
     {
       "name": "inhand-left",
       "directions": 4
index 44580a12262b78a9f3debd92e4c6c2ae6bb9a955..5ae267038d67ac926ed6fc381daec0f24c0752d1 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png and b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png differ
index f16130ef38b86554da775ac9d8dcd94255e19c38..7e7f4c822d417a1a11a117aec0f674d037e19e56 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png and b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png differ
index c335a79daa3ee031ee93ff5070211bd289f694ff..71a43e2286d867ac8769f760dd71f44319add5c5 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png and b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png differ
index 7b3b7b9846bdf8f145c69f52f480b1b1e31d2839..65dd090d198a58634ae8c1a59a455a97b635c3d2 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png and b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png differ
index ba4af386a3185035469c1862169bfa066bc0ea8f..2c2bc7e35daedbb4fe479d478de8fe366e0c968a 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png and b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png differ
index e6723a64449126da70f39c917771f4c3a34018bd..6f911268773b3e65967ec558941adc85bd7cedf0 100644 (file)
@@ -22,4 +22,4 @@
         "name": "icon-open"
     }
   ]
-}
+}
\ No newline at end of file
index becb302333b4e703fd1fdd1a77c8c338e9646e29..408055202359146151c28d37a4d4fcc54b525e42 100644 (file)
@@ -66,4 +66,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
index e6723a64449126da70f39c917771f4c3a34018bd..6f911268773b3e65967ec558941adc85bd7cedf0 100644 (file)
@@ -22,4 +22,4 @@
         "name": "icon-open"
     }
   ]
-}
+}
\ No newline at end of file
index e6723a64449126da70f39c917771f4c3a34018bd..6f911268773b3e65967ec558941adc85bd7cedf0 100644 (file)
@@ -22,4 +22,4 @@
         "name": "icon-open"
     }
   ]
-}
+}
\ No newline at end of file
index f4c473b8cad2745851e55ed632366f469179369d..ebc7858be976c59edac1f2f01dec38bc3030b1ae 100644 (file)
@@ -22,4 +22,4 @@
         "name": "icon-open"
     }
   ]
-}
+}
\ No newline at end of file
index 068495fb27a82ccef0de64ae2e7ab2d3b3d82d34..12106394ebd0fca07c56498949f6bf75a8fdd1cf 100644 (file)
@@ -19,4 +19,4 @@
       "name": "icon"
     }
   ]
-}
+}
\ No newline at end of file
index e6723a64449126da70f39c917771f4c3a34018bd..6f911268773b3e65967ec558941adc85bd7cedf0 100644 (file)
@@ -22,4 +22,4 @@
         "name": "icon-open"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png
deleted file mode 100644 (file)
index 1bc6823..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png and /dev/null differ
index 1f2b2fe2875333b31b185808a4aedd536cf0a15e..d85ed4b87bb755eea4de12b74d71480566534613 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png differ
index 6a141b7efb1fa6e64321ccc07ec2ebcff70a6ff3..6d68bae35d3d50dc47fd68d4197f3b9410247978 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png differ
index 2414fe500b9c2b40ebef5cb62e86645fad9e8d47..b98a250319129bc36ed70a9341e71f5f4e4f64e7 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png differ
index 1784e7f62362b27f1e9b8614bd602746862d5267..a39f0598d03c6f22fa25e23b35dbc366e3d6659e 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png
deleted file mode 100644 (file)
index d68f858..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-2.png
deleted file mode 100644 (file)
index 50ea7c4..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-3.png
deleted file mode 100644 (file)
index 94a2272..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-3.png and /dev/null differ
index b2728ab02bb91db94b9db7bf621a7f413b0adc3e..942f06d0b8b8be4e47a49b2bd23107e82f744731 100644 (file)
@@ -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/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi, base and mag-1 by Alekshhh",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,9 +10,6 @@
     {
       "name": "base"
     },
-    {
-      "name": "base-b"
-    },
     {
       "name": "mag-1"
     },
     },
     {
       "name": "mag-3"
-    },
-    {
-      "name": "magb-1"
-    },
-    {
-      "name": "magb-2"
-    },
-    {
-      "name": "magb-3"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-10x24.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-10x24.png
deleted file mode 100644 (file)
index 225ec31..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-10x24.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-b.png
deleted file mode 100644 (file)
index 010fae3..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-b.png and /dev/null differ
index 1685543539f9418a3a94ed59046ef494269f66b1..b9cf1dcee468afb81e31a83e9993d26d03b1def0 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png differ
index c9f029f32a3f3b60421403eb401f88ff6434a890..c5e936e0ae00b4118c759fdac5a6bb5bc14fab4a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png differ
index 84725cfd32184f4ac0afd44571cbeceeb5217096..71e225a8d128aff9ba58eff53e7b1b398280e944 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png differ
index 532baa546b3c5bbf7bd40806509774e04ddfd482..5bf9d3a7a7047b528a14cdbaa5c7f7d68132b9ce 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png
deleted file mode 100644 (file)
index 8b49392..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-2.png
deleted file mode 100644 (file)
index 80e504f..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-3.png
deleted file mode 100644 (file)
index 0c582b0..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png
deleted file mode 100644 (file)
index 39e05c7..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-2.png
deleted file mode 100644 (file)
index 8fd938d..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-3.png
deleted file mode 100644 (file)
index 6a77161..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-3.png and /dev/null differ
index 958aeb6f48e1e8d1bba48451e387de0fb3d883c4..1cde5f06786a84e248ea7cb1c13c855fd5cd788f 100644 (file)
@@ -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 , tweaked by Alekshhh",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "base"
     },
-    {
-      "name": "base-b"
-    },
-    {
-      "name": "base-10x24"
-    },
     {
       "name": "mag-1"
     },
     {
       "name": "mag-3"
     },
-    {
-      "name": "magb-1"
-    },
-    {
-      "name": "magb-2"
-    },
-    {
-      "name": "magb-3"
-    },
-    {
-      "name": "mag10-1"
-    },
-    {
-      "name": "mag10-2"
-    },
-    {
-      "name": "mag10-3"
-    },
     {
       "name": "practice"
-    },
-    {
-      "name": "rubber"
-    },
-    {
-      "name": "rubber-b"
     }
   ]
 }
index 99548b3e5b42d8a8091ea849f169a11f12479f82..4d5e7f4cd0e4b4daeb7badd408a400cda9e2b71a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber-b.png
deleted file mode 100644 (file)
index cf04605..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber-b.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png
deleted file mode 100644 (file)
index 5a75c53..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base-b.png
deleted file mode 100644 (file)
index 7d578e5..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base-b.png and /dev/null differ
index ef44262042f0ef922d928d0561992b052fb0b6d1..8ee34cf21e0d3f8f941974561c9379e6217ff2c2 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png differ
index 907b6040c276f1f2358c1d7df2f0955a37c964be..82278c4b7e931b73842f9c584e0fdcd10730bb34 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png differ
index 36c872a426860a18e3133cc6c0b069e4cd0d4a1f..5568c0496aaf06d92873d08b4023a5fffe7a1486 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png differ
index 025bec650e00863c13198bc49d43bdf7d618b6c0..8bc91cf1c2a3d5cd06e1245275245fa74407bd90 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png differ
index 31c1c6b5c7629ee6eda42b89a9acbb81d8b489f6..65f144082c0c2fc138721f686f1204ee6af98d38 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png
deleted file mode 100644 (file)
index 39e05c7..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-2.png
deleted file mode 100644 (file)
index 8fd938d..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-3.png
deleted file mode 100644 (file)
index 6a77161..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-3.png and /dev/null differ
index ff9704e4fc783e31a6d71609553f41f7eb1be2e5..f20e7373cec6ccec13f96be161bd885db25426c1 100644 (file)
@@ -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 , tweaked by Alekshhh",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,9 +10,6 @@
     {
       "name": "base"
     },
-    {
-      "name": "base-b"
-    },
     {
       "name": "mag-1"
     },
     {
       "name": "mag-3"
     },
-    {
-      "name": "magb-1"
-    },
-    {
-      "name": "magb-2"
-    },
-    {
-      "name": "magb-3"
-    },
     {
       "name": "incendiary"
     },
     {
       "name": "practice"
     },
-    {
-      "name": "rubber"
-    },
     {
       "name": "uranium"
     }
index b252261c160cde5a9c4a2317ba649f424c8e1fb6..76c0d78415ebb2e35c1fefcd965a7b0aa79af3ac 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png
deleted file mode 100644 (file)
index 7d8d465..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png and /dev/null differ
index 7fefe0c6b9f7fb00f70ecb9e3fcc2c5c7b3fd46e..bcf68ecf45e9c67db590eb6ce6ef691c5ae88006 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png differ
index 150b4b15cfd30e154071b6e8dca31be10a2e4080..f3d3e48e28ac3d6218f5dd493cc6005aab4319ef 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png
deleted file mode 100644 (file)
index 63a58f0..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png and /dev/null differ
index 153b43e441c891179d90b2b611b7dde80e7b2a39..e7112fd7ce79d8da14d6cd90e5ec54094e0fcb8e 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png differ
index f6fb71b69d5bdbd292ceeef7f65dd8f9d492ce57..a63b176d0003d64c8112dd7ddfd7daf3c640709d 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png differ
index 8b7d23dc6c4dc883b5a0abb72b32cfe591709269..6edae95812d8c65e99100265d464b75b246589f0 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png differ
index 6d2b4034e1f168c15cd752c69ff6b55a51d42dfe..cb9729751ebf3462944783f9081c56ff9ef2906b 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png differ
index 7d2bcd29ec220bef3fbf81ea69c785cb5de53749..cb8d1d307ec176328bc00eff3f4d98bc5f2693bc 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png
new file mode 100644 (file)
index 0000000..e134075
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png
new file mode 100644 (file)
index 0000000..f75e4eb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png
new file mode 100644 (file)
index 0000000..247c9ac
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png differ
index bb09b47a524b7260ced2eea7f9385a2fd6892639..1a54a4b6363230fdee001c1244728c8f5d9d6e32 100644 (file)
@@ -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. capbase and cap modified from base and rubber by potato1234x (github) for ss14, tweaked by Aleshhh",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
       "name": "mag-3"
     },
     {
-      "name": "cap"
+      "name": "mag-cap-1"
     },
     {
-      "name": "incendiary"
+      "name": "mag-cap-2"
     },
     {
-      "name": "practice"
+      "name": "mag-cap-3"
+    },
+    {
+      "name": "incendiary"
     },
     {
-      "name": "rubber"
+      "name": "practice"
     },
     {
       "name": "uranium"
index 83910ba263a779d535588701516d33d1959e8d4d..99bb7ee6f0518d94d34103d9ac14e06bc7262296 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png differ
index 7aa10042614a36d7b0c2ee1a19b61cdff5b74168..4d5e7f4cd0e4b4daeb7badd408a400cda9e2b71a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png
deleted file mode 100644 (file)
index 020a8d3..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png and /dev/null differ
index 90238cf3c27596debbca11238774ce8ad68c6817..93af337b36100b55ae8f77f44785c0e4b72dc10e 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png differ
index ac7de8b43bd0a0ed731867c55657e35586baa36c..c87791c07f7d3d0e2229555d9637338ec11fe5dd 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png differ
index 226711c301a27937e5e8228fd391b0a489b0910c..a63b176d0003d64c8112dd7ddfd7daf3c640709d 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png differ
index 1d8de97957ef2eb23d269a003d60aa48d14e6362..654a600e2baa13d23a58ab5139d462d1b143b6ed 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png differ
index 43d1f0f5f71c53b309d385fef54bcf908453841a..ce3c6c42ec7f2c424ecca8f7d98a5cf50d5cb9e0 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png differ
index 5d6d61f5dbfb5be2a3b2ce127791c574801f9ee8..7e0cce6ea545ceed177bda54a94e936268ee54ee 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png differ
index dd1e88cffcb0cf3b39e386c7a17ae57be74cd6da..1dbd2630eeb5b8881a64fb2573b8d157aed31856 100644 (file)
@@ -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 , tweaked by Alekshhh",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -25,9 +25,6 @@
     {
       "name": "practice"
     },
-    {
-      "name": "rubber"
-    },
     {
       "name": "uranium"
     }
index 6911805ffae2069f358d869f068a74e6aa28e775..4d5e7f4cd0e4b4daeb7badd408a400cda9e2b71a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png
deleted file mode 100644 (file)
index aa5c856..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png and /dev/null differ
index 1dba694fefb2d5bf42ecfb971a9ec9a5bba635ea..93af337b36100b55ae8f77f44785c0e4b72dc10e 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-b.png
deleted file mode 100644 (file)
index 9f98573..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-b.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-big.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-big.png
new file mode 100644 (file)
index 0000000..50491a4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-big.png differ
index 6db2100a88ae0abfe9dd6f70f11d255ab6deac01..078d6717f6d4f93f1bebcfe7ee5d7ba4221af155 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png differ
index e10d99713b599a13dddcda731bfe7abaaf935850..d72465db2d9d10dda351868ce7e6a297894232a5 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png differ
index 4d7eb62cbf22aca58d8e433140f253c51aa5a422..b253d1a0de646e204ef1f2e1a7ffaf055ef6adab 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png differ
index 24cf3a37fb93b0a38c533a798846649b408ed32a..2830c2ada0ea0da6171ef0d74edd34991aaf54ca 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png differ
index 68bb5da7bed97a104b75f1a8f92a8bd88a4aa308..b294e3197f7e3fdac4ab4632a27aaffa846db833 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png
new file mode 100644 (file)
index 0000000..fa9078d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png
new file mode 100644 (file)
index 0000000..991de07
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png
new file mode 100644 (file)
index 0000000..968c324
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png
deleted file mode 100644 (file)
index 39e05c7..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-2.png
deleted file mode 100644 (file)
index 8fd938d..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-3.png
deleted file mode 100644 (file)
index 6a77161..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-3.png and /dev/null differ
index 5c5b4eaef3801fb27af5f5edcd09211772f68cf5..b6e5c821ccc7e69c25379bef0e08bcd3bd61e9fb 100644 (file)
@@ -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 , tweaked by Alekshhh",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -11,7 +11,7 @@
       "name": "base"
     },
     {
-      "name": "base-b"
+      "name": "base-big"
     },
     {
       "name": "mag-1"
       "name": "mag-3"
     },
     {
-      "name": "magb-1"
+      "name": "mag-big-1"
     },
     {
-      "name": "magb-2"
+      "name": "mag-big-2"
     },
     {
-      "name": "magb-3"
+      "name": "mag-big-3"
     },
     {
       "name": "incendiary"
     {
       "name": "practice"
     },
-    {
-      "name": "practice-b"
-    },
-    {
-      "name": "rubber"
-    },
     {
       "name": "uranium"
     }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice-b.png
deleted file mode 100644 (file)
index 0c8f89f..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice-b.png and /dev/null differ
index 6d5337b8bffef0310f6a6de72f08a0bbef18624a..04af2191cd080e727b393523e750c0bc8392e15f 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png
deleted file mode 100644 (file)
index 1f883d1..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png and /dev/null differ
index 8dede3071ea2d4f942a33fde1ce23769953fa0a8..3219da558d19723937d0feef4fd059ac3c13b950 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png differ
index f460615079dcbc3bc4f0244f62ee6d194767a522..008a7363151567ea158dfe51ea94b1e02772f004 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png differ
index a2fe9e8f1d2bd99a05493cb4db4d7b8a83003fec..e6f277ba843b6b5017016090072fff7df2065d39 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png differ
index 3b65c7acbe02d7abf6603a0635157ddea8579efe..d734c66d19dde4e1c08c2d3f50059bafb12fa210 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png differ
index 7841707b120f3e1f4577f6c4320b31e2cac551b4..554baa942411b074a5453fb3dff01963f547f2c9 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png differ
index d3a282afbfcd73558585accf89ef2f4a2487afda..549c9224953340b79b26c28c1cb337d77e88318e 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png differ
index d77e6507b00fc0910aba7e959d2561f9e0b122e9..8a48bb884df03db43a5400ac122e07057eed2ba6 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png differ
index eaff18cf28880d84ede6b5409c7d43bb9bd15c0a..db541f8acbcf1012b850265fdedbb94af66bf0c9 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png differ
index 1563f21fe714c532f4b0ba1623076bca6da822b0..b6a01032d942a7ebd3104ba5e3861b9a1331a62a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png differ
index 9a3c99707fe47b7133a9a2c0937a993983074206..a6325d2d8491b874209371b2a9758cb3dc17a048 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png
deleted file mode 100644 (file)
index 0b8f096..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png
deleted file mode 100644 (file)
index 8164976..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png
deleted file mode 100644 (file)
index 80505d3..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png
deleted file mode 100644 (file)
index 60be778..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png
new file mode 100644 (file)
index 0000000..12b18cf
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png
new file mode 100644 (file)
index 0000000..e71c0f5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-3.png
new file mode 100644 (file)
index 0000000..81b11d4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-4.png
new file mode 100644 (file)
index 0000000..e167574
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png
new file mode 100644 (file)
index 0000000..2d19b37
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png
new file mode 100644 (file)
index 0000000..3581b4b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-3.png
new file mode 100644 (file)
index 0000000..fb1c279
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-4.png
new file mode 100644 (file)
index 0000000..bd0804e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png
new file mode 100644 (file)
index 0000000..6cb866d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png
new file mode 100644 (file)
index 0000000..9a23c7b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-3.png
new file mode 100644 (file)
index 0000000..d7e2b98
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-4.png
new file mode 100644 (file)
index 0000000..13003e7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png
new file mode 100644 (file)
index 0000000..cdb6cc8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png
new file mode 100644 (file)
index 0000000..876f619
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-3.png
new file mode 100644 (file)
index 0000000..138dd64
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-4.png
new file mode 100644 (file)
index 0000000..2dfd5a4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png
new file mode 100644 (file)
index 0000000..fb6e50a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png
new file mode 100644 (file)
index 0000000..73135e3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-3.png
new file mode 100644 (file)
index 0000000..2a5e354
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-4.png
new file mode 100644 (file)
index 0000000..08bc0fb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png
new file mode 100644 (file)
index 0000000..48518c8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png
new file mode 100644 (file)
index 0000000..c7738a2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-3.png
new file mode 100644 (file)
index 0000000..563dc39
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-4.png
new file mode 100644 (file)
index 0000000..abb6a10
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png
new file mode 100644 (file)
index 0000000..7f8e0d8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png
new file mode 100644 (file)
index 0000000..4b23d08
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-3.png
new file mode 100644 (file)
index 0000000..85f6f4b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-4.png
new file mode 100644 (file)
index 0000000..7c1d53e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-4.png differ
index 3df588a845e500409973821c6f562ff7eeeacd30..b09d33fb11acc1029734839aa3acb1049b6a6671 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Sprites by SpaceRox1244",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
     "size": {
         "x": 32,
         "y": 32
             "name": "mag-4"
         },
         {
-            "name": "mag-alt-1"
+            "name": "mag-beanbag-1"
         },
         {
-            "name": "mag-alt-2"
+            "name": "mag-beanbag-2"
         },
         {
-            "name": "mag-alt-3"
+            "name": "mag-beanbag-3"
         },
         {
-            "name": "mag-alt-4"
+            "name": "mag-beanbag-4"
+        },
+        {
+            "name": "mag-slug-1"
+        },
+        {
+            "name": "mag-slug-2"
+        },
+        {
+            "name": "mag-slug-3"
+        },
+        {
+            "name": "mag-slug-4"
+        },
+        {
+            "name": "mag-practice-1"
+        },
+        {
+            "name": "mag-practice-2"
+        },
+        {
+            "name": "mag-practice-3"
+        },
+        {
+            "name": "mag-practice-4"
+        },
+        {
+            "name": "mag-tranq-1"
+        },
+        {
+            "name": "mag-tranq-2"
+        },
+        {
+            "name": "mag-tranq-3"
+        },
+        {
+            "name": "mag-tranq-4"
+        },
+        {
+            "name": "mag-uranium-1"
+        },
+        {
+            "name": "mag-uranium-2"
+        },
+        {
+            "name": "mag-uranium-3"
+        },
+        {
+            "name": "mag-uranium-4"
+        },
+        {
+            "name": "mag-flare-1"
+        },
+        {
+            "name": "mag-flare-2"
+        },
+        {
+            "name": "mag-flare-3"
+        },
+        {
+            "name": "mag-flare-4"
+        },
+        {
+            "name": "mag-incend-1"
+        },
+        {
+            "name": "mag-incend-2"
+        },
+        {
+            "name": "mag-incend-3"
+        },
+        {
+            "name": "mag-incend-4"
         },
         {
             "name": "lethal"
index 4ece8a0c1e58a1bca6482dca0ecd2fc9a52a1863..1bf826775ba9f4072b39db930d830b9dc0d6643c 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png differ
index b55085e398ea1f2ecb6f5477a62a21d1728a009b..c8fe67cce6e5bc6f2c298e3198bd9c4f8d8c7f91 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png differ
index 373d6a2a0c91a69c140798bcf956464736eb65bd..fdd3b5e5d23af7b864cc75fd886aeb40eadf29af 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png differ
index 03a0244fda580e8c82f50c8f5b7d544c04fbdf56..7da6702f4311b7544f521eaad8957848af0c48c2 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png differ
index 8aa221dcb7f34f1d4670adae3d13864f6348891c..296090da5d9687d562ab5f99804f943c29bb8d83 100644 (file)
@@ -19,9 +19,6 @@
         {
             "name": "red-icon"
         },
-        {
-            "name": "rubber"
-        },
         {
             "name": "uranium"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png
deleted file mode 100644 (file)
index ef8982b..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png and /dev/null differ
index 1d75c67608c4ee8f95a6ce4c9155d24de2831a58..71fb04b7f364d5a40abbf80eea8a0a090cd60aef 100644 (file)
@@ -16,9 +16,6 @@
         {
             "name": "red"
         },
-        {
-            "name": "rubber"
-        },
         {
             "name": "mag-1"
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png
deleted file mode 100644 (file)
index f7aadbf..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png and /dev/null differ
index 1d75c67608c4ee8f95a6ce4c9155d24de2831a58..71fb04b7f364d5a40abbf80eea8a0a090cd60aef 100644 (file)
@@ -16,9 +16,6 @@
         {
             "name": "red"
         },
-        {
-            "name": "rubber"
-        },
         {
             "name": "mag-1"
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png
deleted file mode 100644 (file)
index bbc6047..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png and /dev/null differ
index 40eaed0198f17edd74fbf2a32b9fa06574ee0ba2..082b2586f5ca1f9395b9309f1c058c493a224ce6 100644 (file)
@@ -16,9 +16,6 @@
         {
             "name": "red"
         },
-        {
-            "name": "rubber"
-        },
         {
             "name": "uranium"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png
deleted file mode 100644 (file)
index f0e9a5c..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png and /dev/null differ
index 15964feef97f6a1485079e461c05fcbc21564584..b766264c793c04b6c8b41aef939a30196c66c1f3 100644 (file)
@@ -16,9 +16,6 @@
         {
             "name": "red"
         },
-        {
-            "name": "rubber"
-        },
         {
             "name": "uranium"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png
deleted file mode 100644 (file)
index 9cde22c..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png and /dev/null differ
index a01c6d97bc8f7a806e4706a50a8d93779844dfd4..aa11185ac398f2d3bb303e221ea120a6fbd0656a 100644 (file)
@@ -16,9 +16,6 @@
         {
             "name": "red"
         },
-        {
-            "name": "rubber"
-        },
         {
             "name": "uranium"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png
deleted file mode 100644 (file)
index ad77f0f..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png and /dev/null differ
index 77af40592a99276448547315cbc995d1dc8e8da2..1aed17cacaf4e17b72fde5631c5c057973891794 100644 (file)
@@ -19,9 +19,6 @@
         {
             "name": "red-icon"
         },
-        {
-            "name": "rubber"
-        },
         {
             "name": "uranium"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png
deleted file mode 100644 (file)
index 8be70a0..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png and /dev/null differ
index 8269fa0841d5f66b9b3f60092349f0e45258adde..4ece1ce6c3d476506bfbf9e4b8e1889ecae9907c 100644 (file)
@@ -19,9 +19,6 @@
         {
             "name": "red-icon"
         },
-        {
-            "name": "rubber"
-        },
         {
             "name": "uranium"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png
deleted file mode 100644 (file)
index fedefab..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png and /dev/null differ
index a94453eb74be3a6a66cbe61e569e59328f07d6ee..4aff585ea3afa95618a4d37d3c0ab089c8ad8744 100644 (file)
         {
             "name": "practice-6"
         },
-        {
-            "name": "rubber-1"
-        },
-        {
-            "name": "rubber-2"
-        },
-        {
-            "name": "rubber-3"
-        },
-        {
-            "name": "rubber-4"
-        },
-        {
-            "name": "rubber-5"
-        },
-        {
-            "name": "rubber-6"
-        },
         {
             "name": "uranium-1"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png
deleted file mode 100644 (file)
index d4ee09b..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png
deleted file mode 100644 (file)
index 1f3b996..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png
deleted file mode 100644 (file)
index 9724498..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png
deleted file mode 100644 (file)
index bef55e2..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png
deleted file mode 100644 (file)
index 052192e..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png
deleted file mode 100644 (file)
index e33105c..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png and /dev/null differ
index 89bc20ad9a7ab10861159d8c1326881972b7f48a..6aab220483fb17d2bf223295256c636f4733a2a7 100644 (file)
         },
         {
             "name": "practice-6"
-        },
-        {
-            "name": "rubber-1"
-        },
-        {
-            "name": "rubber-2"
-        },
-        {
-            "name": "rubber-3"
-        },
-        {
-            "name": "rubber-4"
-        },
-        {
-            "name": "rubber-5"
-        },
-        {
-            "name": "rubber-6"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png
deleted file mode 100644 (file)
index 31620f5..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png
deleted file mode 100644 (file)
index dca283c..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png
deleted file mode 100644 (file)
index 5c5a433..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png
deleted file mode 100644 (file)
index 9bb14be..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png
deleted file mode 100644 (file)
index a52d876..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png
deleted file mode 100644 (file)
index 714473f..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png and /dev/null differ
index b5e6294774ca9473775a775497fbc7b1af1ff863..4a402de2dc6983c4d50ca8f23abc1f23f27756b2 100644 (file)
@@ -317,7 +317,6 @@ MagazineBoxLightRifleRubber: MagazineBoxLightRifle
 MagazineBoxRifleRubber: MagazineBoxRifle
 MagazineBoxRifleBigRubber: MagazineBoxRifleBig
 MagazineBoxCaselessRifleRubber: MagazineBoxCaselessRifle
-MagazineBoxCaselessRifleBigRubber: MagazineBoxCaselessRifle10x24
 BoxMagazinePistolRubber: BoxMagazinePistol
 BoxMagazinePistolHighCapacityRubber: BoxMagazinePistolHighCapacity
 BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun