Merge pull request #6568 from Citadel-Station-13/upstream-merge-37506

[MIRROR] Makes pacifists able to use .50BMG Soporific Rounds
2018-04-29 22:29:12 +00:00
parent c8fbc20f24 d65abac646
commit a966874bed
2 changed files with 2 additions and 1 deletions
@@ -12,6 +12,7 @@
 	desc = "A .50 bullet casing, specialised in sending the target to sleep, instead of hell."
 	projectile_type = /obj/item/projectile/bullet/p50/soporific
 	icon_state = "sleeper"
+	harmful = FALSE

 /obj/item/ammo_casing/p50/penetrator
 	name = ".50 penetrator round bullet casing"
@@ -18,7 +18,7 @@
 /obj/item/projectile/bullet/p50/soporific
 	name =".50 soporific bullet"
 	armour_penetration = 0
-	nodamage = TRUE
+	damage = 0
 	dismemberment = 0
 	knockdown = 0
 	breakthings = FALSE