Merge remote-tracking branch 'origin/master' into fixes-2

code/game/gamemodes/game_mode.dm

@@ -420,7 +420,7 @@
 
 	for(var/mob/dead/new_player/player in players)
 		if(player.client && player.ready == PLAYER_READY_TO_PLAY)
-			if(role in player.client.prefs.be_special)
+			if((role in player.client.prefs.be_special) && (ROLE_SYNDICATE in player.client.prefs.be_special))
 				if(!jobban_isbanned(player, ROLE_SYNDICATE) && !QDELETED(player) && !jobban_isbanned(player, role) && !QDELETED(player)) //Nodrak/Carn: Antag Job-bans
 					if(age_check(player.client)) //Must be older than the minimum age
 						candidates += player.mind				// Get a list of all the people who want to be the antagonist for this round

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/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'