Merge pull request #10253 from Kyep/cc_contraband

CC/Admin Outfits Update

code/modules/mob/living/carbon/human/emote.dm

@@ -238,7 +238,7 @@
 					start_tail_wagging(1)
 
 			else if(dna.species.bodyflags & TAIL_WAGGING)
-				if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
+				if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL))
 					message = "<B>[src]</B> starts wagging [p_their()] tail."
 					start_tail_wagging(1)
 				else

code/modules/mob/living/carbon/human/update_icons.dm

@@ -1082,7 +1082,7 @@ var/global/list/damage_icon_parts = list()
 				overlays_standing[TAIL_LAYER] = tail
 
 	else if(tail && dna.species.bodyflags & HAS_TAIL) //no tailless tajaran
-		if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
+		if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL))
 			var/icon/tail_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[tail]_s")
 			if(dna.species.bodyflags & HAS_SKIN_COLOR)
 				tail_s.Blend(skin_colour, ICON_ADD)

code/modules/mob/living/simple_animal/hostile/bat.dm

@@ -60,4 +60,17 @@
 	if(istype(L))
 		if(prob(15))
 			L.Stun(1)
-			L.visible_message("<span class='danger'>\the [src] scares \the [L]!</span>")
+			L.visible_message("<span class='danger'>\the [src] scares \the [L]!</span>")
+
+
+/mob/living/simple_animal/hostile/scarybat/batswarm
+	name = "bat swarm"
+	desc = "A swarm of vicious, angry-looking space bats."
+	speed = 1
+	harm_intent_damage = 25
+	maxHealth = 300
+	melee_damage_lower = 10
+	melee_damage_upper = 30
+	a_intent = INTENT_HARM
+	universal_speak = 1
+	universal_understand = 1