mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 04:22:39 +01:00
Rubber and Beanbag rounds rebalancing (#868)
tweak: "Lethal damage of rubber bullets and beanbag shells reduced. They will be far less likely to cause broken bones and internal damage now." tweak: "Halloss (Pain) from rubber and beanbag rounds is now blocked by armour."
This commit is contained in:
@@ -78,6 +78,11 @@
|
||||
if(!isliving(target)) return 0
|
||||
if(isanimal(target)) return 0
|
||||
var/mob/living/L = target
|
||||
if (agony && ishuman(target))
|
||||
var/mob/living/carbon/human/H = target
|
||||
var/obj/item/organ/external/organ = H.get_organ(def_zone)
|
||||
var/armor = H.getarmor_organ(organ, check_armour)
|
||||
agony = max(0, agony - armor)
|
||||
L.apply_effects(stun, weaken, paralyze, irradiate, stutter, eyeblur, drowsy, agony, incinerate, blocked) // add in AGONY!
|
||||
return 1
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
muzzle_type = /obj/effect/projectile/bullet/muzzle
|
||||
|
||||
/obj/item/projectile/bullet/on_hit(var/atom/target, var/blocked = 0)
|
||||
if (..(target, blocked))
|
||||
/obj/item/projectile/bullet/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null)
|
||||
if (..(target, blocked, def_zone))
|
||||
var/mob/living/L = target
|
||||
shake_camera(L, 3, 2)
|
||||
|
||||
@@ -111,7 +111,7 @@
|
||||
/obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
|
||||
name = "rubber bullet"
|
||||
check_armour = "melee"
|
||||
damage = 10
|
||||
damage = 5
|
||||
agony = 40
|
||||
embed = 0
|
||||
sharp = 0
|
||||
@@ -125,7 +125,7 @@
|
||||
/obj/item/projectile/bullet/shotgun/beanbag //because beanbags are not bullets
|
||||
name = "beanbag"
|
||||
check_armour = "melee"
|
||||
damage = 20
|
||||
damage = 10
|
||||
agony = 60
|
||||
embed = 0
|
||||
sharp = 0
|
||||
|
||||
Reference in New Issue
Block a user