diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml index 8536486822..53409a8e4c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml @@ -57,7 +57,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 240 + damage: 200 behaviors: - !type:DoActsBehavior acts: ["Destruction"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Material/plasma_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Material/plasma_guns.yml new file mode 100644 index 0000000000..0a33fff698 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Material/plasma_guns.yml @@ -0,0 +1,73 @@ +- type: entity + id: BaseWeaponBattery + parent: BaseItem + abstract: true + components: + - type: Sprite + - type: Item + size: Huge + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + fireOnDropChance: 0.15 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + doRecoil: false + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + - type: StaticPrice + price: 500 + - type: MeleeWeapon # WD EDIT + attackRate: 0.7 + damage: + types: + Blunt: 10 + soundHit: + collection: GenericHit + +- type: entity + id: BasePlasmaGun + parent: BaseItem + abstract: true + components: + - type: Sprite + - type: Item + size: Huge + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + fireOnDropChance: 0.15 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + doRecoil: false + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + - type: StaticPrice + price: 500 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 3f37d308db..d566eb3234 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -138,3 +138,37 @@ impactFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: impact_beam_heavy2 + +- type: hitscan + id: PlasmaLaser + maxLength: 4 + damage: + types: + Heat: 10 + Structural: 30 + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_beam_heavy + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_beam_heavy + +- type: hitscan + id: LongPlasmaLaser + maxLength: 7 + damage: + types: + Heat: 10 + Structural: 30 + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_beam_heavy + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_beam_heavy diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 1e25e1fee2..7bf35aa158 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -418,7 +418,7 @@ Structural: 20 # Short lifespan - type: TimedDespawn - lifetime: 0.4 + lifetime: 0.2 # WD EDIT / Actually short bullet, ~4 tiles. - type: entity id: BulletKineticShuttle