fix (#5275)

Fluffy-Frontier · Jan 8, 2025 · 17a95ab · 17a95ab
1 parent 6e9a912
commit 17a95ab
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 4 deletions.
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
@@ -344,12 +344,18 @@
 	var/obj/item/clothing/mask/facehugger/child
 	///Proximity monitor associated with this atom, needed for proximity checks.
 	var/datum/proximity_monitor/proximity_monitor
+	// FLUFFY FRONTIER ADDITION BEGIN - TGMC_XENOS
+	var/child_path = /obj/item/clothing/mask/facehugger
+	// FLUFFY FRONTIER ADDITION END
 
 /obj/structure/alien/egg/Initialize(mapload)
 	. = ..()
 	update_appearance()
 	if(status == GROWING || status == GROWN)
-		child = new(src)
+		// FLUFFY FRONTIER EDIT BEGIN - TGMC_XENOS
+		// ORIGINAL LINE: child = new(src)
+		child = new child_path(src)
+		// FLUFFY FRONTIER EDIT END
 	if(status == GROWING)
 		addtimer(CALLBACK(src, PROC_REF(Grow)), rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
 	proximity_monitor = new(src, status == GROWN ? 1 : 0)

diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -11,6 +11,9 @@
 	var/bursting = FALSE
 	/// How long does it take to advance one stage? Growth time * 5 = how long till we make a Larva!
 	var/growth_time = 60 SECONDS
+	// FLUFFY FRONTIER ADDITION BEGIN - TGMC_XENOS
+	var/larva_path = /mob/living/carbon/alien/larva
+	// FLUFFY FRONTIER ADDITION END
 
 /obj/item/organ/body_egg/alien_embryo/Initialize(mapload)
 	. = ..()
@@ -118,7 +121,10 @@
 	owner.add_overlay(overlay)
 
 	var/atom/xeno_loc = get_turf(owner)
-	var/mob/living/carbon/alien/larva/new_xeno = new(xeno_loc)
+	// FLUFFY FRONTIER EDIT BEGIN - TGMC_XENOS
+	// ORIGINAL LINES: var/mob/living/carbon/alien/larva/new_xeno = new(xeno_loc)
+	var/mob/living/carbon/alien/larva/new_xeno = new larva_path(xeno_loc)
+	// FLUFFY FRONTIER EDIT END
 	new_xeno.key = ghost.key
 	SEND_SOUND(new_xeno, sound('sound/mobs/non-humanoids/hiss/hiss5.ogg',0,0,0,100)) //To get the player's attention
 	new_xeno.add_traits(list(TRAIT_HANDS_BLOCKED, TRAIT_IMMOBILIZED, TRAIT_NO_TRANSFORM), type) //so we don't move during the bursting animation

diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -31,6 +31,9 @@
 	var/strength = 5
 
 	var/attached = 0
+	// FLUFFY FRONTIER ADDITION BEGIN - TGMC_XENOS
+	var/embryo_path = /obj/item/organ/body_egg/alien_embryo
+	// FLUFFY FRONTIER ADDITION END
 
 /obj/item/clothing/mask/facehugger/Initialize(mapload)
 	. = ..()
@@ -214,7 +217,10 @@
 
 		var/obj/item/bodypart/chest/LC = target.get_bodypart(BODY_ZONE_CHEST)
 		if((!LC || IS_ORGANIC_LIMB(LC)) && !target.get_organ_by_type(/obj/item/organ/body_egg/alien_embryo))
-			new /obj/item/organ/body_egg/alien_embryo(target)
+			// FLUFFY FRONTIER EDIT BEGIN - TGMC_XENOS
+			// ORIGINAL LINE: new /obj/item/organ/body_egg/alien_embryo(target)
+			new embryo_path(target)
+			// FLUFFY FRONTIER EDIT END
 			target.log_message("was impregnated by a facehugger", LOG_GAME)
 			target.log_message("was impregnated by a facehugger", LOG_VICTIM, log_globally = FALSE)
 			if(target.stat != DEAD && istype(target.buckled, /obj/structure/bed/nest)) //Handles toggling the nest sustenance status effect if the user was already buckled to a nest.

diff --git a/tff_modular/modules/tgmc_xenos/code/alien_egg.dm b/tff_modular/modules/tgmc_xenos/code/alien_egg.dm
@@ -0,0 +1,14 @@
+/obj/item/organ/alien/eggsac/tgmc
+	actions_types = list(/datum/action/cooldown/alien/make_structure/lay_egg/tgmc)
+
+/datum/action/cooldown/alien/make_structure/lay_egg/tgmc
+	made_structure_type = /obj/structure/alien/egg/tgmc
+
+/obj/structure/alien/egg/tgmc
+	child_path = /obj/item/clothing/mask/facehugger/tgmc
+
+/obj/item/clothing/mask/facehugger/tgmc
+	embryo_path = /obj/item/organ/body_egg/alien_embryo/tgmc
+
+/obj/item/organ/body_egg/alien_embryo/tgmc
+	larva_path = /mob/living/carbon/alien/larva/tgmc
diff --git a/tff_modular/modules/tgmc_xenos/code/xeno_types/queen.dm b/tff_modular/modules/tgmc_xenos/code/xeno_types/queen.dm
@@ -26,7 +26,7 @@
 	organs += new /obj/item/organ/alien/plasmavessel/large/queen
 	organs += new /obj/item/organ/alien/resinspinner
 	organs += new /obj/item/organ/alien/neurotoxin/queen
-	organs += new /obj/item/organ/alien/eggsac
+	organs += new /obj/item/organ/alien/eggsac/tgmc
 	..()
 
 /mob/living/carbon/alien/adult/tgmc/queen/alien_talk(message, shown_name = name)

diff --git a/tgstation.dme b/tgstation.dme
@@ -8919,6 +8919,7 @@
 #include "tff_modular\modules\smites\femboyfication.dm"
 #include "tff_modular\modules\snowfall\snowfall.dm"
 #include "tff_modular\modules\streletz\code\clothing.dm"
+#include "tff_modular\modules\tgmc_xenos\code\alien_egg.dm"
 #include "tff_modular\modules\tgmc_xenos\code\base_nova_xeno.dm"
 #include "tff_modular\modules\tgmc_xenos\code\human_defense.dm"
 #include "tff_modular\modules\tgmc_xenos\code\larva.dm"