From 73d35bcd4f0e7d9bdc7851f2ffc6f57b93095391 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 14 Jun 2013 13:17:21 -0700 Subject: [PATCH] Minor changes/sanity checks in yank-out verb. --- code/modules/mob/living/carbon/human/human.dm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d0dd7f8e388..ff3b6508ce6 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1113,9 +1113,9 @@ del(feet_blood_DNA) return 1 -mob/living/carbon/human/verb/yank_out_object_test() +mob/living/carbon/human/verb/yank_out_object() set category = "IC" - set name = "Yank out object (test)" + set name = "Yank out object" set desc = "Remove an embedded item at the cost of bleeding and pain." set src in view(1) @@ -1154,7 +1154,10 @@ mob/living/carbon/human/verb/yank_out_object_test() src << "You attempt to get a good grip on the [selection] in your [affected] with bloody fingers." bloody_hands(S) - spawn(80) + do_after(80) + if(!selection || !affected || !S || !U) + return + visible_message("[src] rips [selection] out of their [affected] in a welter of blood.","You rip [selection] out of your [affected] in a welter of blood.") selection.loc = get_turf(src) affected.implants -= selection @@ -1188,7 +1191,10 @@ mob/living/carbon/human/verb/yank_out_object_test() U << "You attempt to get a good grip on the [selection] in [S]'s [affected] with bloody fingers." U.bloody_hands(S) - spawn(80) + do_after(80) + if(!selection || !affected || !S || !U) + return + visible_message("[usr] rips [selection] out of [src]'s [affected] in a welter of blood.","[src] rips [selection] out of your [affected] in a welter of blood.") selection.loc = get_turf(usr) affected.implants -= selection