From cdfe97d9c7e60cb989da511f89f8c981ab38459c Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 9 Jun 2017 14:01:36 -0400 Subject: [PATCH] Don't let people skip NIF install time with cryo Tsk tsk. --- code/modules/vore/persist/persist_vr.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/persist/persist_vr.dm b/code/modules/vore/persist/persist_vr.dm index eb124f58f6..581f165d01 100644 --- a/code/modules/vore/persist/persist_vr.dm +++ b/code/modules/vore/persist/persist_vr.dm @@ -230,7 +230,11 @@ var/obj/item/device/nif/nif = H.nif - if(nif) + //If they have one, and if it's not installing without an owner, because + //Someone who joins and immediately leaves again (wrong job choice, maybe) + //should keep it even though it was probably doing the quick-calibrate, and their + //owner will have been pre-set during the constructor. + if(nif && !(nif.stat == NIF_INSTALLING && !nif.owner)) prefs.nif_path = nif.type prefs.nif_durability = nif.durability prefs.nif_savedata = nif.save_data.Copy()