[PORTS] Dragon & Carp changes (BeeStation#11761)

* AAA * carpheal * yuh * breh * a * foirgotmaxhealth * empty * gggbjh * Update code/modules/antagonists/space_dragon/carp_rift.dm Co-authored-by: PowerfulBacon <[email protected]> * realnvg --------- Co-authored-by: PowerfulBacon <[email protected]>
XeonMations · Nov 16, 2024 · f5bec31 · f5bec31
1 parent f2b381a
commit f5bec31
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/code/modules/antagonists/space_dragon/carp_rift.dm b/code/modules/antagonists/space_dragon/carp_rift.dm
@@ -24,7 +24,7 @@
 		return
 	var/area/A = get_area(S)
 	if(!(A in dragon.chosen_rift_areas))
-		to_chat(S, "<span class='warning'>You can't summon a rift here!</span>")
+		owner.balloon_alert(owner, "can't summon a rift here, check your objectives!")
 		return
 	for(var/obj/structure/carp_rift/rift in dragon.rift_list)
 		var/area/RA = get_area(rift)

diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -243,10 +243,10 @@
 /mob/living/simple_animal/hostile/carp/advanced
 	name = "advanced space carp"
 	desc = "A ferocious, fang-bearing creature that resembles a fish."
-	maxHealth = 40
-	health = 40
+	maxHealth = 80
+	health = 80
 	gold_core_spawnable = NO_SPAWN
-	obj_damage = 15
+	obj_damage = 25
 
 /mob/living/simple_animal/hostile/carp/advanced/examine(mob/user)
 	. = ..()

diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
@@ -43,6 +43,8 @@
 	flags_1 = PREVENT_CONTENTS_EXPLOSION_1
 	melee_damage = 35
 	mob_size = MOB_SIZE_LARGE
+	see_in_dark = NIGHTVISION_FOV_RANGE
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	armour_penetration = 30
 	pixel_x = -16
 	turns_per_move = 5
@@ -88,6 +90,7 @@
 	small_sprite = new
 	small_sprite.Grant(src)
 	ADD_TRAIT(src, TRAIT_FREE_HYPERSPACE_MOVEMENT, INNATE_TRAIT)
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 
 /mob/living/simple_animal/hostile/space_dragon/proc/living_revive(source)
 	SIGNAL_HANDLER
@@ -382,7 +385,6 @@
 	target.add_filter("anger_glow", 3, list("type" = "outline", "color" = "#ff330030", "size" = 2))
 	target.add_movespeed_modifier(/datum/movespeed_modifier/rift_empowerment)
 	addtimer(CALLBACK(src, PROC_REF(end_carp_speedboost), target), 8 SECONDS)
-
 /**
  * Remove the speed boost from carps when hit by space dragon's flame breath
  *