Bug fixes

This commit is contained in:
ZomgPonies
2013-11-24 11:23:54 -05:00
parent 227f4a1bc0
commit 19596fa6fd
2 changed files with 20 additions and 1 deletions
+16 -1
View File
@@ -1538,4 +1538,19 @@ Standard way to write links -Sayu
if(covered_locations & FOOT_RIGHT)
return 0
return 1
return 1
proc/check_target_facings(mob/living/initator, mob/living/target)
/*This can be used to add additional effects on interactions between mobs depending on how the mobs are facing each other, such as adding a crit damage to blows to the back of a guy's head.
Given how click code currently works (Nov '13), the initiating mob will be facing the target mob most of the time
That said, this proc should not be used if the change facing proc of the click code is overriden at the same time*/
if(!!isliving(target) || target.lying || istype(target, /mob/living/silicon/pai))
//Make sure we are not doing this for things that can't have a logical direction to the players given that the target would be on their side
return
if(initator.dir == target.dir) //mobs are facing the same direction
return 1
if(initator.dir + 4 == target.dir || initator.dir - 4 == target.dir) //mobs are facing each other
return 2
if(initator.dir + 2 == target.dir || initator.dir - 2 == target.dir || initator.dir + 6 == target.dir || initator.dir - 6 == target.dir) //Initating mob is looking at the target, while the target mob is looking in a direction perpendicular to the 1st
return 3
+4
View File
@@ -193,6 +193,10 @@
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.nodamage)
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]")