]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Ammo Box Tweaks (#23180)
authorAlekshhh <44923899+Alekshhh@users.noreply.github.com>
Sun, 31 Dec 2023 02:13:07 +0000 (04:13 +0200)
committerGitHub <noreply@github.com>
Sun, 31 Dec 2023 02:13:07 +0000 (19:13 -0700)
ammo

31 files changed:
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/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png
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.png
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/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
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png
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/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.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/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png
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/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png

index 225ec3175894fe9e531626fdd9cc156db69d2139..1f2b2fe2875333b31b185808a4aedd536cf0a15e 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 a8052fc9ad2adfe6d816fff4b658d6759cd4ecb1..1784e7f62362b27f1e9b8614bd602746862d5267 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 190fa5a6dc7184717b7379a1e460149ae23480d4..a72e24594e3e37a3cfc4e8f565ff84b0922c63e5 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",
+  "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",
   "size": {
     "x": 32,
     "y": 32
index a2049395c6a9cbbb7247bf00f81d61bd3baf053d..1685543539f9418a3a94ed59046ef494269f66b1 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 7a8e9468ae06e15ab961657aa9d04ce189403f69..878138f73faf147fb7ca4718daf3d1e8ee47f2c4 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",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi , tweaked by Alekshhh",
   "size": {
     "x": 32,
     "y": 32
index 2f77d8364b21de66ef63c2bac78932cbac3fa4fc..99548b3e5b42d8a8091ea849f169a11f12479f82 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
index 6363a6f5cce581eae8fc23e05864bccc963d48e1..5a75c53666330617d561ffa0f9f4e2d8ea6eee5f 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png differ
index dbb0cf05939538d896e1bed731871783d439e837..ef44262042f0ef922d928d0561992b052fb0b6d1 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 3f7636e6b9436e4cf52a3cf8deed5de79de1db8e..907b6040c276f1f2358c1d7df2f0955a37c964be 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 583b7e9393c731fa984d0c5695aba4f2a91b1e99..9259015020c36880f02424554584f89ea7318a40 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",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi , tweaked by Alekshhh",
   "size": {
     "x": 32,
     "y": 32
index 9bdb2c01d114a1f4ee5c0565b84bed8599886e17..b252261c160cde5a9c4a2317ba649f424c8e1fb6 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
index 63844906155acd4e07506cf623442aa0536383d4..7d8d465e638d05a6a9cc720d0e2a3ee9435fd6f7 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png differ
index e977e2e72453db62344e34efd33e1a0e11e433f9..150b4b15cfd30e154071b6e8dca31be10a2e4080 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
index 84ef47a1d6731a7aa29c2f74a1d563d518cec5de..63a58f01fd31bb4836d126bf6dbab4cadf2327cb 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png differ
index 902234628d0903080d21f02b5c16592bbdfd8d77..153b43e441c891179d90b2b611b7dde80e7b2a39 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 d4d581f5bbdf8f4e95f8d6749deed9d475644d7a..f6fb71b69d5bdbd292ceeef7f65dd8f9d492ce57 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 dbc1078dd917c86519cb527c18a6244e9626619c..a36a922617070909b76b1a7abbef3e6b05527145 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 1d1e4b68d9b8644fd990a022fe5a1b9b1538b515..55d46853fe73d9be0162084f95caf5878784d465 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",
+  "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",
   "size": {
     "x": 32,
     "y": 32
index 24ceb79488543018052e7a69bd64156984bb84d6..7aa10042614a36d7b0c2ee1a19b61cdff5b74168 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
index ccef0288d114ad8bb121b8dffd1730ffb8c93c3b..020a8d3851d831e7949606ddae7a7e59da0f6fad 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png differ
index 28b5df59159ec5e42bc7f1907bdf9e972c834567..ac7de8b43bd0a0ed731867c55657e35586baa36c 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 eba4fc52cdaacaa31ead98229282e6344afbe258..226711c301a27937e5e8228fd391b0a489b0910c 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 bfb2eefc41740f4756e849c5e36ead075688a7bc..7657edc7ef7d34aff2264a5111c12bfd553411f1 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",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi , tweaked by Alekshhh",
   "size": {
     "x": 32,
     "y": 32
index 6a2e8481c38c257f9d3e5ab4224e62089f53e7bf..6911805ffae2069f358d869f068a74e6aa28e775 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
index f317d03c212f3d84d7f601471c095bcc8fa328c9..aa5c85660a999635ff8bd1738baa420edef103f1 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png differ
index 5f674c75f245c8c0e29f5df0497d053cfac7b390..6db2100a88ae0abfe9dd6f70f11d255ab6deac01 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 4d0835d40141bbaf5bb117c71dad0bdf62d78d8e..e10d99713b599a13dddcda731bfe7abaaf935850 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 2d9e2d767f2f1d3000df82f2ed07d35acdb5b657..0c642312083785774bb82898564cc2ff2b77fb9e 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 08e598b8b82b4478f4777390c5cc660efe701eb4..f05e5c926124c25a3afcea4a47aeb91974e7c72d 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",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi , tweaked by Alekshhh",
   "size": {
     "x": 32,
     "y": 32
index b3f236d787cd93c864e56aab05b507e9cae45b4e..6d5337b8bffef0310f6a6de72f08a0bbef18624a 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
index ada010cafbb527a480686097bb5795b37615e1b9..1f883d1572decbe4b50966a66501103a5374c6bd 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png differ