Merge pull request #740 from Datraen/YOOFix

Fixes #685.
This commit is contained in:
EmperorJon
2016-01-08 17:06:13 +00:00
2 changed files with 11 additions and 1 deletions
+7 -1
View File
@@ -988,7 +988,13 @@ mob/proc/yank_out_object()
if (ishuman(U))
var/mob/living/carbon/human/human_user = U
human_user.bloody_hands(H)
else if(issilicon(src))
var/mob/living/silicon/robot/R = src
R.embedded -= selection
R.adjustBruteLoss(5)
R.adjustFireLoss(10)
selection.forceMove(get_turf(src))
if(!(U.l_hand && U.r_hand))
U.put_in_hands(selection)
+4
View File
@@ -0,0 +1,4 @@
author: Datraen
delete-after: True
changes:
- bugfix: "Objects can now be yanked out of synthetics."