Merge pull request #10129 from Novacat/nova-ert

Miscellaneous Sundries

code/modules/mob/living/living.dm

@@ -1027,6 +1027,10 @@
 			var/turf/end_T = get_turf(target)
 			if(end_T)
 				add_attack_logs(src,M,"Thrown via grab to [end_T.x],[end_T.y],[end_T.z]")
+			if(ishuman(M))
+				var/mob/living/carbon/human/N = M
+				if((N.health + N.halloss) < config.health_threshold_crit || N.stat == DEAD)
+					N.adjustBruteLoss(rand(10,30))
 			src.drop_from_inventory(G)
 
 	src.drop_from_inventory(item)

code/modules/pda/cart_vr.dm

@@ -3,6 +3,9 @@ var/list/exploration_cartridges = list(
 	/obj/item/weapon/cartridge/sar
 	)
 
+/obj/item/weapon/cartridge
+	slot_flags = SLOT_EARS
+
 /obj/item/weapon/cartridge/explorer
 	name = "\improper Explorator cartridge"
 	icon_state = "cart-e"
@@ -24,6 +27,7 @@ var/list/exploration_cartridges = list(
 	desc = "It feels heavier for some reason."
 	w_class = ITEMSIZE_SMALL
 	icon_state = "cart-lib"
+	show_examine = FALSE
 	var/slots = 1
 	var/obj/item/weapon/storage/internal/hold