From e3a32dfe75559989ae94214131f1a8b8dc520fbe Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sun, 4 Dec 2022 06:13:29 +1000 Subject: [PATCH 1/2] Fixes MMIs to restore vision --- code/modules/mob/living/carbon/brain/MMI.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 47983699fd..7c4203e9d4 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -66,7 +66,11 @@ brainmob.loc = src brainmob.container = src brainmob.set_stat(CONSCIOUS) +<<<<<<< HEAD brainmob.blinded = 0 //CHOMPedit earlyport, gives MMIs proper vision again +======= + brainmob.blinded = 0 //VOREedit Fixes MMIs vision +>>>>>>> daa6905a5b... Merge pull request #14159 from tacoguy7765093/brain_blast dead_mob_list -= brainmob//Update dem lists living_mob_list += brainmob From d3311952683463a6e60dbecfac11b94f03b1ea38 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 3 Dec 2022 21:13:15 -0500 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/mob/living/carbon/brain/MMI.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 7c4203e9d4..4fae70e57d 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -66,11 +66,7 @@ brainmob.loc = src brainmob.container = src brainmob.set_stat(CONSCIOUS) -<<<<<<< HEAD - brainmob.blinded = 0 //CHOMPedit earlyport, gives MMIs proper vision again -======= brainmob.blinded = 0 //VOREedit Fixes MMIs vision ->>>>>>> daa6905a5b... Merge pull request #14159 from tacoguy7765093/brain_blast dead_mob_list -= brainmob//Update dem lists living_mob_list += brainmob @@ -354,4 +350,4 @@ icon = 'icons/obj/module.dmi' icon_state = "mainboard" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2, TECH_BLUESPACE = 2, TECH_DATA = 3) \ No newline at end of file + origin_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2, TECH_BLUESPACE = 2, TECH_DATA = 3)