Respite and minor changes to mercenary items (#23783)
* Respite and minor changes to mercenary items This is try number three, everything should be fine this time * Fix meta * Fix bot * Fix bot 2 * Fix meta 2 * Fix meta 3
Jackal298
GitHub
@@ -268,9 +268,9 @@
|
||||
description: High-quality combat gloves to protect hands from mechanical damage during combat.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Clothing/Hands/Gloves/Color/olive.rsi
|
||||
sprite: Clothing/Hands/Gloves/mercbattle.rsi
|
||||
- type: Clothing
|
||||
sprite: Clothing/Hands/Gloves/Color/olive.rsi
|
||||
sprite: Clothing/Hands/Gloves/mercbattle.rsi
|
||||
- type: Butcherable
|
||||
butcheringType: Knife
|
||||
spawned:
|
||||
|
||||
@@ -962,7 +962,7 @@
|
||||
mode: SensorOff
|
||||
|
||||
- type: entity
|
||||
parent: UnsensoredClothingUniformBase
|
||||
parent: ClothingUniformBase
|
||||
id: ClothingUniformJumpsuitMercenary
|
||||
name: mercenary jumpsuit
|
||||
description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned.
|
||||
|
||||
|
Before Width: | Height: | Size: 883 B After Width: | Height: | Size: 1007 B |
|
Before Width: | Height: | Size: 553 B After Width: | Height: | Size: 737 B |
|
Before Width: | Height: | Size: 628 B After Width: | Height: | Size: 693 B |
|
Before Width: | Height: | Size: 610 B After Width: | Height: | Size: 697 B |
|
Before Width: | Height: | Size: 396 B |
|
Before Width: | Height: | Size: 463 B After Width: | Height: | Size: 463 B |
BIN
Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 422 B |
|
Before Width: | Height: | Size: 278 B After Width: | Height: | Size: 278 B |
|
Before Width: | Height: | Size: 286 B After Width: | Height: | Size: 286 B |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
|
||||
"copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and paradise station https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/clothing/gloves.dmi",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
|
Before Width: | Height: | Size: 373 B After Width: | Height: | Size: 476 B |
|
Before Width: | Height: | Size: 448 B After Width: | Height: | Size: 465 B |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/54ecdcc05bcaf335489938b1253a2a733ba12271",
|
||||
"copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/54ecdcc05bcaf335489938b1253a2a733ba12271 and paradise station https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/clothing/gloves.dmi",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
|
||||