diff --git a/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Ammunition/boxes.yml b/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Ammunition/boxes.yml index 93d7553378..190d345358 100644 --- a/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Ammunition/boxes.yml +++ b/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Ammunition/boxes.yml @@ -56,35 +56,3 @@ - Cartridge53mm proto: Cartridge53mm capacity: 500 - -- type: entity - id: MagazineBox105mm - name: ammo box (105mm) - parent: BaseMagazineBox - components: - - type: Tag - tags: - - Magazine105mm - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - Cartridge105mm - proto: Cartridge105mm - capacity: 500 - -- type: entity - id: MagazineBox140mm - name: ammo box (140mm) - parent: BaseMagazineBox - components: - - type: Tag - tags: - - Magazine140mm - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - Cartridge140mm - proto: Cartridge140mm - capacity: 500 diff --git a/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Ammunition/explosive.yml b/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Ammunition/explosive.yml index f78f0bebd6..310cbff66c 100644 --- a/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Ammunition/explosive.yml +++ b/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Ammunition/explosive.yml @@ -54,7 +54,7 @@ - type: entity id: MissileSDM name: SDM-VC-SR40 - parent: BaseItem + parent: BaseMissile description: A structural damage missile that requires visual contact and has a short range of 40 kilometers. components: - type: Sprite @@ -64,7 +64,7 @@ - type: entity id: MissileSAM name: SAM-RC-LR40 - parent: BaseItem + parent: BaseMissile description: A ship attack missile that requires radar contact and has a long range of 4000 kilometers. components: - type: Sprite @@ -80,7 +80,7 @@ - type: entity id: MissileTAD name: TAD-FB-IR-R50 - parent: BaseItem + parent: BaseMissile description: A total area destruction device that you should fire blindly with infinite range and has an expected blast radius of 50 meters. components: - type: Sprite @@ -96,7 +96,7 @@ - type: entity id: MissileTND name: TND-FB-IR-R150 - parent: BaseItem + parent: BaseMissile description: A total nuclear destruction device that you should fire blindly with infinite range and has an expected blast radius of 150 meters. components: - type: Sprite diff --git a/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Projectiles/explosive.yml b/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Projectiles/explosive.yml index d54ebf35c8..eda805dfe3 100644 --- a/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Projectiles/explosive.yml +++ b/Resources/Prototypes/_FTL/Entities/Objects/Weapons/Guns/Projectiles/explosive.yml @@ -14,7 +14,7 @@ totalIntensity: 50.0 intensitySlope: 8 maxIntensity: 100 - maxTileBreak: 0 + maxTileBreak: 1 - type: entity id: Bullet53mm @@ -29,10 +29,10 @@ - type: ExplodeOnTrigger - type: Explosive explosionType: Default - totalIntensity: 500.0 - intensitySlope: 50 + totalIntensity: 50.0 + intensitySlope: 4 maxIntensity: 100 - maxTileBreak: 0 + maxTileBreak: 1 - type: entity id: Bullet105mm @@ -47,7 +47,7 @@ - type: ExplodeOnTrigger - type: Explosive explosionType: Default - totalIntensity: 1000.0 + totalIntensity: 500.0 intensitySlope: 15 maxIntensity: 100 maxTileBreak: 1 @@ -65,10 +65,10 @@ - type: ExplodeOnTrigger - type: Explosive explosionType: Default - totalIntensity: 3000.0 - intensitySlope: 1 + totalIntensity: 700.0 + intensitySlope: 15 maxIntensity: 500 - maxTileBreak: 0 + maxTileBreak: 1 # missiles - type: entity