diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index eda9803c8784..edb86c204558 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -8,7 +8,7 @@ icon_state = "Egg Growing" density = FALSE anchored = TRUE - layer = LYING_BETWEEN_MOB_LAYER //to stop hiding eggs under corpses + layer = LYING_BETWEEN_MOB_LAYER health = 80 plane = GAME_PLANE var/list/egg_triggers = list() diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index b9304b33b15a..e4cc7bd39fe0 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -102,6 +102,16 @@ to_chat(user, SPAN_XENOWARNING("[src] can only be planted on [lowertext(hive.prefix)]hive weeds.")) return + if(istype(get_area(T), /area/vehicle)) + to_chat(user, SPAN_XENOWARNING("[src] cannot be planted inside a vehicle.")) + return + + for(var/obj/object in T.contents) + var/obj/effect/alien/egg/xeno_egg = /obj/effect/alien/egg + if(object.layer > initial(xeno_egg.layer)) + to_chat(user, SPAN_XENOWARNING("[src] cannot be planted below objects that would obscure it.")) + return + user.visible_message(SPAN_XENONOTICE("[user] starts planting [src]."), SPAN_XENONOTICE("You start planting [src]."), null, 5) var/plant_time = 35