From 7a828f7cd0a5bf1f4e5aac614c2136ceb09e83c5 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 15 May 2018 11:52:38 +0300 Subject: [PATCH] removed SC self backup and added a null --- code/modules/nifsoft/software/13_soulcatcher.dm | 2 -- code/modules/resleeving/machines.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index f85e2ed0a3..4399a31f3a 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -462,8 +462,6 @@ if(istype(HP) && HP.nif && HP.nif.flag_check(NIF_O_SCOTHERS,NIF_FLAGS_OTHER)) var/datum/nifsoft/soulcatcher/SC = HP.nif.imp_check(NIF_SOULCATCHER) SC.catch_mob(H) - else if(H.nif && H.nif.flag_check(NIF_SC_BACKUPS)) - SStranscore.m_backup(H,0) //If dying inside a pred who lacks SC, let ours do a backup if enabled before it's gone for good. else if(H.nif && H.nif.flag_check(NIF_O_SCMYSELF,NIF_FLAGS_OTHER)) //They are caught in their own NIF var/datum/nifsoft/soulcatcher/SC = H.nif.imp_check(NIF_SOULCATCHER) SC.catch_mob(H) diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 8554a1d6ce..4cb6793734 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -526,7 +526,7 @@ //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,,MR.nif_savedata) + 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) nif.durability = MR.nif_durability //Restore backed up durability after restoring the softs.