cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-18 03:36:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] fixes mmi holders making 2 brainmobs on re-inserton of MMIs in FBPs (#9715)

Browse Source 
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-28 06:43:50 -07:00
committed by GitHub
parent 0db64193af
commit 22fa8b2572
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/subtypes/machine.dm
+5 -2
View File
@@ -46,12 +46,15 @@
stored_mmi = null
return ..()
/obj/item/organ/internal/mmi_holder/New(var/mob/living/carbon/human/new_owner, var/internal)
/obj/item/organ/internal/mmi_holder/New(var/mob/living/carbon/human/new_owner, var/internal, var/obj/item/mmi/installed)
..(new_owner, internal)
var/mob/living/carbon/human/dummy/mannequin/M = new_owner
if(istype(M))
return
stored_mmi = new brain_type(src)
if(installed)
stored_mmi = installed
else
stored_mmi = new brain_type(src)
sleep(-1)
update_from_mmi()
code/modules/surgery/robotics.dm
+7 -9
View File
@@ -526,20 +526,18 @@
var/obj/item/mmi/M = tool
// VOREstation edit begin - Select the proper mmi holder subtype based on the brain inserted
var/obj/item/organ/internal/mmi_holder/holder = null
user.drop_from_inventory(M)
M.loc = holder
if(istype(M,/obj/item/mmi/digital/posibrain/nano))
holder = new /obj/item/organ/internal/mmi_holder/posibrain/nano(target, 1)
holder = new /obj/item/organ/internal/mmi_holder/posibrain/nano(target, 1, M)
else if(istype(M,/obj/item/mmi/digital/posibrain))
holder = new /obj/item/organ/internal/mmi_holder/posibrain(target, 1)
holder = new /obj/item/organ/internal/mmi_holder/posibrain(target, 1, M)
else if(istype(M,/obj/item/mmi/digital/robot))
holder = new /obj/item/organ/internal/mmi_holder/robot(target, 1)
holder = new /obj/item/organ/internal/mmi_holder/robot(target, 1, M)
else
holder = new /obj/item/organ/internal/mmi_holder(target, 1) // Fallback to old behavior if organic MMI or if no subtype exists.
//VOREstation edit end
holder = new /obj/item/organ/internal/mmi_holder(target, 1, M) // Fallback to old behavior if organic MMI or if no subtype exists.
//VOREstation edit end
target.internal_organs_by_name["brain"] = holder
user.drop_from_inventory(tool)
tool.loc = holder
holder.stored_mmi = tool
holder.update_from_mmi()
if(M.brainmob && M.brainmob.mind)
M.brainmob.mind.transfer_to(target)