Uranium Ammo (#22406)
* working on depleted uranium shotgun ammo * added depleted uranium to more ammo * Last changes and additions * Forgot something, theoretically resolved the merge conflict too * Nerfed the DU munitions, renamed em to uranium because it's not really DU * made the ammo more expensive, also fixing the crash at the same time * Fixed the last error, theoretically at least * Revert "Fixed the last error, theoretically at least" This reverts commit a875d2ac320478e4cb407564d704d915d0ef158b. * copyright changes, small sprite changes, last references of depleted uranium removed * Revert "copyright changes, small sprite changes, last references of depleted uranium removed" This reverts commit 93a12bf20bc72581a0bdc32a3cdc7d887f50de3f. * Update meta.json * Update meta.json * Update lathe.yml * Update arsenal.yml
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 397 B |
Binary file not shown.
|
After Width: | Height: | Size: 399 B |
@@ -5,7 +5,7 @@
|
||||
"y": 32
|
||||
},
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, improvised ammo from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34",
|
||||
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, improvised ammo from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, uranium ammo is a modification of the slug sprite by Boaz1111",
|
||||
"states": [
|
||||
{
|
||||
"name": "base"
|
||||
@@ -54,6 +54,12 @@
|
||||
},
|
||||
{
|
||||
"name": "slug-spent"
|
||||
},
|
||||
{
|
||||
"name": "depleted-uranium"
|
||||
},
|
||||
{
|
||||
"name": "depleted-uranium-spent"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
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/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14",
|
||||
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14, the uranium sprite is a modified version of the buckshot pellet by Boaz1111",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
@@ -13,6 +13,9 @@
|
||||
{
|
||||
"name": "buckshot-flare"
|
||||
},
|
||||
{
|
||||
"name": "depleted-uranium"
|
||||
},
|
||||
{
|
||||
"name": "ball"
|
||||
},
|
||||
@@ -53,4 +56,4 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user