Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dualwield спрайты #253

Merged
merged 6 commits into from
Oct 9, 2024
Merged

Dualwield спрайты #253

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f63cb4
Dualwield спрайты
MegaDaimond Oct 9, 2024
d7e76ad
Update revolvers.yml
MegaDaimond Oct 9, 2024
2c00310
Merge branch 'master' into Dualwield-sprites
Evgencheg Oct 9, 2024
21dd7d8
Revert "Update revolvers.yml"
MegaDaimond Oct 9, 2024
e07255b
Merge branch 'Dualwield-sprites' of https://github.com/MegaDaimond/Lo…
MegaDaimond Oct 9, 2024
20cd963
Merge branch 'master' into Dualwield-sprites
MegaDaimond Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@
size: Normal
shape:
- 0,0,4,0
sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
heldPrefix: db
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
- type: Gun
fireRate: 2
fireOnDropChance: 0.5
Expand Down Expand Up @@ -171,8 +170,6 @@
size: Normal
shape:
- 0,0,4,0
sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
heldPrefix: pump
- type: Sprite
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V
- type: Clothing
Expand All @@ -197,8 +194,7 @@
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/sawn.rsi # Delta-V
- type: Item
size: Small
sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
heldPrefix: sawn
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/sawn.rsi # Delta-V
- type: Gun
fireRate: 4
fireOnDropChance: 0.5
Expand Down Expand Up @@ -285,8 +281,7 @@
size: Normal
shape:
- 0,0,4,0
sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
heldPrefix: improvised
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
- type: Gun
fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
fireOnDropChance: 1
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

- type: entity
name: desert eagle
parent: BaseWeaponPistol
parent: WeaponPistolUniversal
id: LPPWeaponPistolDesertEagle
description: A favorite of gangsters and big gun enthusiasts, uses .35 caliber cartridges.
components:
Expand Down Expand Up @@ -46,7 +46,7 @@

- type: entity
name: camo desert eagle
parent: BaseWeaponPistol
parent: WeaponPistolUniversal
id: LPPWeaponPistolDesertEagleCamo
description: A special gold piece with a lemited brindle pattern, highly coveted by collectors and crime bosses, chambered in .35 caliber.
components:
Expand All @@ -68,7 +68,7 @@

- type: entity
name: gold desert eagle
parent: BaseWeaponPistol
parent: WeaponPistolUniversal
id: LPPWeaponPistolDesertEagleGold
description: A symbol of high status in the criminal world and beyond, uses .35 caliber cartridges.
components:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

- type: entity
name: scarlet lawyer
parent: BaseWeaponSniper
parent: LPPBaseWeaponLeverSniper
id: LPPWeaponRevolverAmina
description: Used by Amina Ignatieva, in case of "important litigation", the recoil of this weapon is so lethal that a person can barely stand on his feet. Uses .60 anti-materiel rounds.
components:
Expand Down Expand Up @@ -123,7 +123,7 @@

- type: entity
name: Judge
parent: BaseWeaponSniper
parent: LPPBaseWeaponLeverSniper
id: LPPWeaponRevolverJudge
description: There is only one sentence with this revolver - death, the recoil of this weapon is so lethal that a person can hardly stand on his feet. Uses .60 anti-materiel rounds.
components:
Expand Down
Binary file added ...res/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 36 additions & 24 deletions Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,41 @@
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "mag-0"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
}
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "bolt-open"
},
{
"name": "mag-0"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
Comment on lines +34 to +45
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Изменения соответствуют целям PR и расширяют функциональность спрайтов.

Добавление новых состояний "equipped-SUITSTORAGE", "wielded-inhand-left" и "wielded-inhand-right" расширяет визуальное представление винтовки в игре, что соответствует цели добавления функциональности двойного владения оружием. Изменения выглядят корректными и последовательными.

Для улучшения читаемости и организации кода, рекомендуется сгруппировать похожие состояния вместе. Например, можно расположить все состояния "inhand" рядом друг с другом, а все состояния "equipped" - в другой группе. Это может упростить будущее обслуживание и понимание структуры файла.

]
}
Binary file added ...ures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...res/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
]
}
Binary file added ...Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...extures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
]
}
Binary file added .../Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
]
}
Binary file added ...res/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...es/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
Comment on lines +27 to +34
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Изменения одобрены, но есть предложение по улучшению.

Новые состояния "wielded-inhand-left" и "wielded-inhand-right" корректно добавлены и соответствуют целям PR по добавлению спрайтов для двойного владения оружием. Свойство "directions" со значением 4 согласуется с другими состояниями в файле.

Для улучшения читаемости и организации кода предлагаю сгруппировать связанные состояния вместе. Например:

 {
     "name": "inhand-left",
     "directions": 4
 },
 {
     "name": "inhand-right",
     "directions": 4
 },
+{
+    "name": "wielded-inhand-left",
+    "directions": 4
+},
+{
+    "name": "wielded-inhand-right",
+    "directions": 4
+},
 {
     "name": "equipped-BACKPACK",
     "directions": 4
-},
-{
-    "name": "wielded-inhand-left",
-    "directions": 4
-},
-{
-    "name": "wielded-inhand-right",
-    "directions": 4
 }

Это позволит легче находить и сравнивать связанные состояния в будущем.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
}

}
]
}
Binary file added ...tures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
]
}
Binary file added .../Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
Comment on lines +24 to +31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Одобрено: Добавлены новые состояния для двойного владения оружием.

Новые состояния "wielded-inhand-left" и "wielded-inhand-right" корректно добавлены в конфигурацию. Они соответствуют существующему стилю именования и имеют правильное количество направлений (4), что согласуется с другими состояниями в руках.

Эти изменения хорошо поддерживают визуальное представление двойного владения оружием в игре, что соответствует целям PR.

Для улучшения читаемости и организации кода, рекомендуется сгруппировать похожие состояния вместе. Например, можно расположить новые состояния сразу после соответствующих им обычных состояний "inhand-left" и "inhand-right".

}
]
}
Binary file added ...rasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...asen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
]
}
Binary file added ...yanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...anotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 13 additions & 5 deletions Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
"copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
"size": {
"x": 32,
"y": 32
Expand All @@ -27,13 +27,21 @@
"name": "inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
]
}
Binary file added Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@
{
"name": "equipped-SUITSTORAGE",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
Comment on lines +37 to +44
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Изменения соответствуют целям PR и выглядят корректными.

Добавление новых состояний "wielded-inhand-left" и "wielded-inhand-right" согласуется с целью PR по внедрению спрайтов для двойного владения оружием. Атрибут "directions" со значением 4 соответствует существующим состояниям "inhand-left" и "inhand-right".

Для улучшения читаемости кода рекомендуется добавить пустую строку перед новыми состояниями:

         "name": "equipped-SUITSTORAGE",
         "directions": 4
     },
+
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4

}
]
}
Binary file added Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...urces/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111",
"copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
"size": {
"x": 32,
"y": 32
Expand All @@ -27,11 +27,19 @@
"name": "inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
Comment on lines +30 to +37
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Новые состояния для спрайтов двуручного оружия одобрены, но рекомендуется улучшить организацию.

Добавление состояний "wielded-inhand-left" и "wielded-inhand-right" соответствует целям PR и расширяет функциональность спрайтов оружия. Количество направлений (4) согласуется с существующими состояниями.

Для улучшения читаемости кода рекомендуется переместить новые состояния ближе к соответствующим однорукимм состояниям. Предлагаемая структура:

{
    "name": "inhand-left",
    "directions": 4
},
{
    "name": "wielded-inhand-left",
    "directions": 4
},
{
    "name": "inhand-right",
    "directions": 4
},
{
    "name": "wielded-inhand-right",
    "directions": 4
},

{
"name": "equipped-BACKPACK",
"directions": 4
},
{
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
Expand Down
Binary file added Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 9 additions & 1 deletion Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by brainfood1183(Github) inspired by an image created by rezierré#5003 (Discord)",
"copyright": "Made by brainfood1183(Github) inspired by an image created by rezierré#5003 (Discord), wield sprites by RiceMar1244",
"size": {
"x": 32,
"y": 32
Expand All @@ -20,6 +20,14 @@
{
"name": "inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
]
}
Binary file added .../Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
"size": {
"x": 32,
"y": 32
Expand All @@ -27,11 +27,19 @@
"name": "inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
Comment on lines +30 to +37
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Новые состояния для двуручного оружия одобрены.

Добавление состояний "wielded-inhand-left" и "wielded-inhand-right" соответствует целям PR по внедрению функциональности двойного владения оружием. Количество направлений (4) соответствует существующим состояниям "inhand", что обеспечивает согласованность.

Предлагаю небольшое улучшение в организации кода: переместите новые состояния сразу после соответствующих "inhand" состояний для лучшей читаемости и группировки связанных элементов. Например:

{
    "name": "inhand-left",
    "directions": 4
},
{
    "name": "wielded-inhand-left",
    "directions": 4
},
{
    "name": "inhand-right",
    "directions": 4
},
{
    "name": "wielded-inhand-right",
    "directions": 4
},

{
"name": "equipped-BACKPACK",
"directions": 4
},
{
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
Expand Down
Binary file added ...rces/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-left.png
View file
Open in desktop
Binary file added ...ces/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-right.png
View file
Open in desktop
Loading
Loading