From 90b1e14841632235d47f941be4b1f780a261a312 Mon Sep 17 00:00:00 2001 From: Datraen Date: Thu, 7 Jan 2016 21:30:33 -0500 Subject: [PATCH] Fixes #685. --- code/modules/mob/mob.dm | 8 +++++++- html/changelogs/Datraen-YankFix.yml | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Datraen-YankFix.yml diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 6facb98164..2b64078149 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -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) diff --git a/html/changelogs/Datraen-YankFix.yml b/html/changelogs/Datraen-YankFix.yml new file mode 100644 index 0000000000..8118e6832b --- /dev/null +++ b/html/changelogs/Datraen-YankFix.yml @@ -0,0 +1,4 @@ +author: Datraen +delete-after: True +changes: + - bugfix: "Objects can now be yanked out of synthetics."