resolve merge conflicts hopefully

cmss13-devs · Jul 20, 2023 · 249e0f8 · 249e0f8
1 parent f604b06
commit 249e0f8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm
@@ -76,7 +76,7 @@
 
 /obj/item/alien_embryo/proc/process_growth(delta_time)
 	var/datum/hive_status/hive = GLOB.hive_datum[hivenumber]
-	//The total time the person is hugged divided by stages until burst
+	/// The total time the person is hugged divided by stages until burst
 	var/per_stage_hugged_time = CONFIG_GET(number/embryo_burst_timer) / 5
 	//Low temperature seriously hampers larva growth (as in, way below livable), so does stasis
 	if(!hive.hardcore) // Cannot progress if the hive has entered hardcore mode.
@@ -86,7 +86,7 @@
 			if(stage == 4) // Stasis affects late-stage less
 				counter += 0.11 * hive.larva_gestation_multiplier * delta_time
 		else if(HAS_TRAIT(affected_mob, TRAIT_NESTED)) //Hosts who are nested in resin nests provide an ideal setting, larva grows faster
-				counter += 1.5 * hive.larva_gestation_multiplier * delta_time //Currently twice as much, can be changed
+			counter += 1.5 * hive.larva_gestation_multiplier * delta_time //Currently twice as much, can be changed
 		else
 			if(stage < 5)
 				counter += 1 * hive.larva_gestation_multiplier * delta_time