From af68a3ae89834f431c1f66eea4da97fb6e81ba1b Mon Sep 17 00:00:00 2001 From: Sparky Date: Fri, 12 May 2023 19:21:29 +0100 Subject: [PATCH] Assisted organ fix (#16315) * Assisted Organ Fix Fixes assisted organs being turned into mechanical variants. i.e. Currently choosing an assisted heart gives you an assisted circulatory pump, not a pacemaker. * This should probably use the define. * copy-paste error --- code/modules/organs/organ.dm | 14 +++++++++----- html/changelogs/assistedorganfix.yml | 6 ++++++ 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/assistedorganfix.yml diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 06f8c6777e7..384334c7390 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -360,12 +360,16 @@ name = robotic_name /obj/item/organ/proc/mechassist() //Used to add things like pacemakers, etc - robotize() status = ORGAN_ASSISTED - robotic = 1 - if(!robotize_type) - name = initial(name) - icon_state = initial(icon_state) + robotic = ROBOTIC_ASSISTED + switch(organ_tag) + if(BP_HEART) + name = "pacemaker-assisted [initial(name)]" + if(BP_EYES) + name = "retinal overlayed [initial(name)]" + else + name = "mechanically assisted [initial(name)]" + icon_state = initial(icon_state) /obj/item/organ/emp_act(var/severity) if(!(status & ORGAN_ASSISTED)) diff --git a/html/changelogs/assistedorganfix.yml b/html/changelogs/assistedorganfix.yml new file mode 100644 index 00000000000..279e7256ef1 --- /dev/null +++ b/html/changelogs/assistedorganfix.yml @@ -0,0 +1,6 @@ +author: Sparky_hotdog + +delete-after: True + +changes: + - bugfix: "Fixes assisted organs being turned into mechanical variants."