Merge remote-tracking branch 'citadel/master' into combat_v7

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -243,6 +243,17 @@
 	icon_state = "shieldsparkles"
 	duration = 5
 
+/obj/effect/temp_visual/voidpush
+	name = "eldritch energy"
+	icon_state = "emark4"
+	duration = 5
+
+/obj/effect/temp_visual/voidswap
+	name = "altered space"
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "voidalter"
+	duration = 5
+
 /obj/effect/temp_visual/telekinesis
 	name = "telekinetic force"
 	icon_state = "empdisable"

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/circuitboards/machine_circuitboards.dm

@@ -472,7 +472,7 @@
 			build_path = /obj/machinery/holopad
 			secure = FALSE
 		else
-			build_path = /obj/machinery/holopad //secure
+			build_path = /obj/machinery/holopad/secure //secure
 			secure = TRUE
 		to_chat(user, "<span class='notice'>You [secure? "en" : "dis"]able the security on the [src]</span>")
 	. = ..()

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/structures/crates_lockers/closets.dm

@@ -626,4 +626,4 @@
 		T1.visible_message("<span class='warning'>[user] dives into [src]!</span>")
 
 /obj/structure/closet/canReachInto(atom/user, atom/target, list/next, view_only, obj/item/tool)
-	return ..() && opened
+	return (user in src)

code/game/objects/structures/ghost_role_spawners.dm

@@ -676,7 +676,6 @@
 		ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
 		ADD_TRAIT(new_spawn, TRAIT_EXEMPT_HEALTH_EVENTS, GHOSTROLE_TRAIT)
 		ADD_TRAIT(new_spawn, TRAIT_NO_MIDROUND_ANTAG, GHOSTROLE_TRAIT) //The mob can't be made into a random antag, they are still eligible for ghost roles popups.
-		ADD_TRAIT(new_spawn, TRAIT_PACIFISM, GHOSTROLE_TRAIT)
 		to_chat(new_spawn,"<span class='boldwarning'>Ghosting is free!</span>")
 		var/datum/action/toggle_dead_chat_mob/D = new(new_spawn)
 		D.Grant(new_spawn)