cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace

Browse Source 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
This commit is contained in:
Markolie
2015-08-18 18:38:59 +02:00
parent c10b62959b 577df08d6b
commit 8bede1db99
246 changed files with 2655 additions and 2105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/robot/robot_items.dm
+3 -3
View File
@@ -10,10 +10,10 @@
icon_state = "shock"
attack(mob/M as mob, mob/living/silicon/robot/user as mob)
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [key_name(user)]</font>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [key_name(M)]</font>")
if(M.ckey)
msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] used the [src.name] to attack [M.name] ([M.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
msg_admin_attack("[key_name_admin(user)] used the [src.name] to attack [key_name_admin(M)]")
if(!iscarbon(user))
M.LAssailant = null