Merge remote-tracking branch 'origin/master' into perlin-genny

code/game/objects/items/bodybag.dm

@@ -16,6 +16,9 @@
 		if(isopenturf(target))
 			deploy_bodybag(user, target)
 
+/obj/item/bodybag/canReachInto(atom/user, atom/target, list/next, view_only, obj/item/tool)
+	return (user in src)
+
 /obj/item/bodybag/proc/deploy_bodybag(mob/user, atom/location)
 	var/obj/structure/closet/body_bag/R = new unfoldedbag_path(location)
 	R.open(user)

code/game/objects/items/defib.dm

@@ -721,24 +721,24 @@
 
 /obj/item/disk/medical/defib_heal
 	name = "Defibrillator Healing Disk"
-	desc = "An upgrade which increases the healing power of the defibrillator"
+	desc = "An upgrade which increases the healing power of the defibrillator."
 	icon_state = "heal_disk"
 	custom_materials = list(/datum/material/iron=16000, /datum/material/glass = 18000, /datum/material/gold = 6000, /datum/material/silver = 6000)
 
 /obj/item/disk/medical/defib_shock
 	name = "Defibrillator Anti-Shock Disk"
-	desc = "A safety upgrade that guarantees only the patient will get shocked"
+	desc = "A safety upgrade that guarantees only the patient will get shocked."
 	icon_state = "zap_disk"
 	custom_materials = list(/datum/material/iron=16000, /datum/material/glass = 18000, /datum/material/gold = 6000, /datum/material/silver = 6000)
 
 /obj/item/disk/medical/defib_decay
 	name = "Defibrillator Body-Decay Extender Disk"
-	desc = "An upgrade allowing the defibrillator to work on more decayed bodies"
+	desc = "An upgrade allowing the defibrillator to work on bodies that have decayed further."
 	icon_state = "body_disk"
 	custom_materials = list(/datum/material/iron=16000, /datum/material/glass = 18000, /datum/material/gold = 16000, /datum/material/silver = 6000, /datum/material/titanium = 2000)
 
 /obj/item/disk/medical/defib_speed
 	name = "Defibrillator Fast Charge Disk"
-	desc = "An upgrade to the defibrillator capacitors, which let it charge faster"
+	desc = "An upgrade to the defibrillator capacitors, which lets it charge faster."
 	icon_state = "fast_disk"
 	custom_materials = list(/datum/material/iron=16000, /datum/material/glass = 8000, /datum/material/gold = 26000, /datum/material/silver = 26000)

code/game/objects/items/melee/misc.dm

@@ -3,9 +3,8 @@
 
 /obj/item/melee/proc/check_martial_counter(mob/living/carbon/human/target, mob/living/carbon/human/user)
 	if(target.check_martial_melee_block())
-		target.visible_message("<span class='danger'>[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!</span>",
+		target.visible_message("<span class='danger'>[target.name] blocks your attack!</span>",
 					"<span class='userdanger'>You block the attack!</span>")
-		user.Stun(40)
 		return TRUE
 
 /obj/item/melee/chainofcommand

code/game/objects/items/pet_carrier.dm

@@ -332,6 +332,7 @@
 		to_chat(occupant, "You pop out of the [src], slightly dazed!")
 		occupant.Stun(5 SECONDS)
 
+
 /obj/item/pet_carrier/bluespace/return_air()
 	if(!occupant_gas_supply)
 		occupant_gas_supply = new
@@ -353,4 +354,14 @@
 	if(..())
 		name = "[initial(name)] ([target])"
 
+/obj/item/pet_carrier/bluespace/single_use
+	desc = "A jar, that seems to be bigger on the inside, somehow allowing lifeforms to fit through its narrow entrance. This one looks exceptionally fragile."
+
+/obj/item/pet_carrier/bluespace/single_use/remove_occupant(mob/living/occupant)
+	. = ..()
+
+	if(!QDELETED(src))
+		playsound(src, "shatter", 70, 1)
+		qdel(src)
+
 #undef pet_carrier_full

code/game/objects/items/storage/firstaid.dm

@@ -469,7 +469,7 @@
 //hijacking the minature first aids for hypospray boxes. <3
 /obj/item/storage/hypospraykit
 	name = "hypospray kit"
-	desc = "It's a kit containing a hypospray and specific treatment chemical-filled vials."
+	desc = "It's a kit designed for containing a hypospray and specific treatment chemical-filled vials."
 	icon_state = "firstaid-mini"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'

code/game/objects/items/tanks/tank_types.dm

@@ -58,7 +58,6 @@
 /obj/item/tank/internals/air
 	name = "air tank"
 	desc = "Mixed anyone?"
-	icon_state = "air"
 	item_state = "air"
 	force = 10
 	dog_fashion = /datum/dog_fashion/back