Merge pull request #5986 from Citadel-Station-13/upstream-merge-36364

[MIRROR] Changes stormtrooper ammo to 10g slugs
2018-03-17 23:54:33 +00:00
parent d2926f3ba9 e6ae312d9e
commit a9f8c70d62
3 changed files with 10 additions and 1 deletions
@@ -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////////////
@@ -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"
@@ -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"