mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 15:01:04 +01:00
Merge pull request #3647 from SkyMarshal/patch-2
ZAS fix, Stops lasertag guns from killing you if you shoot it into your mouth.
This commit is contained in:
@@ -187,7 +187,7 @@
|
||||
else
|
||||
playsound(user, fire_sound, 50, 1)
|
||||
in_chamber.on_hit(M)
|
||||
if (!in_chamber.nodamage)
|
||||
if (in_chamber.damage_type != HALLOSS)
|
||||
user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]")
|
||||
user.death()
|
||||
else
|
||||
@@ -212,4 +212,4 @@
|
||||
Fire(M,user) ///Otherwise, shoot!
|
||||
return
|
||||
else
|
||||
return ..() //Pistolwhippin'
|
||||
return ..() //Pistolwhippin'
|
||||
|
||||
Reference in New Issue
Block a user