Merge pull request #1080 from tigercat2000/WHYDOTHESEKEEPSWITCHING

FIX: Attack logs being backwards
This commit is contained in:
ZomgPonies
2015-05-16 07:52:33 -04:00
9 changed files with 15 additions and 15 deletions
+1 -1
View File
@@ -422,7 +422,7 @@
playsound(src,'sound/weapons/resonator_blast.ogg',50,1)
if(creator)
for(var/mob/living/L in src.loc)
add_logs(creator, L, "used a resonator field on", object="resonator")
add_logs(L, creator, "used a resonator field on", object="resonator")
L << "<span class='danger'>The [src.name] ruptured with you in it!</span>"
L.adjustBruteLoss(resonance_damage)
else
@@ -151,7 +151,7 @@
"<span class='userdanger'>[M] [M.attacktext] [src]!</span>")
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
adjustBruteLoss(damage)
add_logs(M, src, "attacked", admin=0)
add_logs(src, M, "attacked", admin=0)
updatehealth()
+1 -1
View File
@@ -362,7 +362,7 @@
user << "<span class='notice'>You already grabbed [src].</span>"
return
add_logs(user, src, "grabbed", addition="passively")
add_logs(src, user, "grabbed", addition="passively")
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src)
if(buckled)