From d706e52c5ba12eff12e6eca9c6189b2f94f2e5ef Mon Sep 17 00:00:00 2001 From: 81Denton <32391752+81Denton@users.noreply.github.com> Date: Thu, 14 Jun 2018 23:12:08 +0200 Subject: [PATCH] Reverts #36364 (#38469) --- 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, 1 insertion(+), 10 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index edf601515a6..df664164648 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -138,7 +138,7 @@ name = "Syndicate Stormtrooper" maxHealth = 200 health = 200 - casingtype = /obj/item/ammo_casing/shotgun/tengauge + casingtype = /obj/item/ammo_casing/shotgun/buckshot projectilesound = 'sound/weapons/gunshot.ogg' loot = list(/obj/effect/gibspawner/human) diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index de0d03da3b0..b700d092d7f 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -7,11 +7,6 @@ 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 41a819dd164..457ec78e9bc 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -2,10 +2,6 @@ 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" damage = 5