From 995a877eaf2b78f0482dbf6f8c099287c74a6106 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Mon, 29 Nov 2021 16:54:02 +1000
Subject: [PATCH] Fixes certain aspects of NIFSofts not applying properly on
 resleeve

---
 .../{machines_vr.dm => machine_subtypes.dm}   | 22 +++++++++----------
 code/modules/resleeving/machines.dm           |  7 +++---
 vorestation.dme                               |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)
 rename code/modules/resleeving/{machines_vr.dm => machine_subtypes.dm} (91%)

diff --git a/code/modules/resleeving/machines_vr.dm b/code/modules/resleeving/machine_subtypes.dm
similarity index 91%
rename from code/modules/resleeving/machines_vr.dm
rename to code/modules/resleeving/machine_subtypes.dm
index b9f7c81aa6d..405bcef1416 100644
--- a/code/modules/resleeving/machines_vr.dm
+++ b/code/modules/resleeving/machine_subtypes.dm
@@ -1,12 +1,12 @@
-/obj/machinery/transhuman/resleever/abductor
-	icon = 'icons/obj/abductor_vr.dmi'
-	icon_state = "implantchair"
-
-/obj/machinery/computer/transhuman/resleeving/abductor
-	icon = 'icons/obj/abductor.dmi'
-	icon_state = "console"
-
-/obj/machinery/clonepod/transhuman/full/abductor
-	icon = 'icons/obj/abductor_vr.dmi'
-	icon_state = "pod_0"
+/obj/machinery/transhuman/resleever/abductor
+	icon = 'icons/obj/abductor_vr.dmi'
+	icon_state = "implantchair"
+
+/obj/machinery/computer/transhuman/resleeving/abductor
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "console"
+
+/obj/machinery/clonepod/transhuman/full/abductor
+	icon = 'icons/obj/abductor_vr.dmi'
+	icon_state = "pod_0"
 	name = "clonepod"
\ No newline at end of file
diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm
index adee6e4b0f1..bb17833e351 100644
--- a/code/modules/resleeving/machines.dm
+++ b/code/modules/resleeving/machines.dm
@@ -589,8 +589,9 @@
 	//Re-supply a NIF if one was backed up with them.
 	if(MR.nif_path)
 		var/obj/item/device/nif/nif = new MR.nif_path(occupant,null,MR.nif_savedata)
-		for(var/path in MR.nif_software)
-			new path(nif)
+		spawn(0)			//Delay to not install software before NIF is fully installed
+			for(var/path in MR.nif_software)
+				new path(nif)
 		nif.durability = MR.nif_durability //Restore backed up durability after restoring the softs.
 
 	// If it was a custom sleeve (not owned by anyone), update namification sequences
@@ -612,7 +613,7 @@
 
 	occupant.confused = max(occupant.confused, confuse_amount)									// Apply immedeate effects
 	occupant.eye_blurry = max(occupant.eye_blurry, blur_amount)
-	
+
 	// Vore deaths get a fake modifier labeled as such
 	if(!occupant.mind)
 		log_debug("[occupant] didn't have a mind to check for vore_death, which may be problematic.")
diff --git a/vorestation.dme b/vorestation.dme
index c8d5ee67faf..a0320b88566 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3715,8 +3715,8 @@
 #include "code\modules\resleeving\infocore_records.dm"
 #include "code\modules\resleeving\infomorph.dm"
 #include "code\modules\resleeving\infomorph_software.dm"
+#include "code\modules\resleeving\machine_subtypes.dm"
 #include "code\modules\resleeving\machines.dm"
-#include "code\modules\resleeving\machines_vr.dm"
 #include "code\modules\resleeving\resleeving_sickness.dm"
 #include "code\modules\resleeving\sleevecard.dm"
 #include "code\modules\rogueminer_vr\asteroid.dm"