Merge remote-tracking branch 'upstream/master' into botany-rework

This commit is contained in:
Fox-McCloud
2017-01-23 01:01:09 -05:00
102 changed files with 366 additions and 260 deletions
+1 -1
View File
@@ -221,7 +221,7 @@ proc/wabbajack(mob/living/M)
else
return
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>[M.real_name] ([M.ckey]) became [new_mob.real_name].</font>")
M.create_attack_log("<font color='orange'>[M.real_name] ([M.ckey]) became [new_mob.real_name].</font>")
new_mob.attack_log = M.attack_log
new_mob.a_intent = I_HARM