Merge pull request tgstation#12708 from GunHog/I-am-pretty-sure-WJ-ow…

…ns-me-now

Xenomorph sprites and tweaks!

code/_onclick/hud/alien.dm

@@ -76,7 +76,7 @@
 	using = new /obj/screen/act_intent()
 	using.icon = 'icons/mob/screen_alien.dmi'
 	using.icon_state = mymob.a_intent
-	using.screen_loc = ui_acti
+	using.screen_loc = ui_movi
 	adding += using
 	action_intent = using
 
@@ -85,13 +85,6 @@
 		mymob.leap_icon.screen_loc = ui_alien_storage_r
 		adding += mymob.leap_icon
 
-	using = new /obj/screen/mov_intent()
-	using.icon = 'icons/mob/screen_alien.dmi'
-	using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
-	using.screen_loc = ui_movi
-	adding += using
-	move_intent = using
-
 	using = new /obj/screen/drop()
 	using.icon = 'icons/mob/screen_alien.dmi'
 	using.screen_loc = ui_drop_throw

code/_onclick/hud/alien_larva.dm

@@ -7,16 +7,9 @@
 	using = new /obj/screen/act_intent()
 	using.icon = 'icons/mob/screen_alien.dmi'
 	using.icon_state = mymob.a_intent
-	using.screen_loc = ui_acti
-	adding += using
-	action_intent = using
-
-	using = new /obj/screen/mov_intent()
-	using.icon = 'icons/mob/screen_alien.dmi'
-	using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
 	using.screen_loc = ui_movi
 	adding += using
-	move_intent = using
+	action_intent = using
 
 	mymob.healths = new /obj/screen()
 	mymob.healths.icon = 'icons/mob/screen_alien.dmi'

code/modules/mob/living/carbon/alien/alien.dm

@@ -128,7 +128,6 @@
 
 	if(statpanel("Status"))
 		stat(null, "Intent: [a_intent]")
-		stat(null, "Move Mode: [m_intent]")
 
 /mob/living/carbon/alien/Stun(amount)
 	if(status_flags & CANSTUN)
@@ -139,8 +138,10 @@
 	return
 
 /mob/living/carbon/alien/getTrail()
-	return "xltrails"
-
+	if(getBruteLoss() < 200)
+		return pick (list("xltrails_1", "xltrails2"))
+	else
+		return pick (list("xttrails_1", "xttrails2"))
 /*----------------------------------------
 Proc: AddInfectionImages()
 Des: Gives the client of the alien an image on each infected mob.

code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm

@@ -285,6 +285,24 @@ Doesn't work on other aliens/AI.*/
 
 	return 1
 
+/obj/effect/proc_holder/alien/sneak
+	name = "Sneak"
+	desc = "Blend into the shadows to stalk your prey."
+	var/active = 0
+
+	action_icon_state = "alien_sneak"
+
+/obj/effect/proc_holder/alien/sneak/fire(mob/living/carbon/alien/humanoid/user)
+	if(!active)
+		user.alpha = 75 //Still easy to see in lit areas with bright tiles, almost invisible on resin.
+		user.sneaking = 1
+		active = 1
+		user << "<span class='noticealien'>You blend into the shadows...</span>"
+	else
+		user.alpha = initial(user.alpha)
+		user.sneaking = 0
+		active = 0
+		user << "<span class='noticealien'>You reveal yourself!</span>"
 
 
 /mob/living/carbon/proc/getPlasma()

code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm

@@ -10,6 +10,7 @@
 	internal_organs += new /obj/item/organ/internal/alien/plasmavessel
 	internal_organs += new /obj/item/organ/internal/alien/acid
 	internal_organs += new /obj/item/organ/internal/alien/neurotoxin
+	AddAbility(new /obj/effect/proc_holder/alien/sneak)
 	..()
 
 /mob/living/carbon/alien/humanoid/sentinel/handle_hud_icons_health()

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -12,6 +12,7 @@
 	var/pounce_cooldown_time = 30
 	var/custom_pixel_x_offset = 0 //for admin fuckery.
 	var/custom_pixel_y_offset = 0
+	var/sneaking = 0 //For sneaky-sneaky mode and appropriate slowdown
 
 //This is fine right now, if we're adding organ specific damage this needs to be updated
 /mob/living/carbon/alien/humanoid/New()
@@ -21,7 +22,7 @@
 
 /mob/living/carbon/alien/humanoid/movement_delay()
 	. = ..()
-	. += move_delay_add + config.alien_delay	//move_delay_add is used to slow aliens with stuns
+	. += move_delay_add + config.alien_delay + sneaking	//move_delay_add is used to slow aliens with stuns
 
 /mob/living/carbon/alien/humanoid/emp_act(severity)
 	if(r_store) r_store.emp_act(severity)

code/modules/mob/living/carbon/alien/humanoid/queen.dm

@@ -8,6 +8,7 @@
 	mob_size = MOB_SIZE_LARGE
 	layer = 6
 	pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper.
+	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno = 20, /obj/item/stack/sheet/animalhide/xeno = 3)
 
 	var/alt_inhands_file = 'icons/mob/alienqueen.dmi'
 

code/modules/mob/living/carbon/alien/humanoid/update_icons.dm

@@ -19,8 +19,6 @@
 
 	else if(lying || resting || sleeping)
 		icon_state = "alien[caste]_sleep"
-	else if(m_intent == "run")
-		icon_state = "alien[caste]_running"
 	else if(mob_size == MOB_SIZE_LARGE)
 		icon_state = "alien[caste]"
 	else

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

@@ -33,8 +33,8 @@
 
 /mob/living/simple_animal/hostile/alien/drone
 	name = "alien drone"
-	icon_state = "aliend_running"
-	icon_living = "aliend_running"
+	icon_state = "aliend_s"
+	icon_living = "aliend_s"
 	icon_dead = "aliend_dead"
 	health = 60
 	melee_damage_lower = 15
@@ -53,8 +53,8 @@
 
 /mob/living/simple_animal/hostile/alien/sentinel
 	name = "alien sentinel"
-	icon_state = "aliens_running"
-	icon_living = "aliens_running"
+	icon_state = "aliens_s"
+	icon_living = "aliens_s"
 	icon_dead = "aliens_dead"
 	health = 120
 	melee_damage_lower = 15
@@ -68,8 +68,8 @@
 
 /mob/living/simple_animal/hostile/alien/queen
 	name = "alien queen"
-	icon_state = "alienq_running"
-	icon_living = "alienq_running"
+	icon_state = "alienq_s"
+	icon_living = "alienq_s"
 	icon_dead = "alienq_dead"
 	health = 250
 	maxHealth = 250
@@ -122,9 +122,9 @@
 /mob/living/simple_animal/hostile/alien/queen/large
 	name = "alien empress"
 	icon = 'icons/mob/alienqueen.dmi'
-	icon_state = "queen_s"
-	icon_living = "queen_s"
-	icon_dead = "queen_dead"
+	icon_state = "alienq"
+	icon_living = "alienq"
+	icon_dead = "alienq_dead"
 	move_to_delay = 4
 	maxHealth = 400
 	health = 400