Merge pull request #7926 from MistakeNot4892/beepboop

Properly cleared ORGAN_CUT_AWAY for prosthetics.
This commit is contained in:
Schnayy
2021-02-26 09:09:56 -06:00
committed by GitHub
2 changed files with 12 additions and 0 deletions
@@ -154,7 +154,12 @@
last_special = world.time
drop_from_inventory(E)
E.replaced(src)
// Reconnect the organ and children as normally this is done with surgery.
E.status &= ~ORGAN_CUT_AWAY
for(var/obj/item/organ/external/child in E.children)
child.status &= ~ORGAN_CUT_AWAY
var/datum/gender/G = gender_datums[gender]
visible_message(
SPAN_NOTICE("\The [src] attaches \the [E] to [G.his] body!"),
+7
View File
@@ -59,6 +59,13 @@
"<span class='notice'>You have attached [target]'s [E.name] to the [E.amputation_point].</span>")
user.drop_from_inventory(E)
E.replaced(target)
// Modular bodyparts (like prosthetics) do not need to be reconnected.
if(E.get_modular_limb_category() != MODULAR_BODYPART_INVALID)
E.status &= ~ORGAN_CUT_AWAY
for(var/obj/item/organ/external/child in E.children)
child.status &= ~ORGAN_CUT_AWAY
target.update_icons_body(FALSE)
target.updatehealth()
target.UpdateDamageIcon()