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

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

@@ -12,6 +12,13 @@
 	bubble_icon = "alien"
 	type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
 
+	/// How much brute damage without armor piercing they do against mobs in melee
+	var/meleeSlashHumanPower = 20
+	/// How much power they have for DefaultCombatKnockdown when attacking humans
+	var/meleeKnockdownPower = 100
+	/// How much brute damage they do to simple animals
+	var/meleeSlashSAPower = 35
+
 	var/obj/item/card/id/wear_id = null // Fix for station bounced radios -- Skie
 	var/has_fine_manipulation = 0
 	var/move_delay_add = 0 // movement delay to add

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

@@ -21,14 +21,13 @@ Doesn't work on other aliens/AI.*/
 	. = ..()
 	action = new(src)
 
-/obj/effect/proc_holder/alien/Click()
-	if(!iscarbon(usr))
-		return 1
-	var/mob/living/carbon/user = usr
-	if(cost_check(check_turf,user))
+/obj/effect/proc_holder/alien/Trigger(mob/living/carbon/user, skip_cost_check)
+	if(!istype(user))
+		return TRUE
+	if(!skip_cost_check || cost_check(check_turf,user))
 		if(fire(user) && user) // Second check to prevent runtimes when evolving
 			user.adjustPlasma(-plasma_cost)
-	return 1
+	return TRUE
 
 /obj/effect/proc_holder/alien/on_gain(mob/living/carbon/user)
 	return

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

@@ -4,6 +4,7 @@
 	maxHealth = 125
 	health = 125
 	icon_state = "aliend"
+	meleeKnockdownPower = 80
 
 /mob/living/carbon/alien/humanoid/drone/Initialize()
 	AddAbility(new/obj/effect/proc_holder/alien/evolve(null))

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

@@ -1,9 +1,12 @@
 /mob/living/carbon/alien/humanoid/hunter
 	name = "alien hunter"
 	caste = "h"
-	maxHealth = 125
-	health = 125
+	maxHealth = 170
+	health = 170
 	icon_state = "alienh"
+	meleeKnockdownPower = 75
+	meleeSlashHumanPower = 20
+	meleeSlashSAPower = 45
 	var/obj/screen/leap_icon = null
 
 /mob/living/carbon/alien/humanoid/hunter/create_internal_organs()
@@ -68,6 +71,7 @@
 			else
 				L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
 				L.DefaultCombatKnockdown(100)
+				L.Stagger(4 SECONDS)
 				sleep(2)//Runtime prevention (infinite bump() calls on hulks)
 				step_towards(src,L)
 

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

@@ -1,9 +1,10 @@
 /mob/living/carbon/alien/humanoid/sentinel
 	name = "alien sentinel"
 	caste = "s"
-	maxHealth = 150
-	health = 150
+	maxHealth = 140
+	health = 140
 	icon_state = "aliens"
+	meleeSlashHumanPower = 15
 
 /mob/living/carbon/alien/humanoid/sentinel/Initialize()
 	AddAbility(new /obj/effect/proc_holder/alien/sneak)

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

@@ -110,7 +110,6 @@
 		return A
 	return FALSE
 
-
 /mob/living/carbon/alien/humanoid/check_breath(datum/gas_mixture/breath)
 	if(breath && breath.total_moles() > 0 && !sneaking)
 		playsound(get_turf(src), pick('sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg'), 50, 0, -5)

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

@@ -1,4 +1,3 @@
-
 /mob/living/carbon/alien/humanoid/grabbedby(mob/living/carbon/user, supress_message = 0)
 	if(user == src && pulling && grab_state >= GRAB_AGGRESSIVE && !pulling.anchored && iscarbon(pulling))
 		devour_mob(pulling, devour_time = 60)

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

@@ -1,5 +1,3 @@
-
-
 /mob/living/carbon/alien/humanoid/proc/adjust_body_temperature(current, loc_temp, boost)
 	var/temperature = current
 	var/difference = abs(current-loc_temp)	//get difference

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

@@ -11,6 +11,10 @@
 	pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper.
 	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 20, /obj/item/stack/sheet/animalhide/xeno = 3)
 
+	meleeKnockdownPower = 125
+	meleeSlashHumanPower = 30
+	meleeSlashSAPower = 60
+
 	var/alt_inhands_file = 'icons/mob/alienqueen.dmi'
 
 /mob/living/carbon/alien/humanoid/royal/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE)

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

@@ -53,7 +53,7 @@
 
 /mob/living/carbon/alien/humanoid/update_transform() //The old method of updating lying/standing was update_icons(). Aliens still expect that.
 	if(lying > 0)
-		lying = 90 //Anything else looks retarded
+		lying = 90 //Anything else looks silly
 	..()
 	update_icons()
 
@@ -95,4 +95,4 @@
 		hands += mutable_appearance(alt_inhands_file, "[itm_state][caste]_r", -HANDS_LAYER)
 
 	overlays_standing[HANDS_LAYER] = hands
-	apply_overlay(HANDS_LAYER)
+	apply_overlay(HANDS_LAYER)

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

@@ -6,6 +6,7 @@
 	mob_size = MOB_SIZE_SMALL
 	density = FALSE
 	hud_type = /datum/hud/larva
+	mouse_opacity = MOUSE_OPACITY_OPAQUE
 
 	maxHealth = 25
 	health = 25

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

@@ -77,6 +77,9 @@
 	alien_powers = list(/obj/effect/proc_holder/alien/transfer)
 
 /obj/item/organ/alien/plasmavessel/on_life()
+	. = ..()
+	if(!.)
+		return
 	//If there are alien weeds on the ground then heal if needed or give some plasma
 	if(locate(/obj/structure/alien/weeds) in owner.loc)
 		if(owner.health >= owner.maxHealth)

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

@@ -23,6 +23,8 @@
 
 /obj/item/organ/body_egg/alien_embryo/on_life()
 	. = ..()
+	if(!owner)
+		return
 	switch(stage)
 		if(2, 3)
 			if(prob(2))

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

@@ -247,13 +247,13 @@
 
 /proc/CanHug(mob/living/M)
 	if(!istype(M))
-		return 0
+		return FALSE
 	if(M.stat == DEAD)
-		return 0
+		return FALSE
 	if(M.getorgan(/obj/item/organ/alien/hivenode))
-		return 0
-	if(isvamp(M))
-		return 0
+		return FALSE
+	if(AmBloodsucker(M))
+		return FALSE
 		
 	if(ismonkey(M))
 		return 1
@@ -262,9 +262,9 @@
 	if(ishuman(C) && !(SLOT_WEAR_MASK in C.dna.species.no_equip))
 		var/mob/living/carbon/human/H = C
 		if(H.is_mouth_covered(head_only = 1))
-			return 0
-		return 1
-	return 0
+			return FALSE
+		return TRUE
+	return FALSE
 
 #undef MIN_ACTIVE_TIME
 #undef MAX_ACTIVE_TIME

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

@@ -2,6 +2,9 @@
 //The effects include: stun, knockdown, unconscious, sleeping, resting, jitteriness, dizziness, ear damage,
 // eye damage, eye_blind, eye_blurry, druggy, TRAIT_BLIND trait, and TRAIT_NEARSIGHT trait.
 
+/mob/living/carbon/alien/DefaultCombatKnockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg)
+	return	//no
+
 /////////////////////////////////// STUN ////////////////////////////////////
 /* CIT CHANGE - removes xeno stun immunity
 /mob/living/carbon/alien/Stun(amount, updating = 1, ignore_canstun = 0)
@@ -17,5 +20,5 @@
 /mob/living/carbon/alien/AdjustStun(amount, updating = 1, ignore_canstun = 0)
 	. = ..()
 	if(!.)
-		move_delay_add = CLAMP(move_delay_add + round(amount/2), 0, 10)
+		move_delay_add = clamp(move_delay_add + round(amount/2), 0, 10)
 */