Merge pull request #10125 from Ghommie/Ghommie-cit449

Ports a few projectile code updates by ke:b:inz.
2020-01-17 15:15:08 -07:00
parent 32c496f70e 02fbbd4f95
commit aea0de30d1
81 changed files with 304 additions and 235 deletions
@@ -90,6 +90,7 @@
 		return ..()
 	if(istype(Proj , /obj/item/projectile/energy/floramut))
 		mutate()
+		return BULLET_ACT_HIT
 	else if(istype(Proj , /obj/item/projectile/energy/florayield))
 		return myseed.bullet_act(Proj)
 	else
@@ -145,6 +145,7 @@ obj/item/seeds/proc/is_gene_forbidden(typepath)
 			adjust_yield(1 * rating)
 		else if(prob(1/(yield * yield) * 100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2...
 			adjust_yield(1 * rating)
+		return BULLET_ACT_HIT
 	else
 		return ..()