diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml index 3e38a3608b..7a8b9180e6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: WeaponProtoKineticAcceleratorBase abstract: true parent: BaseItem @@ -12,7 +12,6 @@ minAngle: -43 maxAngle: -43 - type: Wieldable - wieldedInhandPrefix: null - type: Gun fireRate: 0.5 selectedMode: SemiAuto @@ -28,9 +27,10 @@ - type: GenericVisualizer visuals: enum.AmmoVisuals.HasAmmo: - overlay: + empty-icon: True: { visible: False } False: { visible: True } + #todo: add other 'empty' animations - type: RechargeBasicEntityAmmo rechargeCooldown: 0.75 rechargeSound: @@ -40,7 +40,7 @@ capacity: 1 count: 1 - type: Clothing - #sprite: WRITEMEWRITEMEWRITEME + sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi quickEquip: false slots: - suitStorage diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index ec854093a4..226fa29164 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: proto-kinetic accelerator id: WeaponProtoKineticAccelerator parent: WeaponProtoKineticAcceleratorBase @@ -7,7 +7,9 @@ - type: Sprite sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi layers: - - state: gun - - state: empty + - state: icon + - state: animation-icon visible: false - map: [ "overlay" ] + map: [ "empty-icon" ] + # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi + # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 32abc1ba04..0609d9e417 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -5,7 +5,7 @@ name: research-technology-salvage-weapons icon: sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi - state: gun + state: icon discipline: Arsenal tier: 1 cost: 10000 diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/animation-icon.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/animation-icon.png new file mode 100644 index 0000000000..5b125162ac Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/animation-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/empty.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/empty.png deleted file mode 100644 index 327fa954ff..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/empty.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/equipped-BELT.png new file mode 100644 index 0000000000..2be82246c2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/gun.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/gun.png deleted file mode 100644 index c7657c7e3f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/gun.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/icon.png new file mode 100644 index 0000000000..a9e2f095c2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-left.png index 711a82aa37..903fdcdf9d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-right.png index 2206819530..44c2403f11 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json index 0e57bf9fe4..c40db27806 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json @@ -1,31 +1,43 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57", + "copyright": "icon by RiceMar1244 based on tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57; inhand, wield, and belt equip sprites by RiceMar1244", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "gun" - }, - { - "name": "empty", - "delays": [ - [ - 0.2, - 0.2 - ] - ] - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "animation-icon", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..faa98926ad Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..673894c515 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/wielded-inhand-right.png differ