diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 3b808c64d53..be46baf1c1b 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -27,7 +27,7 @@ desc = "A .38 bullet casing." caliber = "38" icon_state = "r-casing" - projectile_type = /obj/item/projectile/bullet/weakbullet2/rubber + projectile_type = /obj/item/projectile/bullet/weakbullet2 /obj/item/ammo_casing/c10mm desc = "A 10mm bullet casing." @@ -144,7 +144,7 @@ name = "beanbag slug" desc = "A weak beanbag slug for riot control." icon_state = "bshell" - projectile_type = /obj/item/projectile/bullet/weakbullet/rubber + projectile_type = /obj/item/projectile/bullet/weakbullet materials = list(MAT_METAL=250) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 41ee674bc01..88150cc5371 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -11,8 +11,6 @@ damage = 5 stamina = 80 -/obj/item/projectile/bullet/weakbullet/rubber //beanbag that shells that don't embed - /obj/item/projectile/bullet/weakbullet/booze /obj/item/projectile/bullet/weakbullet/booze/on_hit(atom/target, blocked = 0) @@ -39,8 +37,6 @@ stamina = 60 icon_state = "bullet-r" -/obj/item/projectile/bullet/weakbullet2/rubber //detective's bullets that don't embed - /obj/item/projectile/bullet/weakbullet3 damage = 20 @@ -269,6 +265,7 @@ icon_state = "syringeproj" /obj/item/projectile/bullet/dart/syringe/tranquilizer + /obj/item/projectile/bullet/dart/syringe/tranquilizer/New() ..() reagents.add_reagent("haloperidol", 15)