From cbe118bc0bfe47cd3562b3a1f4f2671cab4fa8da Mon Sep 17 00:00:00 2001 From: suethecake Date: Sat, 27 Sep 2014 11:44:50 -0600 Subject: [PATCH] derp derp herp Wrong bullet + duplicate name. Fixed. --- code/modules/mob/new_player/sprite_accessories.dm | 2 +- code/modules/projectiles/ammunition/bullets.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 627a8512..4f6a1146 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -127,7 +127,7 @@ icon_state = "hair_ponytail4" ponytail5 - name = "Ponytail 4" + name = "Ponytail 5" icon_state = "hair_ponytail5" gender = FEMALE diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 78402e1f..3ce29735 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -29,7 +29,7 @@ /obj/item/ammo_casing/c38 desc = "A .38 bullet casing." caliber = "38" - projectile_type = "/obj/item/projectile/bullet/midbullet" + projectile_type = "/obj/item/projectile/bullet/midbullet2" /obj/item/ammo_casing/c9mm