yea

shiptest-ss13 · Mar 9, 2024 · a42e2f5 · a42e2f5
1 parent 4bd979f
commit a42e2f5
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 30 deletions.
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
@@ -180,3 +180,7 @@
 /mob/living/carbon/alien/on_standing_up()
 	. = ..()
 	update_icons()
+
+/mob/living/carbon/alien/examine(mob/user)
+	. = ..()
+	. += "It's a strange creature"
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -291,7 +291,7 @@ Doesn't work on other aliens/AI.*/
 
 /obj/effect/proc_holder/alien/sneak/fire(mob/living/carbon/alien/humanoid/user)
 	if(!active)
-		user.alpha = 25
+		user.alpha = 75
 		user.sneaking = TRUE
 		active = TRUE
 		to_chat(user, "<span class='noticealien'>You blend into the shadows...</span>")

diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -100,8 +100,7 @@
 		return
 
 	else //Maybe uses plasma in the future, although that wouldn't make any sense...
-		leaping = 1
-		weather_immunities += "lava"
+		leaping = TRUE
 		update_icons()
 		throw_at(leap_target, MAX_ALIEN_LEAP_DIST, 2, src, FALSE, TRUE, callback = CALLBACK(src, PROC_REF(leap_end)))
 
@@ -115,7 +114,6 @@
  * the icons of the hunter.
  */
 /mob/living/carbon/alien/humanoid/hunter/proc/leap_end()
-	leaping = 0
-	LAZYREMOVE(weather_immunities, "lava")
+	leaping = FALSE
 	update_icons()
 
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
@@ -6,7 +6,7 @@
 	var/t_has = p_have()
 	var/t_is = p_are()
 
-	. = list("<span class='info'>This is [icon2html(src, user)] \a <EM>[src]</EM>!>")
+	. = list("<span class='info'>This is [icon2html(src, user)] \a <EM>[src]</EM>!")
 	var/list/obscured = check_obscured_slots()
 
 	if (handcuffed)

diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -284,30 +284,30 @@
 			return TRUE
 		apply_damage(damage, BRUTE, affecting, armor_block)
 
-		if(M.a_intent == INTENT_DISARM) //Always drop item in hand on first go.  If no item exists, try to shove them back.  If you share the tile with the target, slam them directly into the ground to stun them and slightly damage them.
-			var/obj/item/I = get_active_held_item()
-			if(I && dropItemToGround(I))
-				playsound(loc, 'sound/weapons/slash.ogg', 25, TRUE, -1)
-				visible_message("<span class='danger'>[M] disarms [src]!</span>", \
-								"<span class='userdanger'>[M] disarms you!</span>", "<span class='hear'>You hear aggressive shuffling!</span>", null, M)
-				to_chat(M, "<span class='danger'>You disarm [src]!</span>")
-			else if(get_dist(src, M) != 0)
-				playsound(loc, 'sound/weapons/pierce.ogg', 25, TRUE, -1)
-				var/shovetarget = get_edge_target_turf(M, get_dir(M, get_step_away(src, M)))
-				Knockdown(0.3 SECONDS)
-				throw_at(shovetarget, 4, 2, M, force = MOVE_FORCE_OVERPOWERING)
-				log_combat(M, src, "shoved")
-				visible_message("<span class='danger'>[M] tackles [src] down!</span>", \
-								"<span class='userdanger'>[M] shoves you with great force!</span>", "<span class='hear'>You hear aggressive shuffling followed by a loud thud!</span>", null, M)
-				to_chat(M, "<span class='danger'>You shove [src] with great force!</span>")
-			else
-				Paralyze(3 SECONDS)
-				adjustBruteLoss(5)
-				playsound(loc, 'sound/weapons/punch3.ogg', 25, TRUE, -1)
-				visible_message("<span class='danger'>[M] slams [src] into the floor!</span>", \
-								"<span class='userdanger'>[M] slams you into the ground!</span>", "<span class='hear'>You hear something slam loudly onto the floor!</span>", null, M)
-				to_chat(M, "<span class='danger'>You slam [src] into the floor beneath you!</span>")
-				log_combat(M, src, "slammed into the ground")
+	if(M.a_intent == INTENT_DISARM) //Always drop item in hand on first go.  If no item exists, try to shove them back.  If you share the tile with the target, slam them directly into the ground to stun them and slightly damage them.
+		var/obj/item/I = get_active_held_item()
+		if(I && dropItemToGround(I))
+			playsound(loc, 'sound/weapons/slash.ogg', 25, TRUE, -1)
+			visible_message("<span class='danger'>[M] disarms [src]!</span>", \
+							"<span class='userdanger'>[M] disarms you!</span>", "<span class='hear'>You hear aggressive shuffling!</span>", null, M)
+			to_chat(M, "<span class='danger'>You disarm [src]!</span>")
+		else if(get_dist(src, M) != 0)
+			playsound(loc, 'sound/weapons/pierce.ogg', 25, TRUE, -1)
+			var/shovetarget = get_edge_target_turf(M, get_dir(M, get_step_away(src, M)))
+			Knockdown(0.1 SECONDS)
+			throw_at(shovetarget, 4, 2, M, force = MOVE_FORCE_OVERPOWERING)
+			log_combat(M, src, "shoved")
+			visible_message("<span class='danger'>[M] tackles [src] down!</span>", \
+							"<span class='userdanger'>[M] shoves you with great force!</span>", "<span class='hear'>You hear aggressive shuffling followed by a loud thud!</span>", null, M)
+			to_chat(M, "<span class='danger'>You shove [src] with great force!</span>")
+		else
+			Paralyze(0.5 SECONDS)
+			adjustBruteLoss(5)
+			playsound(loc, 'sound/weapons/punch3.ogg', 25, TRUE, -1)
+			visible_message("<span class='danger'>[M] slams [src] into the floor!</span>", \
+							"<span class='userdanger'>[M] slams you into the ground!</span>", "<span class='hear'>You hear something slam loudly onto the floor!</span>", null, M)
+			to_chat(M, "<span class='danger'>You slam [src] into the floor beneath you!</span>")
+			log_combat(M, src, "slammed into the ground")
 
 /mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L)