Merge pull request #11677 from xxalpha/aliums

Xeno tweaks and bugfixes.

code/game/objects/effects/aliens.dm

@@ -309,6 +309,7 @@
 	anchored = 1
 	var/health = 100
 	var/status = GROWING	//can be GROWING, GROWN or BURST; all mutually exclusive
+	layer = MOB_LAYER
 
 
 /obj/structure/alien/egg/New()

code/game/objects/items.dm

@@ -194,9 +194,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 	if (loc == user)
 		if(!user.unEquip(src))
 			return
-	else
-		if(isliving(loc))
-			return
+
 	pickup(user)
 	add_fingerprint(user)
 	user.put_in_active_hand(src)

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

@@ -1,8 +1,8 @@
 /mob/living/carbon/alien/humanoid/hunter
 	name = "alien hunter"
 	caste = "h"
-	maxHealth = 150
-	health = 150
+	maxHealth = 125
+	health = 125
 	icon_state = "alienh_s"
 
 /mob/living/carbon/alien/humanoid/hunter/New()

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

@@ -1,8 +1,8 @@
 /mob/living/carbon/alien/humanoid/sentinel
 	name = "alien sentinel"
 	caste = "s"
-	maxHealth = 125
-	health = 125
+	maxHealth = 150
+	health = 150
 	icon_state = "aliens_s"
 
 
@@ -35,4 +35,3 @@
 
 /mob/living/carbon/alien/humanoid/sentinel/movement_delay()
 	. = ..()
-	. += 1

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

@@ -40,9 +40,9 @@
 	if(L.amount_grown >= L.max_grown)	//TODO ~Carn
 		L << "<span class='name'>You are growing into a beautiful alien! It is time to choose a caste.</span>"
 		L << "<span class='info'>There are three to choose from:"
-		L << "<span class='name'>Hunters</span> <span class='info'>are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves.</span>"
-		L << "<span class='name'>Sentinels</span> <span class='info'>are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters.</span>"
-		L << "<span class='name'>Drones</span> <span class='info'>are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen.</span>"
+		L << "<span class='name'>Hunters</span> <span class='info'>are the most agile caste tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.</span>"
+		L << "<span class='name'>Sentinels</span> <span class='info'>are tasked with protecting the hive. With their ranged spit, invisibility, and high health, they make formidable guardians and acceptable secondhand hunters.</span>"
+		L << "<span class='name'>Drones</span> <span class='info'>are the weakest and slowest of the castes, but can grow into the queen if there is none, and are vital to maintaining a hive with their resin secretion abilities.</span>"
 		var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
 
 		var/mob/living/carbon/alien/humanoid/new_xeno

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

@@ -19,6 +19,7 @@ var/const/MAX_ACTIVE_TIME = 400
 	throw_range = 5
 	tint = 3
 	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
+	layer = MOB_LAYER
 
 	var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
 

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

@@ -7,7 +7,7 @@
 		if(M.a_intent == "harm")
 			if (w_uniform)
 				w_uniform.add_fingerprint(M)
-			var/damage = rand(15, 30)
+			var/damage = prob(90) ? 20 : 0
 			if(!damage)
 				playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
 				visible_message("<span class='danger'>[M] has lunged at [src]!</span>", \
@@ -21,7 +21,7 @@
 				"<span class='userdanger'>[M] has slashed at [src]!</span>")
 
 			apply_damage(damage, BRUTE, affecting, armor_block)
-			if (damage >= 25)
+			if (prob(30))
 				visible_message("<span class='danger'>[M] has wounded [src]!</span>", \
 					"<span class='userdanger'>[M] has wounded [src]!</span>")
 				apply_effect(4, WEAKEN, armor_block)

code/modules/mob/living/silicon/robot/robot.dm

@@ -653,7 +653,7 @@
 		if(!(lying))
 			M.do_attack_animation(src)
 			if (prob(85))
-				Stun(7)
+				Stun(2)
 				step(src,get_dir(M,src))
 				spawn(5)
 					step(src,get_dir(M,src))

code/modules/mob/living/silicon/silicon.dm

@@ -366,7 +366,7 @@
 
 /mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M)
 	if(..()) //if harm or disarm intent
-		var/damage = rand(10, 20)
+		var/damage = 20
 		if (prob(90))
 			add_logs(M, src, "attacked")
 			playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)

code/modules/mob/mob_grab.dm

@@ -207,9 +207,9 @@
 			var/mob/living/carbon/attacker = user
 			user.visible_message("<span class='danger'>[user] is attempting to devour [affecting]!</span>")
 			if(istype(user, /mob/living/carbon/alien/humanoid/hunter))
-				if(!do_mob(user, affecting)||!do_after(user, 30, target = affecting)) return
+				if(!do_mob(user, affecting, 60)) return
 			else
-				if(!do_mob(user, affecting)||!do_after(user, 100, target = affecting)) return
+				if(!do_mob(user, affecting, 130)) return
 			user.visible_message("<span class='danger'>[user] devours [affecting]!</span>")
 			affecting.loc = user
 			attacker.stomach_contents.Add(affecting)

html/changelogs/xxalpha-aliums.yml

@@ -0,0 +1,14 @@
+author: xxalpha
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed not being able to grab things from storage while inside aliens."
+  - bugfix: "Fixed two progress bars when devouring."
+  - rscadd: "Shields will now block alien hunter pounces."
+  - tweak: "Alien hunters health reduced to 125 from 150. Alien sentinels health increased to 150 from 125."
+  - tweak: "Alien hunters will no longer be transparent when stalking, this ability was given to alien sentinels."
+  - tweak: "Alien slashing now deals constant 20 damage but has a chance to miss."
+  - tweak: "Reduced alien disarm stun duration vs cyborgs, from 7 seconds to 2 seconds."
+  - tweak: "Alien sentinels now move as fast as humans."
+  - tweak: "Facehuggers and alien eggs layers increased to be higher than resin walls."