Apply suggestions from code review

Co-authored-by: Gboster-0 <[email protected]>
vlggms · Jan 5, 2025 · 9e9ee43 · 9e9ee43
1 parent 351e34f
commit 9e9ee43
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/army_in_black.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/army_in_black.dm
@@ -151,7 +151,7 @@ GLOBAL_LIST_EMPTY(army)
 /mob/living/simple_animal/hostile/abnormality/army/BreachEffect(mob/living/carbon/human/user, breach_type)
 	SEND_GLOBAL_SIGNAL(COMSIG_GLOB_ABNORMALITY_BREACH, src)
 	if(breach_type == BREACH_MINING)
-		for(var/i = 1 to 3)
+		for(var/i in 1 to 3)
 			var/mob/living/simple_animal/hostile/army_enemy/E = new(get_turf(src))
 			RegisterSignal(E, COMSIG_PARENT_QDELETING, PROC_REF(ArmyDeath))
 	else

diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/rose_sign.dm b/code/modules/mob/living/simple_animal/abnormality/waw/rose_sign.dm
@@ -426,7 +426,7 @@
 		master.ChangeResistance(flower_damage_type, (master.damage_coeff.getCoeff(flower_damage_type) + 0.3), update = TRUE)
 	if(status_target.has_status_effect(/datum/status_effect/stacking/crownthorns))
 		status_target.remove_status_effect(STATUS_EFFECT_THORNS)
-	..()
+	return ..()
 
 /mob/living/simple_animal/hostile/rose_summoned/combat//mining breach variant
 	maxHealth = 1000

diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/screenwriter.dm b/code/modules/mob/living/simple_animal/abnormality/waw/screenwriter.dm
@@ -69,7 +69,7 @@ Defeating the murderer also surpresses the abnormality.
 	if(A)
 		A.death()
 	EndScenario()
-	..()
+	return ..()
 
 //Work stuff
 /mob/living/simple_animal/hostile/abnormality/screenwriter/AttemptWork(mob/living/carbon/human/user, work_type)

diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/blubbering_toad.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/blubbering_toad.dm
@@ -119,7 +119,7 @@
 	if(breach_type == BREACH_PINK || breach_type == BREACH_MINING)
 		persistant = TRUE
 	if(breach_type == BREACH_MINING)//nerfed to a ZAYIN statline since this is something you'll typically fight roundstart
-		name = "Weakened " + name
+		name = "Weakened [name]"
 		maxHealth = 400
 		melee_damage_lower = 9
 		melee_damage_upper = 15

diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/fairy_festival.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/fairy_festival.dm
@@ -303,7 +303,7 @@
 
 /mob/living/simple_animal/hostile/fairy_mass/AttackingTarget()
 	. = ..()
-	if(ishuman(target))
+	if(iscarbon(target))
 		var/mob/living/L = target
 		if(L.health < 0 || L.stat == DEAD)
 			playsound(get_turf(src), 'sound/magic/demon_consume.ogg', 75, 0)

diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/one_sin.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/one_sin.dm
@@ -140,8 +140,7 @@
 /mob/living/simple_animal/hostile/abnormality/onesin/BreachEffect(mob/living/carbon/human/user, breach_type)
 	if(breach_type == BREACH_MINING)
 		update_icon()
-		..()
-		return
+		return ..()
 	return FALSE // If someone wants him to breach for SOME REASON in the future, then exclude breach_type == BREACH_PINK
 
 /mob/living/simple_animal/hostile/abnormality/onesin/AttackingTarget()