cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3647 from SkyMarshal/patch-2

Browse Source 
ZAS fix, Stops lasertag guns from killing you if you shoot it into your mouth.
This commit is contained in:
Chinsky
2013-09-04 07:20:15 -07:00
parent b0d7a95189 99bf9db04c
commit cafa176548
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ZAS/Connection.dm
+2 -3
View File
@@ -104,8 +104,7 @@ Indirect connections will not merge the two zones after they reach equilibrium.
//Disconnect zones while handling unusual conditions.
// e.g. loss of a zone on a turf
if(A && A.zone && B && B.zone)
DisconnectZones(A.zone, B.zone)
DisconnectZones(zone_A, zone_B)
//Finally, preform actual deletion.
. = ..()
@@ -400,4 +399,4 @@ Indirect connections will not merge the two zones after they reach equilibrium.
#undef CONNECTION_DIRECT
#undef CONNECTION_INDIRECT
#undef CONNECTION_CLOSED
#undef CONNECTION_CLOSED
code/modules/projectiles/gun.dm
+2 -2
View File
@@ -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'