cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

useless bullet removal

Browse Source
This commit is contained in:
Fox-McCloud
2017-07-01 20:38:58 -04:00
parent e1cc7e1431
commit 666fff6e4a
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/ammo_casings.dm
+2 -2
View File
@@ -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)
code/modules/projectiles/projectile/bullets.dm
+1 -4
View File
@@ -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)