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>
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 530 B |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 175 B |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 158 B |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 560 B |
|
Before Width: | Height: | Size: 715 B After Width: | Height: | Size: 742 B |
|
Before Width: | Height: | Size: 714 B After Width: | Height: | Size: 711 B |
|
Before Width: | Height: | Size: 189 B After Width: | Height: | Size: 172 B |
@@ -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/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/cr20.dmi",
|
||||
"copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/cr20.dmi",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
|
||||
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 172 B |