From c1536879b2599e8afe7f4e08a106bdb89e7c9d33 Mon Sep 17 00:00:00 2001 From: Verkister Date: Wed, 5 Dec 2018 17:47:19 +0200 Subject: [PATCH] Fixes some implant related issues. -Fixes reagent implants being utterly bricked. -Fixes backup implants not showing up in AR huds. -Both issues were caused by implants now going way deeper into the bodyparts than before. --- .../weapons/implants/implantreagent_vr.dm | 9 +++++---- .../mob/living/carbon/human/life_vr.dm | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implantreagent_vr.dm b/code/game/objects/items/weapons/implants/implantreagent_vr.dm index 83a586d2ba1..0b227d95391 100644 --- a/code/game/objects/items/weapons/implants/implantreagent_vr.dm +++ b/code/game/objects/items/weapons/implants/implantreagent_vr.dm @@ -82,10 +82,11 @@ var/obj/item/weapon/implant/reagent_generator/rimplant - for(var/I in src.contents) - if(istype(I, /obj/item/weapon/implant/reagent_generator)) - rimplant = I - break + for(var/obj/item/organ/external/E in organs) + for(var/obj/item/weapon/implant/I in E.implants) + if(istype(I, /obj/item/weapon/implant/reagent_generator)) + rimplant = I + break if(rimplant) if(container.reagents.total_volume < container.volume) var/container_name = container.name diff --git a/code/modules/mob/living/carbon/human/life_vr.dm b/code/modules/mob/living/carbon/human/life_vr.dm index 1dc37ff8cc1..dc340058a0c 100644 --- a/code/modules/mob/living/carbon/human/life_vr.dm +++ b/code/modules/mob/living/carbon/human/life_vr.dm @@ -28,15 +28,16 @@ holder.icon_state = "hudblank" - for(var/obj/item/weapon/implant/I in src) - if(I.implanted) - if(istype(I,/obj/item/weapon/implant/backup)) - if(!mind) - holder.icon_state = "hud_backup_nomind" - else if(!(mind.name in SStranscore.body_scans)) - holder.icon_state = "hud_backup_nobody" - else - holder.icon_state = "hud_backup_norm" + for(var/obj/item/organ/external/E in organs) + for(var/obj/item/weapon/implant/I in E.implants) + if(I.implanted) + if(istype(I,/obj/item/weapon/implant/backup)) + if(!mind) + holder.icon_state = "hud_backup_nomind" + else if(!(mind.name in SStranscore.body_scans)) + holder.icon_state = "hud_backup_nobody" + else + holder.icon_state = "hud_backup_norm" apply_hud(BACKUP_HUD, holder)