Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/client/preference_setup/loadout/loadout_suit_vr.dm

@@ -110,3 +110,7 @@ Talon winter coat
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
 
 
+/datum/gear/suit/armor/combat/crusader_explo
+	display_name = "knight, explo"
+	path = /obj/item/clothing/suit/armor/combat/crusader_explo
+	allowed_roles = list("Explorer","Field Medic","Pathfinder")

code/modules/client/preference_setup/vore/08_nif.dm

@@ -38,11 +38,16 @@
 	if((character.type == /mob/living/carbon/human) && ispath(pref.nif_path) && pref.nif_durability)
 		new pref.nif_path(character,pref.nif_durability,pref.nif_savedata)
 
+		/*
 		//And now here's the trick. We wipe these so that if they die, they lose the NIF.
 		//Backup implants will start saving this again periodically, and so will cryo'ing out.
 		pref.nif_path = null
 		pref.nif_durability = null
 		pref.nif_savedata = null
+		*/
+		//No we do not, that's lame and admins have to re-NIF them later.
+		//If they leave round after they get their NIF extracted, it will save as 'gone' anyway
+		//The NIF will save automatically every time durability changes too now.
 		var/savefile/S = new /savefile(pref.path)
 		if(!S) WARNING ("Couldn't load NIF save savefile? [pref.real_name]")
 		S.cd = "/character[pref.default_slot]"