Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

code/modules/mob/mob.dm

@@ -1312,4 +1312,12 @@ mob/proc/yank_out_object()
 	return paralysis
 
 /mob/proc/assess_threat() //For sec bot threat assessment
-	return
+	return
+
+/mob/proc/get_ghost(even_if_they_cant_reenter = 0)
+	if(mind)
+		for(var/mob/dead/observer/G in dead_mob_list)
+			if(G.mind == mind)
+				if(G.can_reenter_corpse || even_if_they_cant_reenter)
+					return G
+				break

code/modules/reagents/reagent_containers/hypospray.dm

@@ -8,6 +8,7 @@
 	icon = 'icons/obj/syringe.dmi'
 	item_state = "hypo"
 	icon_state = "hypo"
+	icon_override = 'icons/mob/in-hand/tools.dmi'
 	amount_per_transfer_from_this = 5
 	volume = 30
 	possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30)

code/modules/research/designs.dm

@@ -1653,6 +1653,17 @@ datum/design/noreactbeaker
 	build_path = "/obj/item/weapon/reagent_containers/glass/beaker/noreact"
 	category = "Misc"
 
+datum/design/defib
+	name = "Defibrillator"
+	desc = "A device that delivers powerful shocks to detachable paddles that resuscitate incapacitated patients."
+	id = "defib"
+	req_tech = list("materials" = 7, "biotech" = 5, "powerstorage" = 5)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 5000, "$glass" = 2000, "$silver" = 1000)
+	reliability = 76
+	build_path = "/obj/item/weapon/defibrillator"
+	category = "Misc"
+
 datum/design/implanter
 	name = "Implanter"
 	desc = "A basic implanter for injecting implants"