juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gun refactor (#8301)

Browse Source 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2022-06-01 19:59:58 +10:00
committed by GitHub
parent 1ced3c5002
commit fb943a61dc
1051 changed files with 8230 additions and 99090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 358 B

3
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/meta.json
View File

@@ -7,9 +7,6 @@
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base-10x24.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-10x24.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 355 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base-b.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-b.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 393 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/flash.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/flash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 304 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/hv.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/hv.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 308 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/mag-1.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/mag10-1.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/magb-1.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

3
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/meta.json → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json
View File

@@ -7,9 +7,6 @@
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/practice.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 316 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber-b.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber-b.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 152 B

After

Width:  |  Height:  |  Size: 152 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 316 B

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 450 B

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 487 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/base-b.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base-b.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 303 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 453 B

After

Width:  |  Height:  |  Size: 453 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/hv.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/hv.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 264 B

After

Width:  |  Height:  |  Size: 264 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/mag-1.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/magb-1.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

3
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/meta.json → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json
View File

@@ -7,9 +7,6 @@
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/practice.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 265 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/rubber.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 275 B

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 436 B

3
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json
View File

@@ -7,9 +7,6 @@
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 459 B

3
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json
View File

@@ -7,9 +7,6 @@
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/base-b.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-b.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 304 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/flash.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/flash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 318 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/hv.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/hv.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 315 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/mag-1.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/magb-1.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

3
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/meta.json → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json
View File

@@ -7,9 +7,6 @@
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice-b.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice-b.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 152 B

After

Width:  |  Height:  |  Size: 152 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 314 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/rubber.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 322 B

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 435 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/spent.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/base-spent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
View File

@@ -11,7 +11,7 @@
"name": "base"
},
{
"name": "spent"
"name": "base-spent"
}
]
}

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/spent.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base-spent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 333 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/spent.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag-spent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 324 B

After

Width:  |  Height:  |  Size: 324 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 289 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/spent.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank-spent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 319 B

After

Width:  |  Height:  |  Size: 319 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 289 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flare.rsi/spent.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare-spent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 356 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flare.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 363 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/spent.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flash-spent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 332 B

After

Width:  |  Height:  |  Size: 332 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/spent.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary-spent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 381 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 368 B

After

Width:  |  Height:  |  Size: 368 B

44
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
View File

@@ -11,7 +11,49 @@
"name": "base"
},
{
"name": "spent"
"name": "base-spent"
},
{
"name": "beanbag"
},
{
"name": "beanbag-spent"
},
{
"name": "blank"
},
{
"name": "blank-spent"
},
{
"name": "flare"
},
{
"name": "flare-spent"
},
{
"name": "flash"
},
{
"name": "flash-spent"
},
{
"name": "incendiary"
},
{
"name": "incendiary-spent"
},
{
"name": "practice"
},
{
"name": "practice-spent"
},
{
"name": "slug"
},
{
"name": "slug-spent"
}
]
}

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/spent.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice-spent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 340 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 328 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/spent.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug-spent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 331 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 331 B

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/79b16e252e29d5a223a2b928fba25e2e6f9644ee/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/base.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 289 B

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/spent.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 324 B

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_baton.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/baton.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 310 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_blast.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/flash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 386 B

After

Width:  |  Height:  |  Size: 386 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 413 B

After

Width:  |  Height:  |  Size: 413 B

14
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flare.rsi/meta.json → Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
View File

@@ -8,7 +8,19 @@
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
"name": "baton"
},
{
"name": "blast"
},
{
"name": "flash"
},
{
"name": "frag"
},
{
"name": "rpg"
},
{
"name": "spent"

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi/frag.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/rpg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 322 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_baton.rsi/spent.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/spent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 205 B

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_baton.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/79b16e252e29d5a223a2b928fba25e2e6f9644ee/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_blast.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_blast.rsi/spent.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 205 B

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi/spent.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 205 B

17
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi/meta.json
View File

@@ -1,17 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
"states": [
{
"name": "base"
},
{
"name": "spent"
}
]
}

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi/spent.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 205 B

14
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi/meta.json
View File

@@ -1,14 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/guns/projectile/rocket.dmi",
"states": [
{
"name": "frag"
}
]
}

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/base.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 302 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-1.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-2.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-3.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-3.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-4.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-4.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-5.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-5.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-6.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-6.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-7.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-7.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

6
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/meta.json → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json
View File

@@ -7,9 +7,6 @@
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
"states": [
{
"name": "icon"
},
{
"name": "base"
},
@@ -30,6 +27,9 @@
},
{
"name": "mag-6"
},
{
"name": "mag-7"
}
]
}

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 350 B

After

Width:  |  Height:  |  Size: 350 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 392 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-1.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-2.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-3.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-4.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-5.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-5.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

16
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/meta.json → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
View File

@@ -8,10 +8,19 @@
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi",
"states": [
{
"name": "icon"
"name": "base"
},
{
"name": "base"
"name": "high_velocity"
},
{
"name": "practice"
},
{
"name": "red"
},
{
"name": "rubber"
},
{
"name": "mag-1"
@@ -27,9 +36,6 @@
},
{
"name": "mag-5"
},
{
"name": "mag-6"
}
]
}

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 391 B

After

Width:  |  Height:  |  Size: 391 B

0
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/base.png → Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 394 B

Some files were not shown because too many files have changed in this diff Show More