New Guns (hopefully no conflicts this time) (#5105)
* New Guns (hopefully conflict free) * solving conflicts * forgot to delete old laser gun png * Revert "forgot to delete old laser gun png" This reverts commit 6273aff7a411f24484fdbde0757446ab7ab5f873. * small corrections * carbine * uplink correction * cog meta.json correction * replace laser pistol * svalinn inhands * getting rid of my old lasergun * forgot to delete the old lasergun from yml * Revert "getting rid of my old lasergun" This reverts commit 763caefd64f1497da5ff6ac5239e3c64b0a892c2. * Revert "forgot to delete the old lasergun from yml" This reverts commit 144f4533c44d29e56e5356389d498a437180fa1e. * base.png and taser fire cost corrections * last changes for this PR. the c20 and predator sprites. and corrected meta.json * lowercased Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
BIN
Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png
Normal file
|
After Width: | Height: | Size: 562 B |
BIN
Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 542 B |
|
After Width: | Height: | Size: 555 B |
|
After Width: | Height: | Size: 552 B |
|
After Width: | Height: | Size: 149 B |
|
After Width: | Height: | Size: 152 B |
|
After Width: | Height: | Size: 166 B |
|
After Width: | Height: | Size: 170 B |
@@ -0,0 +1,37 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/retro.dmi",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "base"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-1"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-2"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-3"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-4"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 446 B |
|
After Width: | Height: | Size: 458 B |
|
After Width: | Height: | Size: 438 B |
|
After Width: | Height: | Size: 431 B |
|
After Width: | Height: | Size: 136 B |
|
After Width: | Height: | Size: 151 B |
|
After Width: | Height: | Size: 161 B |
|
After Width: | Height: | Size: 161 B |
@@ -0,0 +1,37 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/makeshift_carbine.dmi",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "base"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-1"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-2"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-3"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-4"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 580 B |
|
After Width: | Height: | Size: 588 B |
|
After Width: | Height: | Size: 550 B |
|
After Width: | Height: | Size: 517 B |
|
After Width: | Height: | Size: 176 B |
|
After Width: | Height: | Size: 170 B |
|
After Width: | Height: | Size: 173 B |
|
After Width: | Height: | Size: 174 B |
@@ -0,0 +1,37 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/nt_svalinn.dmi",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "base"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-1"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-2"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-3"
|
||||
},
|
||||
{
|
||||
"name": "mag-unshaded-4"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||