[MIRROR] prot rig (#10457)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>

code/modules/mob/living/carbon/human/species/station/protean_vr/protean_rig.dm

@@ -246,7 +246,7 @@
 	if(dead)
 		switch(dead)
 			if(1)
-				if(W.is_screwdriver())
+				if(W.has_tool_quality(TOOL_SCREWDRIVER))
 					playsound(src, W.usesound, 50, 1)
 					if(do_after(user,50,src,exclusive = TASK_ALL_EXCLUSIVE))
 						to_chat(user, span_notice("You unscrew the maintenace panel on the [src]."))
@@ -321,7 +321,7 @@
 		mod.installed(src)
 		update_icon()
 		return 1
-	else if(W.is_wrench())
+	else if(W.has_tool_quality(TOOL_WRENCH))
 		if(!air_supply)
 			to_chat(user, "There is no tank to remove.")
 			return
@@ -333,7 +333,7 @@
 		to_chat(user, "You detach and remove \the [air_supply].")
 		air_supply = null
 		return
-	else if(W.is_screwdriver())
+	else if(W.has_tool_quality(TOOL_SCREWDRIVER))
 		var/list/possible_removals = list()
 		for(var/obj/item/rig_module/module in installed_modules)
 			if(module.permanent)
@@ -365,7 +365,6 @@
 	else
 		if(istype(W,/obj/item/storage/backpack))
 			AssimilateBag(user,0,W)
-	..()
 
 /obj/item/rig/protean/proc/make_alive(var/mob/living/carbon/human/H, var/partial)
 	if(H)

code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm

@@ -672,7 +672,7 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 
 /mob/living/simple_mob/vore/alienanimals/teppi/Life()
 	. =..()
-	if(!.)
+	if(!. || QDELETED(src))
 		return
 	wantpet += rand(0,2) * affection_factor
 	amount_grown += rand(1,5)