Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/human_defense.dm
This commit is contained in:
Zuhayr
2014-01-30 22:06:57 +10:30
committed by ZomgPonies
parent 56e71df462
commit 6302573ed3
3 changed files with 3 additions and 14 deletions
+1
View File
@@ -1166,6 +1166,7 @@ mob/proc/yank_out_object()
visible_message("<span class='warning'><b>[src] rips [selection] out of their body.</b></span>","<span class='warning'><b>You rip [selection] out of your body.</b></span>")
else
visible_message("<span class='warning'><b>[usr] rips [selection] out of [src]'s body.</b></span>","<span class='warning'><b>[usr] rips [selection] out of your body.</b></span>")
src.verbs -= /mob/proc/yank_out_object
if(istype(src,/mob/living/carbon/human))