Merge branch 'master' into hanner

code/game/objects/items/devices/scanners/health.dm

@@ -244,6 +244,8 @@
 				severity = "Mild"
 			if(severity)
 				dat += "<span class='warning'>[severity] inflammation detected in subject [a.name].</span><br>"
+		if(HUSK in H.mutations)
+			dat += "<span class='danger'>Anatomical structure lost, resuscitation not possible!</span><br>"
 		// Infections, fractures, and IB
 		var/basic_fracture = 0	// If it's a basic scanner
 		var/basic_ib = 0		// If it's a basic scanner

code/game/objects/items/weapons/AI_modules.dm

@@ -269,6 +269,11 @@ AI MODULES
 	desc = "A 'reset' AI module: 'Clears all, except the inherent, laws.'"
 	origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4)
 
+// VOREstation edit: use map default laws
+/obj/item/weapon/aiModule/reset/Initialize()
+	. = ..()
+	laws = new global.using_map.default_law_type // Pull from loaded map
+
 /obj/item/weapon/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	log_law_changes(target, sender)
 

code/game/objects/items/weapons/storage/belt.dm

@@ -244,7 +244,11 @@
 		/obj/item/device/flashlight,
 		/obj/item/weapon/cell/device,
 		/obj/item/weapon/extinguisher/mini,
-		/obj/item/weapon/storage/quickdraw/syringe_case
+		/obj/item/device/antibody_scanner, // VOREstation edit start
+		/obj/item/device/sleevemate,
+		/obj/item/device/mass_spectrometer,
+		/obj/item/weapon/surgical,
+		/obj/item/clothing/mask/chewable/candy/lolli // VOREstation edit end
 		)
 
 /obj/item/weapon/storage/belt/medical/emt

code/game/objects/structures/crates_lockers/crates.dm

@@ -69,6 +69,14 @@
 	update_icon()
 	return 1
 
+/obj/structure/closet/crate/MouseDrop_T(mob/target, mob/user)
+	// Adds climbing from drag, You can't put yourself in crates with a drag anyway... Nore anyone else actually.
+	var/mob/living/H = user
+	if(istype(H) && can_climb(H) && target == user)
+		do_climb(target)
+	else
+		return ..()
+
 /obj/structure/closet/crate/verb/rotate_clockwise()
 	set name = "Rotate Crate Clockwise"
 	set category = "Object"