From f82456fd7ff6e42c1ef5912cdc675d7270d52bb7 Mon Sep 17 00:00:00 2001 From: 81Denton <32391752+81Denton@users.noreply.github.com> Date: Sat, 17 Mar 2018 14:46:32 +0100 Subject: [PATCH 1/2] Changes stormtrooper ammo to 10g slugs (#36364) * pulse slug instead of buckshot * 10 gauge baby * 10g name --- code/modules/mob/living/simple_animal/hostile/syndicate.dm | 2 +- code/modules/projectiles/ammunition/ballistic/shotgun.dm | 5 +++++ code/modules/projectiles/projectile/bullets/shotgun.dm | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 38c0d38710..8cfc5784e9 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -137,8 +137,8 @@ name = "Syndicate Stormtrooper" maxHealth = 200 health = 200 + casingtype = /obj/item/ammo_casing/shotgun/tengauge projectilesound = 'sound/weapons/gunshot.ogg' - casingtype = /obj/item/ammo_casing/shotgun/buckshot loot = list(/obj/effect/gibspawner/human) ///////////////Misc//////////// diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index b700d092d7..de0d03da3b 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -7,6 +7,11 @@ caliber = "shotgun" projectile_type = /obj/item/projectile/bullet/shotgun_slug materials = list(MAT_METAL=4000) + +/obj/item/ammo_casing/shotgun/tengauge + name = "10g shotgun slug" + desc = "A 10 gauge lead slug." + projectile_type = /obj/item/projectile/bullet/shotgun_slug/tengauge /obj/item/ammo_casing/shotgun/beanbag name = "beanbag slug" diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index ecbe2e96e4..3d616bdd22 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -1,6 +1,10 @@ /obj/item/projectile/bullet/shotgun_slug name = "12g shotgun slug" damage = 60 + +/obj/item/projectile/bullet/shotgun_slug/tengauge + name = "10g shotgun slug" + damage = 72.5 /obj/item/projectile/bullet/shotgun_beanbag name = "beanbag slug"