tones down the shriekwaves

cmss13-devs · Mar 26, 2024 · c4355f1 · c4355f1
1 parent 96d0884
commit c4355f1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm
@@ -142,7 +142,7 @@
 
 	playsound(xeno.loc, pick(xeno.screech_sound_effect_list), 75, 0, status = 0)
 	xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits an ear-splitting guttural roar!"))
-	xeno.create_shriekwave(xeno, 21) //Adds the visual effect. Wom wom wom, 21 shriekwaves
+	xeno.create_shriekwave(xeno, 16) //Adds the visual effect. Wom wom wom, 21 shriekwaves
 
 	for(var/mob/mob in view())
 		if(mob && mob.client)

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm
@@ -12,7 +12,7 @@
 
 	playsound(xeno.loc, pick(predalien_roar), 75, 0, status = 0)
 	xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits a guttural roar!"))
-	xeno.create_shriekwave(xeno, 10) //Adds the visual effect. Wom wom wom, 10 shriekwaves
+	xeno.create_shriekwave(xeno, 8) //Adds the visual effect. Wom wom wom, 10 shriekwaves
 	for(var/mob/living/carbon/carbon in view(7, xeno))
 		if(ishuman(carbon))
 			var/mob/living/carbon/human/human = carbon

diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm
@@ -208,29 +208,29 @@
 	var/epicenter = src.loc ///center of the shockwave, set at the center of the tile that the mob is currently standing on
 
 	//shockwaves are iterated, counting down once per shriekwave, with the total amount being determined on the respective xeno ability tile
-	if(shriekwaves_left > 18)
+	if(shriekwaves_left > 12)
 		shriekwaves_left--
 		new /obj/effect/shockwave(epicenter, 11, 0.5, offset_y)
 		addtimer(CALLBACK(src, PROC_REF(create_shriekwave), epicenter, shriekwaves_left), 2)
 		return
-	if(shriekwaves_left > 12)
+	if(shriekwaves_left > 8)
 		shriekwaves_left--
 		new /obj/effect/shockwave(epicenter, 10, 0.5, offset_y)
-		addtimer(CALLBACK(src, PROC_REF(create_shriekwave), epicenter, shriekwaves_left), 2)
+		addtimer(CALLBACK(src, PROC_REF(create_shriekwave), epicenter, shriekwaves_left), 3)
 		return
 	if(shriekwaves_left > 4)
 		shriekwaves_left--
-		new /obj/effect/shockwave(epicenter, 9, 0.7, offset_y)
-		addtimer(CALLBACK(src, PROC_REF(create_shriekwave), epicenter, shriekwaves_left), 2)
+		new /obj/effect/shockwave(epicenter, 9, 0.5, offset_y)
+		addtimer(CALLBACK(src, PROC_REF(create_shriekwave), epicenter, shriekwaves_left), 3)
 		return
 	if(shriekwaves_left > 1)
 		shriekwaves_left--
-		new /obj/effect/shockwave(epicenter, 7.5, 0.7, offset_y)
-		addtimer(CALLBACK(src, PROC_REF(create_shriekwave), epicenter, shriekwaves_left), 2)
+		new /obj/effect/shockwave(epicenter, 7.5, 0.5, offset_y)
+		addtimer(CALLBACK(src, PROC_REF(create_shriekwave), epicenter, shriekwaves_left), 3)
 		return
 	if(shriekwaves_left == 1)
 		shriekwaves_left--
-		addtimer(CALLBACK(src, PROC_REF(create_shriekwave), epicenter, shriekwaves_left), 1)
+		new /obj/effect/shockwave(epicenter, 10, 0.7, offset_y)
 
 /mob/living/carbon/xenomorph/proc/create_stomp()
 	remove_suit_layer()