From 81ab31659bfa74b46cbf23f599c76b5f65113c27 Mon Sep 17 00:00:00 2001 From: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Date: Sun, 1 Mar 2020 04:09:30 -0400 Subject: [PATCH] Little projectile enhancements (#764) * Little projectile enhancements * Lets see if this fixes my fuck up * Im a weapon smoothbrain. This fixes caliber folders name --- .../Entities/Weapons/Ammunition/10mm/projectiles.yml | 12 ++++++------ .../Entities/Weapons/Ammunition/12g/projectiles.yml | 4 ++-- .../Entities/Weapons/Ammunition/20mm/projectiles.yml | 4 ++-- .../Entities/Weapons/Ammunition/24mm/projectiles.yml | 12 ++++++------ .../Ammunition/{.45mm => 45mm}/ammunition.yml | 0 .../Weapons/Ammunition/{.45mm => 45mm}/boxes.yml | 0 .../Ammunition/{.45mm => 45mm}/projectiles.yml | 12 ++++++------ .../Weapons/Ammunition/5.56mm/projectiles.yml | 12 ++++++------ .../Weapons/Ammunition/6.5mm/projectiles.yml | 12 ++++++------ .../Weapons/Ammunition/7.62mm/projectiles.yml | 12 ++++++------ .../Entities/Weapons/Ammunition/9mm/projectiles.yml | 12 ++++++------ .../Ammunition/{.32 => Point32}/ammunition.yml | 0 .../Weapons/Ammunition/{.32 => Point32}/boxes.yml | 0 .../Ammunition/{.32 => Point32}/projectiles.yml | 12 ++++++------ .../Ammunition/{.357 => Point357}/ammunition.yml | 0 .../Weapons/Ammunition/{.357 => Point357}/boxes.yml | 0 .../Ammunition/{.357 => Point357}/projectiles.yml | 12 ++++++------ .../Ammunition/{.44 => Point44}/ammunition.yml | 0 .../Weapons/Ammunition/{.44 => Point44}/boxes.yml | 0 .../Ammunition/{.44 => Point44}/projectiles.yml | 12 ++++++------ .../Ammunition/{.50 => Point50}/ammunition.yml | 0 .../Weapons/Ammunition/{.50 => Point50}/boxes.yml | 0 .../Ammunition/{.50 => Point50}/projectiles.yml | 12 ++++++------ .../Entities/Weapons/Projectiles/projectiles.yml | 8 ++------ 24 files changed, 72 insertions(+), 76 deletions(-) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.45mm => 45mm}/ammunition.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.45mm => 45mm}/boxes.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.45mm => 45mm}/projectiles.yml (77%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.32 => Point32}/ammunition.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.32 => Point32}/boxes.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.32 => Point32}/projectiles.yml (77%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.357 => Point357}/ammunition.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.357 => Point357}/boxes.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.357 => Point357}/projectiles.yml (77%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.44 => Point44}/ammunition.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.44 => Point44}/boxes.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.44 => Point44}/projectiles.yml (77%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.50 => Point50}/ammunition.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.50 => Point50}/boxes.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.50 => Point50}/projectiles.yml (77%) diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml index 2ce204b9f6..da62a0d23c 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_10mm name: 10mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_10mmf name: 10mm Bullet (Flash) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_10mmhv name: 10mm Bullet (High-Velocity) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_10mml name: 10mm Bullet (L) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_10mmp name: 10mm Bullet (Practice) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_10mmr name: 10mm Bullet (Rubber) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml index 3d2172cbfc..1faf5bb8e7 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml @@ -2,9 +2,9 @@ id: pellet_12g name: 12g Pellet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 damages: - Brute: 10 \ No newline at end of file + Brute: 10 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml index 73a4d15034..4dd3e89acf 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml @@ -2,9 +2,9 @@ id: bullet_20mm name: 20mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 damages: - Brute: 10 \ No newline at end of file + Brute: 10 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml index 27ce860395..56a78855b9 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_24mm name: 24mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_24mmf name: 24mm Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_24mmhv name: 24mm Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 27 @@ -35,7 +35,7 @@ id: bullet_24mml name: 24mm Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_24mmp name: 24mm Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_24mmr name: 24mm Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/ammunition.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/ammunition.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/45mm/ammunition.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/boxes.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/boxes.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/45mm/boxes.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml similarity index 77% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/projectiles.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml index 6fdc3e21d3..063bc93049 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_45mm name: .45mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_45mmf name: .45mm Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_45mmhv name: .45mm Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_45mml name: .45mm Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_45mmp name: .45mm Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_45mmr name: .45mm Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml index 2f86125130..40570dbb26 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_556mm name: 5.56mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_556mmf name: 5.56mm Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_556mmhv name: 5.56mm Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_556mml name: 5.56mm Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_556mmp name: 5.56mm Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_556mmr name: 5.56mm Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml index 06e0f3b781..2cf342d083 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_65mm name: 6.5mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_65mmf name: 6.5mm Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_65mmhv name: 6.5mm Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_65mml name: 6.5mm Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_65mmp name: 6.5mm Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_65mmr name: 6.5mm Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml index f31376d364..ac9b8d6438 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_762mm name: 7.62mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_762mmf name: 7.62mm Bullet (Flash) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_762mmhv name: 7.62mm Bullet (High-Velocity) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_762mml name: 7.62mm Bullet (L) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_762mmp name: 7.62mm Bullet (Practice) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_762mmr name: 7.62mm Bullet (Rubber) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml index 21446d1819..5e31b0c78c 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_9mm name: 9mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_9mmf name: 9mm Bullet (Flash) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_9mmhv name: 9mm Bullet (High-Velocity) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_9mml name: 9mm Bullet (L) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_9mmp name: 9mm Bullet (Practice) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_9mmr name: 9mm Bullet (Rubber) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.32/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/ammunition.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.32/ammunition.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point32/ammunition.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.32/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/boxes.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.32/boxes.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point32/boxes.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.32/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml similarity index 77% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.32/projectiles.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml index 52a78851ed..a33b869e8f 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.32/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_32 name: .32 Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_32f name: .32 Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_32hv name: .32 Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_32l name: .32 Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_32p name: .32 Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_32r name: .32 Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.357/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/ammunition.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.357/ammunition.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point357/ammunition.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.357/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/boxes.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.357/boxes.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point357/boxes.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.357/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml similarity index 77% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.357/projectiles.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml index ba346205df..30b6b8cc51 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.357/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_357 name: .357 Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_357f name: .357 Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_357hv name: .357 Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_357l name: .357 Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_357p name: .357 Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_357r name: .357 Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.44/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/ammunition.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.44/ammunition.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point44/ammunition.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.44/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/boxes.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.44/boxes.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point44/boxes.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.44/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml similarity index 77% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.44/projectiles.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml index 38ae4f742a..8af1cc8f82 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.44/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_44 name: .44 Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_44f name: .44 Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_44hv name: .44 Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_44l name: .44 Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_44p name: .44 Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_44r name: .44 Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/ammunition.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point50/ammunition.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/boxes.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.50/boxes.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point50/boxes.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml similarity index 77% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.50/projectiles.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml index e89e1e1d2b..bb5b0fb55e 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_50 name: .50 cal Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_50f name: .50 cal Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_50hv name: .50 cal Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_50l name: .50 cal Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_50p name: .50 cal Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_50r name: .50 cal Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml index 95aaae6364..78e354f747 100644 --- a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml @@ -2,9 +2,10 @@ - type: entity id: bullet_base name: bullet_base - description: If you can see this you're dead! + description: If you can see this you're probably dead! abstract: true components: + - type: Clickable - type: Sprite directional: false texture: Objects/Projectiles/bullet.png @@ -34,7 +35,6 @@ id: bullet_basef name: Base Bullet Flash parent: bullet_base - description: If you can see this you're dead! abstract: true components: - type: Projectile @@ -46,7 +46,6 @@ id: bullet_basehv name: Base Bullet High-Velocity parent: bullet_base - description: If you can see this you're dead! abstract: true components: - type: Projectile @@ -58,7 +57,6 @@ id: bullet_basel name: Base Bullet L parent: bullet_base - description: If you can see this you're dead! abstract: true components: - type: Projectile @@ -70,7 +68,6 @@ id: bullet_basep name: Base Bullet Practice parent: bullet_base - description: If you can see this you're dead! abstract: true components: - type: Projectile @@ -82,7 +79,6 @@ id: bullet_baser name: Base Bullet Rubber parent: bullet_base - description: If you can see this you're dead! abstract: true components: - type: Projectile