cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-12 08:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes and tweaks to the previous.

Browse Source
This commit is contained in:
Zuhayr
2014-12-23 18:48:10 +10:30
parent bbfc6db0a3
commit cc00fa3d52
26 changed files with 187 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_objects.dm
+2 -2
View File
@@ -153,10 +153,10 @@
/obj/item/organ/proc/removed(var/mob/living/target,var/mob/living/user)
if(!target || !user)
if(!target)
return
if(organ_data.vital)
if(target && user && organ_data.vital)
user.attack_log += "\[[time_stamp()]\]<font color='red'> removed a vital organ ([src]) from [target.name] ([target.ckey]) (INTENT: [uppertext(user.a_intent)])</font>"
target.attack_log += "\[[time_stamp()]\]<font color='orange'> had a vital organ ([src]) removed by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])</font>"
msg_admin_attack("[user.name] ([user.ckey]) removed a vital organ ([src]) from [target.name] ([target.ckey]) (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")