diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 1bc5266edc..2c0307922b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -299,6 +299,29 @@ zeroVisible: true - type: Appearance +- type: entity + name: practice disabler + parent: WeaponDisabler + id: WeaponDisablerPractice + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/practice_disabler.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/practice_disabler.rsi + quickEquip: false + slots: + - Belt + - type: ProjectileBatteryAmmoProvider + proto: BulletDisablerPractice + fireCost: 100 + - type: entity name: taser parent: BaseWeaponBatterySmall diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 7fa616aa9e..fa6b2282b0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -169,6 +169,46 @@ path: "/Audio/Weapons/tap.ogg" soundForce: true +- type: entity + name : disabler bolt practice + id: BulletDisablerPractice + parent: BaseBullet + noSpawn: true + components: + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + id: projectile + mask: + - Impassable + - BulletImpassable + - *flybyfixture + - type: Ammo + - type: StaminaDamageOnCollide + damage: 5 + - type: Projectile + impactEffect: BulletImpactEffectDisabler + damage: + types: + Heat: 1 + soundHit: + path: "/Audio/Weapons/tap.ogg" + soundForce: true + - type: entity name: emitter bolt id: EmitterBolt diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/base.png new file mode 100644 index 0000000000..ce3d59d94a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/equipped-BELT.png new file mode 100644 index 0000000000..eead59f2cb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-0.png new file mode 100644 index 0000000000..7f6d6e10ef Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-1.png new file mode 100644 index 0000000000..a083442714 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-2.png new file mode 100644 index 0000000000..b07775cf01 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-3.png new file mode 100644 index 0000000000..15c81f9c1d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-4.png new file mode 100644 index 0000000000..f2b32834e3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-left-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-0.png new file mode 100644 index 0000000000..c098c3340a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-1.png new file mode 100644 index 0000000000..cccf790acd Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-2.png new file mode 100644 index 0000000000..ed5a78823c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-3.png new file mode 100644 index 0000000000..23108c6b1e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-4.png new file mode 100644 index 0000000000..60ce977579 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/inhand-right-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..8a23628ff5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..b8e47dbae4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..39924e1665 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..b91721dc77 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..50e3ec2489 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json new file mode 100644 index 0000000000..3617fdd66b --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json @@ -0,0 +1,69 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken and recolored from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "inhand-left-0" + }, + { + "name": "inhand-left-1" + }, + { + "name": "inhand-left-2" + }, + { + "name": "inhand-left-3" + }, + { + "name": "inhand-left-4" + }, + { + "name": "inhand-right-0" + }, + { + "name": "inhand-right-1" + }, + { + "name": "inhand-right-2" + }, + { + "name": "inhand-right-3" + }, + { + "name": "inhand-right-4" + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} \ No newline at end of file