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

Revert "Респрайт энергетического дробовика" #107

Closed
wants to merge 1 commit into from
Closed

Revert "Респрайт энергетического дробовика" #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,15 +725,15 @@
description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
components:
- type: Sprite
sprite: Stories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi
sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Clothing
sprite: Stories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi
sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
- type: Gun
fireRate: 2
soundGunshot:
Expand All @@ -753,7 +753,7 @@
size: Large
shape:
- 0,0,3,1
sprite: Stories/Objects/Weapons/Guns/Battery/inhands_64x.rsi
sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
heldPrefix: energy
- type: Tag
tags:
Expand Down
Binary file removed ...urces/Textures/Stories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...s/Stories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...tories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...urces/Textures/Stories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...ures/Stories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...ures/Stories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...ures/Stories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...ures/Stories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png
View file
Open in desktop
Binary file not shown.
37 changes: 0 additions & 37 deletions Resources/Textures/Stories/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json
View file
Open in desktop

This file was deleted.

Binary file removed ...res/Stories/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...es/Stories/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png
View file
Open in desktop
Binary file not shown.
27 changes: 0 additions & 27 deletions Resources/Textures/Stories/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json
View file
Open in desktop

This file was deleted.

Binary file removed ...es/Stories/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...s/Stories/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png
View file
Open in desktop
Binary file not shown.
Loading