cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3975 from Ccomp5950/lasertag_suicide

Browse Source 
Can no longer commit suicide with a lasertag gun.
This commit is contained in:
Zuhayr
2013-11-25 03:19:05 -08:00
parent 950836c05b e562119d21
commit 8b5664f321
2 changed files with 1022 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/projectiles/gun.dm
View File

@@ -186,6 +186,11 @@
playsound(user, fire_sound, 10, 1)
else
playsound(user, fire_sound, 50, 1)
if(istype(in_chamber, /obj/item/projectile/beam/lastertag))
user.show_message("<span class = 'warning'>You feel rather silly, trying to commit suicide with a toy.</span>")
mouthshoot = 0
return
in_chamber.on_hit(M)
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]")