Xenomorph Overhaul and fixes from Gurgstation

code/game/objects/effects/alien/aliens.dm

@@ -203,6 +203,7 @@
 	layer = ABOVE_TURF_LAYER+0.01
 	light_range = NODERANGE
 	light_on = TRUE
+	light_color = "#673972"
 
 	var/node_range = NODERANGE
 	var/set_color = "#321D37"
@@ -421,4 +422,135 @@
 			visible_message("<span class='alium'>[src.target] begins to crumble under the acid!</span>")
 	spawn(rand(150, 200)) tick()
 
+<<<<<<< HEAD
 //CHOMPedit old eggs removed
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+/*
+ * Egg
+ */
+/var/const //for the status var
+	BURST = 0
+	BURSTING = 1
+	GROWING = 2
+	GROWN = 3
+
+	MIN_GROWTH_TIME = 1800 //time it takes to grow a hugger
+	MAX_GROWTH_TIME = 3000
+
+/obj/effect/alien/egg
+	desc = "It looks like a weird egg"
+	name = "egg"
+//	icon_state = "egg_growing" // So the egg looks 'grown', even though it's not.
+	icon_state = "egg"
+	density = FALSE
+	anchored = TRUE
+
+	var/health = 100
+	var/status = BURST //can be GROWING, GROWN or BURST; all mutually exclusive
+
+/obj/effect/alien/egg/New()
+/*
+	if(config.aliens_allowed)
+		..()
+		spawn(rand(MIN_GROWTH_TIME,MAX_GROWTH_TIME))
+			Grow()
+	else
+		qdel(src)
+*/
+/obj/effect/alien/egg/attack_hand(user as mob)
+
+	var/mob/living/carbon/M = user
+	if(!istype(M) || !(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs))
+		return attack_hand(user)
+
+	switch(status)
+		if(BURST)
+			to_chat(user, "<span class='warning'>You clear the hatched egg.</span>")
+			qdel(src)
+			return
+/*		if(GROWING)
+			to_chat(user, "<span class='warning'>The child is not developed yet.</span>")
+			return
+		if(GROWN)
+			to_chat(user, "<span class='warning'>You retrieve the child.</span>")
+			Burst(0)
+			return
+
+/obj/effect/alien/egg/proc/GetFacehugger() // Commented out for future edit.
+	return locate(/obj/item/clothing/mask/facehugger) in contents
+
+/obj/effect/alien/egg/proc/Grow()
+	icon_state = "egg"
+//	status = GROWN
+	status = BURST
+//	new /obj/item/clothing/mask/facehugger(src)
+	return
+*/
+/obj/effect/alien/egg/proc/Burst(var/kill = 1) //drops and kills the hugger if any is remaining
+	if(status == GROWN || status == GROWING)
+//		var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
+		icon_state = "egg_hatched"
+/*		flick("egg_opening", src)
+		status = BURSTING
+		spawn(15)
+			status = BURST
+			child.loc = get_turf(src)
+
+			if(kill && istype(child))
+				child.Die()
+			else
+				for(var/mob/M in range(1,src))
+					if(CanHug(M))
+						child.Attach(M)
+						break
+*/
+/obj/effect/alien/egg/bullet_act(var/obj/item/projectile/Proj)
+	health -= Proj.damage
+	..()
+	healthcheck()
+	return
+
+/obj/effect/alien/egg/attack_generic(var/mob/user, var/damage, var/attack_verb)
+	visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
+	user.do_attack_animation(src)
+	health -= damage
+	healthcheck()
+	return
+
+/obj/effect/alien/egg/take_damage(var/damage)
+	health -= damage
+	healthcheck()
+	return
+
+
+/obj/effect/alien/egg/attackby(var/obj/item/weapon/W, var/mob/user)
+	if(health <= 0)
+		return
+	if(LAZYLEN(W.attack_verb))
+		src.visible_message("<span class='danger'>\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]</span>")
+	else
+		src.visible_message("<span class='danger'>\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
+	var/damage = W.force / 4.0
+
+	if(istype(W, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = W
+
+		if(WT.remove_fuel(0, user))
+			damage = 15
+			playsound(src, 'sound/items/Welder.ogg', 100, 1)
+
+	src.health -= damage
+	src.healthcheck()
+
+
+/obj/effect/alien/egg/proc/healthcheck()
+	if(health <= 0)
+		Burst()
+
+/obj/effect/alien/egg/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > 500 + T0C)
+		health -= 5
+		healthcheck()
+=======
+//Xenomorph Effect egg removed, replaced with Structure Egg.
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul

code/game/objects/structures/alien/alien egg.dm

@@ -0,0 +1,96 @@
+#define MAX_PROGRESS 100
+
+/obj/structure/alien/egg //Gurg Addition, working alien egg structure.
+	desc = "It looks like a weird egg."
+	name = "egg"
+	icon_state = "egg_growing"
+	density = 0
+	anchored = 1
+	var/progress = 0
+
+/obj/structure/alien/egg/Initialize()
+	. = ..()
+	START_PROCESSING(SSobj, src)
+
+/obj/structure/alien/egg/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	. = ..()
+
+/obj/structure/alien/egg/CanUseTopic(var/mob/user)
+	return isobserver(user) ? STATUS_INTERACTIVE : STATUS_CLOSE
+
+/obj/structure/alien/egg/Topic(href, href_list)
+	if(..())
+		return 1
+
+	if(href_list["spawn"])
+		attack_ghost(usr)
+
+/obj/structure/alien/egg/process()
+	progress++
+	if(progress >= MAX_PROGRESS)
+		for(var/mob/observer/dead/O in observer_mob_list)
+			if(O.client)
+				to_chat(O, "<span class='notice'>An alien is ready to hatch at [get_area(src.loc)]! (<a href='byond://?src=\ref[src];spawn=1'>spawn</a>)</span>")
+		STOP_PROCESSING(SSobj, src)
+		update_icon()
+
+/obj/structure/alien/egg/update_icon()
+	if(progress == -1)
+		icon_state = "egg_hatched"
+	else if(progress < MAX_PROGRESS)
+		icon_state = "egg_growing"
+	else
+		icon_state = "egg"
+
+/obj/structure/alien/egg/attack_ghost(var/mob/observer/ghost/user)
+	if(progress == -1) //Egg has been hatched.
+		return
+
+	if(progress < MAX_PROGRESS)
+		to_chat(user, "\The [src] has not yet matured.")
+		return
+
+	if(!user.MayRespawn(1))
+		return
+
+	// Check for bans properly.
+	if(jobban_isbanned(user, "Xenomorph"))
+		to_chat(user, "<span class='danger'>You are banned from playing a Xenomorph.</span>")
+		return
+
+	var/confirm = alert(user, "Are you sure you want to join as a Xenomorph larva?", "Become Larva", "No", "Yes")
+
+	if(!src || confirm != "Yes")
+		return
+
+	if(!user || !user.ckey)
+		return
+
+	if(progress == -1) //Egg has been hatched.
+		to_chat(user, "Too slow...")
+		return
+
+	flick("egg_opening",src)
+	progress = -1 // No harvesting pls.
+	sleep(5)
+
+	if(!src || !user)
+		visible_message("<span class='alium'>\The [src] writhes with internal motion, but nothing comes out.</span>")
+		progress = MAX_PROGRESS // Someone else can have a go.
+		return // What a pain.
+
+	// Create the mob, transfer over key.
+	var/mob/living/carbon/alien/larva/larva = new(get_turf(src))
+	larva.ckey = user.ckey
+	spawn(-1)
+		if(user) qdel(user) // Remove the keyless ghost if it exists.
+
+	visible_message("<span class='alium'>\The [src] splits open with a wet slithering noise, and \the [larva] writhes free!</span>")
+
+	// Turn us into a hatched egg.
+	name = "hatched alien egg"
+	desc += " This one has hatched."
+	update_icon()
+
+#undef MAX_PROGRESS

code/game/objects/structures/alien/alien.dm

@@ -0,0 +1,62 @@
+/obj/structure/alien //Gurg Addition, framework for alien eggs.
+	name = "alien thing"
+	desc = "There's something alien about this."
+	icon = 'icons/mob/alien.dmi'
+	layer = ABOVE_JUNK_LAYER
+	var/health = 50
+
+/obj/structure/alien/proc/healthcheck()
+	if(health <=0)
+		set_density(0)
+		qdel(src)
+	return
+
+/obj/structure/alien/bullet_act(var/obj/item/projectile/Proj)
+	health -= Proj.damage
+	..()
+	healthcheck()
+	return
+
+/obj/structure/alien/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			health-=50
+		if(2.0)
+			health-=50
+		if(3.0)
+			if (prob(50))
+				health-=50
+			else
+				health-=25
+	healthcheck()
+	return
+
+/obj/structure/alien/hitby(AM as mob|obj)
+	..()
+	visible_message("<span class='danger'>\The [src] was hit by \the [AM].</span>")
+	var/tforce = 0
+	if(ismob(AM))
+		tforce = 10
+	else
+		tforce = AM:throwforce
+	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	health = max(0, health - tforce)
+	healthcheck()
+	..()
+	return
+
+/obj/structure/alien/attack_generic()
+	attack_hand(usr)
+
+/obj/structure/alien/attackby(var/obj/item/weapon/W, var/mob/user)
+	health = max(0, health - W.force)
+	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	healthcheck()
+	..()
+	return
+
+/obj/structure/alien/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(air_group) return 0
+	if(istype(mover) && mover.checkpass(PASSGLASS))
+		return !opacity
+	return !density

code/modules/mob/living/carbon/alien/alien.dm

@@ -43,10 +43,18 @@
 /mob/living/carbon/alien/u_equip(obj/item/W as obj)
 	return
 
+<<<<<<< HEAD
 /*/mob/living/carbon/alien/Stat() //CHOMPedit. Commented out because this doesn't work properly for larva, when it should. Will probably give Diona their own kind of they don't have one
 	..()
 	stat(null, "Progress: [amount_grown]/[max_grown]") */
 
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+/mob/living/carbon/alien/Stat()
+	..()
+	stat(null, "Progress: [amount_grown]/[max_grown]")
+
+=======
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 /mob/living/carbon/alien/restrained()
 	return 0
 

code/modules/mob/living/carbon/alien/diona/progression.dm

@@ -1,3 +1,8 @@
+/mob/living/carbon/alien/diona/Stat() //Specified where progression is at, doesn't work right for some things in carbon/alien
+	. = ..()
+	if(. && statpanel("Status"))
+		stat("Growth", "[round(amount_grown)]/[max_grown]")
+
 /mob/living/carbon/alien/diona/confirm_evolution()
 
 	if(!is_alien_whitelisted(src, GLOB.all_species[SPECIES_DIONA]))

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -5,10 +5,23 @@
 	speak_emote = list("hisses")
 	icon_state = "larva"
 	language = "Hivemind"
+<<<<<<< HEAD
 	maxHealth = 50 //CHOMPedit. Larva can gain a little more health on weeds/phoron to make them just a little harder to kill
 	health = 25
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	maxHealth = 25
+	health = 25
+=======
+	maxHealth = 50
+	health = 50
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 	faction = "xeno"
+<<<<<<< HEAD
 	max_grown = 325 //CHOMPedit. Since xenos can reproduce without people now I decided to drastically increase the growth time
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+=======
+	max_grown = 325 //Increase larva growth time due to not needing hosts.
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 
 /mob/living/carbon/alien/larva/Initialize()
 	. = ..()

code/modules/mob/living/carbon/alien/larva/progression.dm

@@ -1,8 +1,17 @@
+<<<<<<< HEAD
 /mob/living/carbon/alien/larva/Stat() //CHOMPedit. Oh thank god we can see how close we are to full grown now
 	. = ..()
 	if(. && statpanel("Status"))
 		stat("Growth", "[round(amount_grown)]/[max_grown]")
 
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+=======
+/mob/living/carbon/alien/larva/Stat() //Specified where progression stats come from, because for some reason it doesn't work right in carbon/alien
+	. = ..()
+	if(. && statpanel("Status"))
+		stat("Growth", "[round(amount_grown)]/[max_grown]")
+
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 /mob/living/carbon/alien/larva/confirm_evolution()
 
 	to_chat(src, "<span class='notice'><b>You are growing into a beautiful alien! It is time to choose a caste.</b></span>")

code/modules/mob/living/carbon/alien/life.dm

@@ -28,7 +28,13 @@
 
 	var/rads = radiation/25
 	radiation -= rads
+<<<<<<< HEAD
 	/*adjust_nutrition(rads)*/ //CHOMPedit. Commented out to prevent xeno/diona obesity, it was a real problem
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	adjust_nutrition(rads)
+=======
+	//adjust_nutrition(rads) //Commented out to prevent alien obesity.
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 	heal_overall_damage(rads,rads)
 	adjustOxyLoss(-(rads))
 	adjustToxLoss(-(rads))

code/modules/mob/living/carbon/human/species/species_attack.dm

@@ -64,11 +64,11 @@
 
 /datum/unarmed_attack/claws/strong/xeno
 	attack_verb = list("slashed", "gouged", "stabbed")
-	damage = 10
+	damage = 15
 
 /datum/unarmed_attack/claws/strong/xeno/queen
 	attack_verb = list("slashed", "gouged", "stabbed", "gored")
-	damage = 15
+	damage = 20
 
 /datum/unarmed_attack/bite/strong
 	attack_name = "strong bite"
@@ -77,7 +77,7 @@
 	shredding = 1
 
 /datum/unarmed_attack/bite/strong/xeno
-	damage = 10
+	damage = 15
 
 /datum/unarmed_attack/slime_glomp
 	attack_name = "glomp"

code/modules/mob/living/carbon/human/species/xenomorphs/alien_embryo.dm

@@ -1,161 +0,0 @@
-// This is to replace the previous datum/disease/alien_embryo for slightly improved handling and maintainability
-// It functions almost identically (see code/datums/diseases/alien_embryo.dm)
-
-/*
-/obj/item/alien_embryo	//Commented out as reference for future reproduction methods, or addition later.
-	name = "alien embryo"
-	desc = "All slimy and yuck."
-	icon = 'icons/mob/alien.dmi'
-	icon_state = "larva0_dead"
-	var/mob/living/affected_mob
-	var/stage = 0
-
-/obj/item/alien_embryo/New()
-	if(istype(loc, /mob/living))
-		affected_mob = loc
-		START_PROCESSING(SSobj, src)
-		spawn(0)
-			AddInfectionImages(affected_mob)
-	else
-		qdel(src)
-
-/obj/item/alien_embryo/Destroy()
-	if(affected_mob)
-		affected_mob.status_flags &= ~(XENO_HOST)
-		spawn(0)
-			RemoveInfectionImages(affected_mob)
-	..()
-
-/obj/item/alien_embryo/process()
-	if(!affected_mob)	return
-	if(loc != affected_mob)
-		affected_mob.status_flags &= ~(XENO_HOST)
-		STOP_PROCESSING(SSobj, src)
-		spawn(0)
-			RemoveInfectionImages(affected_mob)
-			affected_mob = null
-		return
-
-	if(stage < 5 && prob(3))
-		stage++
-		spawn(0)
-			RefreshInfectionImage(affected_mob)
-
-	switch(stage)
-		if(2, 3)
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Mucous runs down the back of your throat.</span>")
-		if(4)
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(2))
-				to_chat(affected_mob, "<span class='danger'> Your muscles ache.</span>")
-				if(prob(20))
-					affected_mob.take_organ_damage(1)
-			if(prob(2))
-				to_chat(affected_mob, "<span class='danger'>Your stomach hurts.</span>")
-				if(prob(20))
-					affected_mob.adjustToxLoss(1)
-					affected_mob.updatehealth()
-		if(5)
-			to_chat(affected_mob, "<span class='danger'>You feel something tearing its way out of your stomach...</span>")
-			affected_mob.adjustToxLoss(10)
-			affected_mob.updatehealth()
-			if(prob(50))
-				AttemptGrow()
-
-/obj/item/alien_embryo/proc/AttemptGrow(var/gib_on_success = 1)
-	var/list/candidates = get_alien_candidates()
-	var/picked = null
-
-	// To stop clientless larva, we will check that our host has a client
-	// if we find no ghosts to become the alien. If the host has a client
-	// he will become the alien but if he doesn't then we will set the stage
-	// to 2, so we don't do a process heavy check everytime.
-
-	if(candidates.len)
-		picked = pick(candidates)
-	else if(affected_mob.client)
-		picked = affected_mob.key
-	else
-		stage = 4 // Let's try again later.
-		return
-
-	if(affected_mob.lying)
-		affected_mob.add_overlay("burst_lie")
-	else
-		affected_mob.add_overlay("burst_stand")
-	spawn(6)
-		var/mob/living/carbon/alien/larva/new_xeno = new(affected_mob.loc)
-		new_xeno.key = picked
-		new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)	//To get the player's attention
-		if(gib_on_success)
-			affected_mob.gib()
-		qdel(src)
-
-/*----------------------------------------
-Proc: RefreshInfectionImage()
-Des: Removes all infection images from aliens and places an infection image on all infected mobs for aliens.
-----------------------------------------*/
-/obj/item/alien_embryo/proc/RefreshInfectionImage()
-
-	for(var/mob/living/carbon/alien in player_list)
-
-		if(!locate(/obj/item/organ/internal/xenos/hivenode) in alien.internal_organs)
-			continue
-
-		if(alien.client)
-			for(var/image/I in alien.client.images)
-				if(dd_hasprefix_case(I.icon_state, "infected"))
-					qdel(I)
-			for(var/mob/living/L in mob_list)
-				if(iscorgi(L) || iscarbon(L))
-					if(L.status_flags & XENO_HOST)
-						var/I = image('icons/mob/alien.dmi', loc = L, icon_state = "infected[stage]")
-						alien.client.images += I
-
-/*----------------------------------------
-Proc: AddInfectionImages(C)
-Des: Checks if the passed mob (C) is infected with the alien egg, then gives each alien client an infected image at C.
-----------------------------------------*/
-/obj/item/alien_embryo/proc/AddInfectionImages(var/mob/living/C)
-	if(C)
-
-		for(var/mob/living/carbon/alien in player_list)
-
-			if(!locate(/obj/item/organ/internal/xenos/hivenode) in alien.internal_organs)
-				continue
-
-			if(alien.client)
-				if(C.status_flags & XENO_HOST)
-					var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[stage]")
-					alien.client.images += I
-
-/*----------------------------------------
-Proc: RemoveInfectionImage(C)
-Des: Removes the alien infection image from all aliens in the world located in passed mob (C).
-----------------------------------------*/
-
-/obj/item/alien_embryo/proc/RemoveInfectionImages(var/mob/living/C)
-
-	if(C)
-
-		for(var/mob/living/carbon/alien in player_list)
-
-			if(!locate(/obj/item/organ/internal/xenos/hivenode) in alien.internal_organs)
-				continue
-
-			if(alien.client)
-				for(var/image/I in alien.client.images)
-					if(I.loc == C)
-						if(dd_hasprefix_case(I.icon_state, "infected"))
-							qdel(I)
-*/

code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm

@@ -79,8 +79,16 @@
 // Queen verbs.
 /mob/living/carbon/human/proc/lay_egg()
 
+<<<<<<< HEAD
 	set name = "Lay Egg (200)" //CHOMPedit changed number value
 	set desc = "Lay an egg that hatch into larva." //CHOMPedit
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	set name = "Lay Egg (75)"
+	set desc = "Lay an egg to produce huggers to impregnate prey with."
+=======
+	set name = "Lay Egg (200)"
+	set desc = "Lay an egg to produce huggers to impregnate prey with."
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 	set category = "Abilities"
 
 	if(!config.aliens_allowed)
@@ -88,13 +96,31 @@
 		verbs -= /mob/living/carbon/human/proc/lay_egg
 		return
 
+<<<<<<< HEAD
 	if(locate(/obj/structure/alien/egg) in get_turf(src)) //CHOMPedit. Changed from obj/effect to obj/structure
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	if(locate(/obj/effect/alien/egg) in get_turf(src))
+=======
+	if(locate(/obj/structure/alien/egg) in get_turf(src))
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 		to_chat(src, "There's already an egg here.")
 		return
 
+<<<<<<< HEAD
 	if(check_alien_ability(200,1,O_EGG)) //CHOMPedit changed plasma cost from 75 to  200
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	if(check_alien_ability(75,1,O_EGG))
+=======
+	if(check_alien_ability(200,1,O_EGG))
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 		visible_message("<span class='alium'><B>[src] has laid an egg!</B></span>")
+<<<<<<< HEAD
 		new /obj/structure/alien/egg(loc) //CHOMPedit. Changed from obj/effect to obj/structure
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+		new /obj/effect/alien/egg(loc)
+=======
+		new /obj/structure/alien/egg(loc)
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 
 	return
 
@@ -144,7 +170,7 @@
 		P.firer = src
 		P.old_style_target(A)
 		P.fire()
-		playsound(src, 'sound/weapons/pierce.ogg', 25, 0)
+		playsound(src, 'sound/weapons/alien_spitacid.ogg', 25, 0)
 
 /mob/living/carbon/human/proc/corrosive_acid(O as obj|turf in oview(1)) //If they right click to corrode, an error will flash if its an invalid target./N
 	set name = "Corrosive Acid (200)"
@@ -329,7 +355,13 @@
 
 /mob/living/carbon/human/proc/gut()
 	set category = "Abilities"
+<<<<<<< HEAD
 	set name = "Slaughter" //CHOMPedit renamed Gut to Slaughter so its more obvious what it does
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	set name = "Gut"
+=======
+	set name = "Slaughter"
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 	set desc = "While grabbing someone aggressively, rip their guts out or tear them apart."
 
 	if(last_special > world.time)
@@ -345,7 +377,13 @@
 		return
 
 	if(G.state < GRAB_AGGRESSIVE)
+<<<<<<< HEAD
 		to_chat(src, "<span class='danger'>You must have an aggressive grab to slaughter your prey!</span>") //CHOMPedit
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+		to_chat(src, "<span class='danger'>You must have an aggressive grab to gut your prey!</span>")
+=======
+		to_chat(src, "<span class='danger'>You must have an aggressive grab to slaughter your prey!</span>")
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 		return
 
 	last_special = world.time + 50

code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm

@@ -25,8 +25,16 @@
 	siemens_coefficient = 0
 	gluttonous = 2
 
+<<<<<<< HEAD
 	brute_mod = 0.65 //CHOMPedit. Edited brute vulnerability
 	burn_mod = 1.50  //CHOMPedit. Edited burn vulnerability
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	brute_mod = 0.5 // Hardened carapace.
+	burn_mod = 2    // Weak to fire.
+=======
+	brute_mod = 0.6 // Hardened carapace.
+	burn_mod = 1.75    // Weak to fire.
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 
 	warning_low_pressure = 50
 	hazard_low_pressure = -1
@@ -44,7 +52,13 @@
 	flesh_color = "#282846"
 	gibbed_anim = "gibbed-a"
 	dusted_anim = "dust-a"
+<<<<<<< HEAD
 	death_message = "lets out a piercing multi-toned screech, green blood bubbling from its maw as it ceases." //CHOMPedit. Changed message.
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	death_message = "lets out a waning guttural screech, green blood bubbling from its maw."
+=======
+	death_message = "lets out a guttural screech, green blood bubbling from its maw."
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 	death_sound = 'sound/voice/hiss6.ogg'
 
 	damage_overlays = null //CHOMPedit. They don't have overlays yet, if someone wants to add some then be my guest
@@ -52,13 +66,22 @@
 	blood_mask = null //CHOMPedit.
 
 	speech_sounds = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
-	speech_chance = 100
+	speech_chance = 75
 
 	virus_immune = 1
 
 	breath_type = null
 	poison_type = null
 
+<<<<<<< HEAD
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	vision_flags = SEE_SELF|SEE_MOBS
+
+=======
+	vision_flags = SEE_SELF|SEE_MOBS|SEE_TURFS
+	darksight = 10
+
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 	has_organ = list(
 		O_HEART =    /obj/item/organ/internal/heart,
 		O_BRAIN =    /obj/item/organ/internal/brain/xeno,
@@ -96,7 +119,13 @@
 	return SPECIES_GENA //CHOMPedit
 
 /datum/species/xenos/get_random_name()
+<<<<<<< HEAD
 	return "Genaprawn [caste_name] ([alien_number])" //CHOMPedit
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	return "alien [caste_name] ([alien_number])"
+=======
+	return "xenomorph [caste_name] ([alien_number])"
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 
 /datum/species/xenos/can_understand(var/mob/other)
 	if(istype(other, /mob/living/carbon/alien/larva))
@@ -114,7 +143,13 @@
 		H.mind.special_role = "Alien"
 
 	alien_number++ //Keep track of how many aliens we've had so far.
+<<<<<<< HEAD
 	H.real_name = "Genaprawn [caste_name] ([alien_number])" //CHOMPedit
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	H.real_name = "alien [caste_name] ([alien_number])"
+=======
+	H.real_name = "xenomorph [caste_name] ([alien_number])"
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 	H.name = H.real_name
 
 	..()
@@ -167,7 +202,20 @@
 			return 1
 
 	return 0
+<<<<<<< HEAD
 //CHOMPedit removed infection images, since they do not exist anymore.
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+/*
+/datum/species/xenos/handle_login_special(var/mob/living/carbon/human/H)
+	H.AddInfectionImages()
+	..()
+
+/datum/species/xenos/handle_logout_special(var/mob/living/carbon/human/H)
+	H.RemoveInfectionImages()
+	..()
+*/
+=======
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 
 /datum/species/xenos/drone
 	name = SPECIES_GENA_DRONE //CHOMPedit
@@ -213,7 +261,7 @@
 	name = SPECIES_GENA_HUNTER //CHOMPedit
 	weeds_plasma_rate = 5
 	caste_name = "hunter"
-	slowdown = -2
+	slowdown = -1
 	total_health = 150
 	tail = null //CHOMPedit. Set to null
 
@@ -273,13 +321,29 @@
 
 /datum/species/xenos/queen
 
+<<<<<<< HEAD
 	name = SPECIES_GENA_QUEEN //CHOMPedit
 	total_health = 300 //CHOMPedit. Queen is chonk
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	name = SPECIES_XENO_QUEEN
+	total_health = 250
+=======
+	name = SPECIES_XENO_QUEEN
+	total_health = 300
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 	weeds_heal_rate = 5
 	weeds_plasma_rate = 20
 	caste_name = "queen"
+<<<<<<< HEAD
 	slowdown = 4
 	tail = null //CHOMPedit. Set to null
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	slowdown = 4
+	tail = "xenos_queen_tail"
+=======
+	slowdown = 3
+	tail = "xenos_queen_tail"
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 	rarity_value = 10
 
 	icobase = 'icons/mob/human_races/xenos/r_xenos_queen.dmi'
@@ -317,10 +381,22 @@
 	..()
 	// Make sure only one official queen exists at any point.
 	if(!alien_queen_exists(1,H))
+<<<<<<< HEAD
 		H.real_name = "Genaprawn queen ([alien_number])" //CHOMPedit
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+		H.real_name = "alien queen ([alien_number])"
+=======
+		H.real_name = "xenomorph queen ([alien_number])"
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 		H.name = H.real_name
 	else
+<<<<<<< HEAD
 		H.real_name = "Genaprawn princess ([alien_number])" //CHOMPedit
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+		H.real_name = "alien princess ([alien_number])"
+=======
+		H.real_name = "xenomorph princess ([alien_number])"
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 		H.name = H.real_name
 
 /datum/hud_data/alien
@@ -341,4 +417,10 @@
 	gear = list(
 		"storage1" =     list("loc" = ui_storage1,  "name" = "Left Pocket",  "slot" = slot_l_store,   "state" = "pocket"),
 		"storage2" =     list("loc" = ui_storage2,  "name" = "Right Pocket", "slot" = slot_r_store,   "state" = "pocket"),
+<<<<<<< HEAD
 		) //CHOMPedit removed head and outer layer item slots, since they caused a slew of problems with xenomorphs
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+		)
+=======
+		) //Removed hat and outer slots, it caused too many problems that required admin intervention.
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul

code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm

@@ -25,7 +25,43 @@
 /mob/living/carbon/human/xqueen/New(var/new_loc)
 	h_style = "Bald"
 	faction = "xeno"
+<<<<<<< HEAD
 	..(new_loc, SPECIES_GENA_QUEEN) //CHOMPedit
 
 //CHOMPedit. Removed AddInfectionImages code, due to it being commented out and not used
 
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+	..(new_loc, SPECIES_XENO_QUEEN)
+
+// I feel like we should generalize/condense down all the various icon-rendering antag procs.
+/*----------------------------------------
+Proc: AddInfectionImages()
+Des: Gives the client of the alien an image on each infected mob.
+----------------------------------------*/
+/*
+/mob/living/carbon/human/proc/AddInfectionImages()
+	if (client)
+		for (var/mob/living/C in mob_list)
+			if(C.status_flags & XENO_HOST)
+				var/obj/item/alien_embryo/A = locate() in C
+				var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[A.stage]")
+				client.images += I
+	return
+*/
+/*----------------------------------------
+Proc: RemoveInfectionImages()
+Des: Removes all infected images from the alien.
+----------------------------------------*/
+/*
+/mob/living/carbon/human/proc/RemoveInfectionImages()
+	if (client)
+		for(var/image/I in client.images)
+			if(dd_hasprefix_case(I.icon_state, "infected"))
+				qdel(I)
+	return
+*/
+=======
+	..(new_loc, SPECIES_XENO_QUEEN)
+
+//Removed AddInfectionImages, no longer required.
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul

code/modules/projectiles/projectile/energy.dm

@@ -144,17 +144,21 @@
 	agony = 10
 	check_armour = "bio"
 	armor_penetration = 25	// It's acid
+	hitsound_wall = 'sound/weapons/effects/alien_spit_wall.ogg'
+	hitsound = 'sound/weapons/effects/alien_spit_wall.ogg'
 
 	combustion = FALSE
 
 /obj/item/projectile/energy/neurotoxin
 	name = "neurotoxic spit"
 	icon_state = "neurotoxin"
-	damage = 5
+	damage = 0
 	damage_type = BIOACID
 	agony = 60 //CHOMPedit lowered agony damage
 	check_armour = "bio"
 	armor_penetration = 25	// It's acid-based
+	hitsound_wall = 'sound/weapons/effects/alien_spit_wall.ogg'
+	hitsound = 'sound/weapons/effects/alien_spit_wall.ogg'
 
 	combustion = FALSE
 

code/modules/surgery/organs_internal.dm

@@ -14,7 +14,12 @@
 		return 0
 	return affected && affected.open == (affected.encased ? 3 : 2)
 
+<<<<<<< HEAD
 //CHOMPedit. Removed unused embryo surgery
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+=======
+//Removed unused Embryo Surgery, derelict and broken.
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 
 //////////////////////////////////////////////////////////////////
 //				CHEST INTERNAL ORGAN SURGERY					//

maps/submaps/pois_vr/debris_field/derelict.dmm

@@ -870,7 +870,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/submap/debrisfield/derelict/interior)
 "cF" = (
-/obj/effect/alien/egg,
 /obj/effect/alien/weeds,
 /turf/simulated/floor/tiled/dark,
 /area/submap/debrisfield/derelict/interior)

maps/submaps/pois_vr/debris_field/new_escapepod_xeno.dmm

@@ -66,7 +66,6 @@
 /area/submap/debrisfield/misc_debris)
 "W" = (
 /obj/effect/alien/weeds,
-/obj/effect/alien/egg,
 /turf/simulated/floor/airless,
 /area/submap/debrisfield/misc_debris)
 "X" = (

maps/submaps/surface_submaps/mountains/crashed_ufo_frigate.dmm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 "aa" = (/turf/template_noop,/area/template_noop)
 "ab" = (/turf/simulated/shuttle/wall/alien,/area/submap/cave/crashed_ufo_frigate)
 "ac" = (/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
@@ -152,3 +153,314 @@ aaaaaabGaxaxadbGaaaaabababacapapapcgapcgapalalalabababaaaaaaadadadadadaxbGaaaa
 aaaaaaaaaaaxaxadadaaaaaaababababakchaHchakababababaaaaaaadadaxaxbGaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaabGadaaaaaaaaaaaaaaaaaaaa
 "}
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+"aa" = (/turf/template_noop,/area/template_noop)
+"ab" = (/turf/simulated/shuttle/wall/alien,/area/submap/cave/crashed_ufo_frigate)
+"ac" = (/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ad" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
+"ae" = (/obj/effect/alien/egg,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"af" = (/mob/living/simple_mob/animal/space/alien/drone,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ag" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"ah" = (/obj/structure/table/alien,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"ai" = (/obj/machinery/artifact,/obj/effect/alien/weeds/node,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aj" = (/obj/random/outcrop,/turf/simulated/floor/outdoors/ice,/area/template_noop)
+"ak" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"al" = (/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"am" = (/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"an" = (/obj/structure/window/phoronreinforced,/obj/effect/alien/egg,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ao" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ap" = (/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"aq" = (/obj/structure/prop/alien/pod/open,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"ar" = (/obj/effect/alien/weeds/node,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"as" = (/obj/structure/prop/alien/pod/open,/obj/random/tech_supply/component,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"at" = (/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"au" = (/obj/machinery/door/airlock/alien/locked,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"av" = (/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"aw" = (/obj/structure/prop/alien/pod/open,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ax" = (/turf/simulated/floor/outdoors/ice,/area/template_noop)
+"ay" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"az" = (/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aA" = (/obj/effect/alien/weeds/node,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aB" = (/obj/structure/loot_pile/surface/alien/medical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aC" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"aD" = (/obj/structure/table/alien,/obj/random/tech_supply/component,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"aE" = (/obj/structure/prop/alien/pod/open,/obj/random/tech_supply/component,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"aF" = (/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aG" = (/obj/machinery/vr_sleeper/alien/random_replicant,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aH" = (/obj/structure/prop/alien/pod,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aI" = (/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aJ" = (/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aK" = (/obj/structure/table/alien,/obj/random/tech_supply/component,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aL" = (/obj/structure/table/alien,/obj/item/clothing/under/psysuit,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aM" = (/obj/structure/prop/alien/computer/camera,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aN" = (/obj/structure/prop/alien/computer/camera/flipped,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aO" = (/obj/structure/simple_door/resin,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aP" = (/obj/structure/prop/alien/power,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aQ" = (/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/drone,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aR" = (/obj/effect/alien/weeds/node,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"aS" = (/obj/structure/table/alien,/obj/random/tool/alien,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"aT" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"aU" = (/obj/machinery/replicator,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aV" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/drug_den,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aW" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/under/psysuit,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aX" = (/obj/structure/prop/alien/computer/camera/flipped{icon_state = "camera_flipped"; dir = 4},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aY" = (/obj/structure/prop/alien/computer/camera{icon_state = "camera"; dir = 8},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aZ" = (/obj/machinery/porta_turret/alien/destroyed,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ba" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/scientific,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bb" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/nanites,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bc" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/fresh_medicine,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bd" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/viral,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"be" = (/obj/machinery/door/blast/puzzle,/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bf" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bg" = (/obj/structure/prop/lock/projectile,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bh" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/old_medicine,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bi" = (/obj/structure/prop/alien/dispenser,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bj" = (/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bk" = (/mob/living/simple_mob/animal/space/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bl" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/under/psysuit,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bm" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien,/obj/item/weapon/paper/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bn" = (/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bo" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bp" = (/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bq" = (/obj/machinery/implantchair,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"br" = (/obj/structure/prop/alien/computer{icon_state = "console-c"; dir = 8},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bs" = (/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/sentinel/praetorian,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bt" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bu" = (/obj/structure/loot_pile/surface/drone,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bv" = (/obj/item/weapon/surgical/bone_clamp/alien,/obj/structure/closet/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bw" = (/obj/structure/prop/alien/computer,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bx" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/accessory/medal/dungeon/alien_ufo{desc = "It vaguely like a star. It looks like something an alien admiral might've worn. Probably."; name = "alien admiral's medal"},/obj/item/weapon/telecube/precursor/mated/zone,/obj/item/clothing/head/helmet/alien/tank,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"by" = (/obj/structure/loot_pile/mecha/gygax/dark,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bz" = (/obj/structure/mopbucket,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bA" = (/obj/item/brokenbug,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
+"bB" = (/mob/living/simple_mob/animal/space/alien/sentinel,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bC" = (/obj/structure/prop/alien/computer/camera/flipped{icon_state = "camera_flipped"; dir = 4},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bD" = (/obj/structure/prop/alien/computer/camera{icon_state = "camera"; dir = 8},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bE" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bF" = (/obj/structure/prop/blackbox/xenofrigate,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bG" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
+"bH" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bI" = (/obj/structure/table/alien,/obj/structure/loot_pile/surface/alien/medical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bJ" = (/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bK" = (/obj/structure/table/alien,/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bL" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/item/device/gps/internal/poi,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bM" = (/obj/structure/window/phoronreinforced{dir = 4},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bN" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bO" = (/obj/structure/table/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bP" = (/obj/structure/table/alien,/obj/item/weapon/weldingtool/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bQ" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bR" = (/obj/structure/table/alien,/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bS" = (/obj/structure/closet/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bT" = (/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bU" = (/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 4},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bV" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced,/obj/item/weapon/paper/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bW" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bX" = (/mob/living/simple_mob/animal/space/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bY" = (/obj/structure/foamedmetal,/obj/machinery/door/airlock/alien/locked,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bZ" = (/obj/structure/foamedmetal,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"ca" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"cb" = (/obj/structure/prop/alien/power,/obj/structure/foamedmetal,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"cc" = (/obj/structure/loot_pile/surface/alien/end,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"cd" = (/obj/item/prop/alien/junk,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"ce" = (/obj/random/tech_supply/component,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"cf" = (/obj/random/tech_supply/component,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"cg" = (/obj/machinery/door/airlock/alien/public,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"ch" = (/turf/simulated/shuttle/wall/alien/hard_corner,/area/submap/cave/crashed_ufo_frigate)
+
+(1,1,1) = {"
+aaaaaaaxbGaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaxaxadaxaxbGaaaaaaaaababababacaeacafaeababababaaaaaaajaxadaaaaadaxajaaaaaa
+adbGadadadadaxaxaaaaabababagahababacaiacababacakabababaaaaadaxadadaxaxaaaaaaaa
+aaaxaxadadadadaaaaababacalalahahabamamanabacacacacaoababaaaaadbGadadaaaaaaaaaa
+aaaaaaadbGadaaaaababaoacacalapapchalalalchapapaqaracasababaaaaaaadadadaxaxadaa
+aaaaadadadaaaaababaoacacapapapapatalapapauapapapavalacawababaaaaaaadadadaxajaa
+aaadadaxaaaaababaoacayapapapalalchazacaAchaAaBapapaCacacawababaaaaaxadadadaaaa
+aaaxaxaaaaababaoacalalapapahaDabababazababababawapapaEacacaBababaaaxadaaaaaaaa
+adbGaxaaaaabacacalalapapacaFababaGabababaHabababaIapapaqaAacakabaaajaxaaaaaaaa
+aaadaaaaababacacaFapapacacaFabaGacaGabaHalalaJacacacapapacacabababaaaxaaaaaaaa
+aaadaaaaabakacacaKapapacacacababaJababawacacchabacaAapapacababaIabaaaaaaaaaaaa
+aaaaaaababababaFaFapalalacacaJacacakabaLacaLabababacapapababaIacababaaaaaaaaaa
+aaaaaaabaMaNabababalalacacacababaOababaLacaLababababchatchaFalacaPabaaaaaaaaaa
+aaaaaaabaFacakacchauchaoacacabaeaQaeabaLacaLabababakapaRabaSalacaPabadaxaaaaaa
+aaaaaaabaFacalalapalababaTalababaeabababawababaMaFacapapabahalacaPabadadaaaaaa
+aaaaababaFalalapapapacababalaTabababakabababaUacaFacapapatacacababababadaxaaaa
+aaaaabaVacapapapapacacakababababacacaWaAacababacacapapapabavababacacabadaxaaaa
+aaaaabacapapapapacacacacabababaXacaFaFahalaYababchaRapacabababaZacacabadadadaa
+adaaabbaapapacalbbalbcacbdabacacapalalalapapapapbeapacacaIabalalacapchaZadadaa
+adaaabalapabababababababababapapapapapapapapapapchaFacbfababbgacapapatacadbAaa
+adaaabbhalabbiawabbiapaFabapapaRbjbkacacacaparblabbmacaFabacacapapapchaZadadaa
+axaaabalbnbobpacabbiapbqchapalalalaFaFaFacacapalabbfacbmabacapapapalabadadaxaa
+axaaabalbnbnbnbrabbibsapatapalagabababababakapapabbtaAbuabalapapalalabadadaxaa
+aaadababaFbnapbvababaFaFchapalababbwbxbwababapapabbyacbzabalalapacababadadaaaa
+aaaaaaabaFapbBacaYababababapapabbCapapapbDabapapabbEbFbHabalalapacabadaxaaaaaa
+aaaaaaabaFapapalalalalababapapabapapaRapapabapapabababababalapapalabadaaaaaaaa
+axaaaaabbIaFapapbpalalabacalapbJapbKbLbfapbMapapacabacakbNapapalalabaaaaaaaaaa
+axadaaababaFapbnbnacacabagalapbJbOaFapbPbObMapapakabacacbQapapalababaaaaaaaaaa
+adbGadaaabbIbRbnapapbSabalalapbTapaRapapalbUapapacabacbVbWapacalabaaaaaaaaaaaa
+aaaxaxaaababaFacapapbSababalaRapapapbXalalalaRacababacapapacakababaaaaaaaaaaaa
+aaaaaxaaaaabbIaFapapapbSabalapapapapapapapapapacabacapapapacacabaaaaaaaaadadaa
+aaaaaaaaaaabababchbYchabababbfbOapapapapapbObfabababchatchabababaaaaaaadbGadaa
+aaadaaaaaaaaababbZbZbnapacababaFahalagarcaaFababacapapapacababaaaaaaadadadadaa
+aaadaxajaaaaaaababcbbZapapalabababccabccabababacapapapaPababaaaaaaadadadadaaaa
+aaadadaxaxbGaaaaababbZapapcdalalabababababacapapapapacababaaaaaaaxaxadadadadaa
+aaaaadadadadadaaaaababaPacapapalalchapchceapapalcfaPababaaaaaabGadadadaxaxadaa
+aaaaaabGaxaxadbGaaaaabababacapapapcgapcgapalalalabababaaaaaaadadadadadaxbGaaaa
+aaaaaaaaaaaxaxadadaaaaaaababababakchaHchakababababaaaaaaadadaxaxbGaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaabGadaaaaaaaaaaaaaaaaaaaa
+"}
+=======
+"aa" = (/turf/template_noop,/area/template_noop)
+"ab" = (/turf/simulated/shuttle/wall/alien,/area/submap/cave/crashed_ufo_frigate)
+"ac" = (/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ad" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
+"ae" = (/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"af" = (/mob/living/simple_mob/animal/space/alien/drone,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ag" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"ah" = (/obj/structure/table/alien,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"ai" = (/obj/machinery/artifact,/obj/effect/alien/weeds/node,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aj" = (/obj/random/outcrop,/turf/simulated/floor/outdoors/ice,/area/template_noop)
+"ak" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"al" = (/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"am" = (/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"an" = (/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ao" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ap" = (/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"aq" = (/obj/structure/prop/alien/pod/open,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"ar" = (/obj/effect/alien/weeds/node,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"as" = (/obj/structure/prop/alien/pod/open,/obj/random/tech_supply/component,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"at" = (/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"au" = (/obj/machinery/door/airlock/alien/locked,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"av" = (/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"aw" = (/obj/structure/prop/alien/pod/open,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ax" = (/turf/simulated/floor/outdoors/ice,/area/template_noop)
+"ay" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"az" = (/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aA" = (/obj/effect/alien/weeds/node,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aB" = (/obj/structure/loot_pile/surface/alien/medical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aC" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"aD" = (/obj/structure/table/alien,/obj/random/tech_supply/component,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"aE" = (/obj/structure/prop/alien/pod/open,/obj/random/tech_supply/component,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"aF" = (/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aG" = (/obj/machinery/vr_sleeper/alien/random_replicant,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aH" = (/obj/structure/prop/alien/pod,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aI" = (/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aJ" = (/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aK" = (/obj/structure/table/alien,/obj/random/tech_supply/component,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aL" = (/obj/structure/table/alien,/obj/item/clothing/under/psysuit,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aM" = (/obj/structure/prop/alien/computer/camera,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aN" = (/obj/structure/prop/alien/computer/camera/flipped,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aO" = (/obj/structure/simple_door/resin,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aP" = (/obj/structure/prop/alien/power,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aQ" = (/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/drone,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aR" = (/obj/effect/alien/weeds/node,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"aS" = (/obj/structure/table/alien,/obj/random/tool/alien,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"aT" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"aU" = (/obj/machinery/replicator,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aV" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/drug_den,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aW" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/under/psysuit,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aX" = (/obj/structure/prop/alien/computer/camera/flipped{icon_state = "camera_flipped"; dir = 4},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aY" = (/obj/structure/prop/alien/computer/camera{icon_state = "camera"; dir = 8},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aZ" = (/obj/machinery/porta_turret/alien/destroyed,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"ba" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/scientific,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bb" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/nanites,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bc" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/fresh_medicine,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bd" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/viral,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"be" = (/obj/machinery/door/blast/puzzle,/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bf" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bg" = (/obj/structure/prop/lock/projectile,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bh" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/old_medicine,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bi" = (/obj/structure/prop/alien/dispenser,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bj" = (/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bk" = (/mob/living/simple_mob/animal/space/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bl" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/under/psysuit,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bm" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien,/obj/item/weapon/paper/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bn" = (/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bo" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bp" = (/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bq" = (/obj/machinery/implantchair,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"br" = (/obj/structure/prop/alien/computer{icon_state = "console-c"; dir = 8},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bs" = (/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/sentinel/praetorian,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bt" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bu" = (/obj/structure/loot_pile/surface/drone,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bv" = (/obj/item/weapon/surgical/bone_clamp/alien,/obj/structure/closet/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bw" = (/obj/structure/prop/alien/computer,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bx" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/accessory/medal/dungeon/alien_ufo{desc = "It vaguely like a star. It looks like something an alien admiral might've worn. Probably."; name = "alien admiral's medal"},/obj/item/weapon/telecube/precursor/mated/zone,/obj/item/clothing/head/helmet/alien/tank,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"by" = (/obj/structure/loot_pile/mecha/gygax/dark,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bz" = (/obj/structure/mopbucket,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bA" = (/obj/item/brokenbug,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
+"bB" = (/mob/living/simple_mob/animal/space/alien/sentinel,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bC" = (/obj/structure/prop/alien/computer/camera/flipped{icon_state = "camera_flipped"; dir = 4},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bD" = (/obj/structure/prop/alien/computer/camera{icon_state = "camera"; dir = 8},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bE" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bF" = (/obj/structure/prop/blackbox/xenofrigate,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bG" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
+"bH" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bI" = (/obj/structure/table/alien,/obj/structure/loot_pile/surface/alien/medical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bJ" = (/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bK" = (/obj/structure/table/alien,/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bL" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/item/device/gps/internal/poi,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bM" = (/obj/structure/window/phoronreinforced{dir = 4},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bN" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bO" = (/obj/structure/table/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bP" = (/obj/structure/table/alien,/obj/item/weapon/weldingtool/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bQ" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bR" = (/obj/structure/table/alien,/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bS" = (/obj/structure/closet/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bT" = (/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bU" = (/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 4},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bV" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced,/obj/item/weapon/paper/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bW" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bX" = (/mob/living/simple_mob/animal/space/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bY" = (/obj/structure/foamedmetal,/obj/machinery/door/airlock/alien/locked,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bZ" = (/obj/structure/foamedmetal,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"ca" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"cb" = (/obj/structure/prop/alien/power,/obj/structure/foamedmetal,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"cc" = (/obj/structure/loot_pile/surface/alien/end,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"cd" = (/obj/item/prop/alien/junk,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"ce" = (/obj/random/tech_supply/component,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"cf" = (/obj/random/tech_supply/component,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"cg" = (/obj/machinery/door/airlock/alien/public,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"ch" = (/turf/simulated/shuttle/wall/alien/hard_corner,/area/submap/cave/crashed_ufo_frigate)
+
+(1,1,1) = {"
+aaaaaaaxbGaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaxaxadaxaxbGaaaaaaaaababababacaeacafaeababababaaaaaaajaxadaaaaadaxajaaaaaa
+adbGadadadadaxaxaaaaabababagahababacaiacababacakabababaaaaadaxadadaxaxaaaaaaaa
+aaaxaxadadadadaaaaababacalalahahabamamanabacacacacaoababaaaaadbGadadaaaaaaaaaa
+aaaaaaadbGadaaaaababaoacacalapapchalalalchapapaqaracasababaaaaaaadadadaxaxadaa
+aaaaadadadaaaaababaoacacapapapapatalapapauapapapavalacawababaaaaaaadadadaxajaa
+aaadadaxaaaaababaoacayapapapalalchazacaAchaAaBapapaCacacawababaaaaaxadadadaaaa
+aaaxaxaaaaababaoacalalapapahaDabababazababababawapapaEacacaBababaaaxadaaaaaaaa
+adbGaxaaaaabacacalalapapacaFababaGabababaHabababaIapapaqaAacakabaaajaxaaaaaaaa
+aaadaaaaababacacaFapapacacaFabaGacaGabaHalalaJacacacapapacacabababaaaxaaaaaaaa
+aaadaaaaabakacacaKapapacacacababaJababawacacchabacaAapapacababaIabaaaaaaaaaaaa
+aaaaaaababababaFaFapalalacacaJacacakabaLacaLabababacapapababaIacababaaaaaaaaaa
+aaaaaaabaMaNabababalalacacacababaOababaLacaLababababchatchaFalacaPabaaaaaaaaaa
+aaaaaaabaFacakacchauchaoacacabaeaQaeabaLacaLabababakapaRabaSalacaPabadaxaaaaaa
+aaaaaaabaFacalalapalababaTalababaeabababawababaMaFacapapabahalacaPabadadaaaaaa
+aaaaababaFalalapapapacababalaTabababakabababaUacaFacapapatacacababababadaxaaaa
+aaaaabaVacapapapapacacakababababacacaWaAacababacacapapapabavababacacabadaxaaaa
+aaaaabacapapapapacacacacabababaXacaFaFahalaYababchaRapacabababaZacacabadadadaa
+adaaabbaapapacalbbalbcacbdabacacapalalalapapapapbeapacacaIabalalacapchaZadadaa
+adaaabalapabababababababababapapapapapapapapapapchaFacbfababbgacapapatacadbAaa
+adaaabbhalabbiawabbiapaFabapapaRbjbkacacacaparblabbmacaFabacacapapapchaZadadaa
+axaaabalbnbobpacabbiapbqchapalalalaFaFaFacacapalabbfacbmabacapapapalabadadaxaa
+axaaabalbnbnbnbrabbibsapatapalagabababababakapapabbtaAbuabalapapalalabadadaxaa
+aaadababaFbnapbvababaFaFchapalababbwbxbwababapapabbyacbzabalalapacababadadaaaa
+aaaaaaabaFapbBacaYababababapapabbCapapapbDabapapabbEbFbHabalalapacabadaxaaaaaa
+aaaaaaabaFapapalalalalababapapabapapaRapapabapapabababababalapapalabadaaaaaaaa
+axaaaaabbIaFapapbpalalabacalapbJapbKbLbfapbMapapacabacakbNapapalalabaaaaaaaaaa
+axadaaababaFapbnbnacacabagalapbJbOaFapbPbObMapapakabacacbQapapalababaaaaaaaaaa
+adbGadaaabbIbRbnapapbSabalalapbTapaRapapalbUapapacabacbVbWapacalabaaaaaaaaaaaa
+aaaxaxaaababaFacapapbSababalaRapapapbXalalalaRacababacapapacakababaaaaaaaaaaaa
+aaaaaxaaaaabbIaFapapapbSabalapapapapapapapapapacabacapapapacacabaaaaaaaaadadaa
+aaaaaaaaaaabababchbYchabababbfbOapapapapapbObfabababchatchabababaaaaaaadbGadaa
+aaadaaaaaaaaababbZbZbnapacababaFahalagarcaaFababacapapapacababaaaaaaadadadadaa
+aaadaxajaaaaaaababcbbZapapalabababccabccabababacapapapaPababaaaaaaadadadadaaaa
+aaadadaxaxbGaaaaababbZapapcdalalabababababacapapapapacababaaaaaaaxaxadadadadaa
+aaaaadadadadadaaaaababaPacapapalalchapchceapapalcfaPababaaaaaabGadadadaxaxadaa
+aaaaaabGaxaxadbGaaaaabababacapapapcgapcgapalalalabababaaaaaaadadadadadaxbGaaaa
+aaaaaaaaaaaxaxadadaaaaaaababababakchaHchakababababaaaaaaadadaxaxbGaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaabGadaaaaaaaaaaaaaaaaaaaa
+"}
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul

maps/submaps/surface_submaps/mountains/vault4.dmm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 "a" = (/turf/template_noop,/area/template_noop)
 "b" = (/obj/effect/alien/resin/wall,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
 "c" = (/obj/structure/simple_door/resin,/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
@@ -20,3 +21,50 @@ abbfedbba
 aabbcbbaa
 aaaaaaaaa
 "}
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+"a" = (/turf/template_noop,/area/template_noop)
+"b" = (/obj/effect/alien/resin/wall,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"c" = (/obj/structure/simple_door/resin,/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"d" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"e" = (/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"f" = (/obj/effect/alien/weeds,/mob/living/simple_mob/animal/space/alien/drone,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"g" = (/obj/effect/alien/weeds/node,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"h" = (/obj/effect/alien/weeds,/obj/random/multiple/minevault,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"i" = (/obj/effect/alien/weeds,/mob/living/simple_mob/animal/space/alien,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"j" = (/obj/effect/alien/weeds,/obj/effect/alien/egg,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+
+(1,1,1) = {"
+aaaaaaaaa
+aabbcbbaa
+abbdefbba
+abdeeghba
+aciejeica
+abhgeedba
+abbfedbba
+aabbcbbaa
+aaaaaaaaa
+"}
+=======
+"a" = (/turf/template_noop,/area/template_noop)
+"b" = (/obj/effect/alien/resin/wall,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"c" = (/obj/structure/simple_door/resin,/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"d" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"e" = (/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"f" = (/obj/effect/alien/weeds,/mob/living/simple_mob/animal/space/alien/drone,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"g" = (/obj/effect/alien/weeds/node,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"h" = (/obj/effect/alien/weeds,/obj/random/multiple/minevault,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"i" = (/obj/effect/alien/weeds,/mob/living/simple_mob/animal/space/alien,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"j" = (/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+
+(1,1,1) = {"
+aaaaaaaaa
+aabbcbbaa
+abbdefbba
+abdeeghba
+aciejeica
+abhgeedba
+abbfedbba
+aabbcbbaa
+aaaaaaaaa
+"}
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul

maps/submaps/surface_submaps/mountains/vault5.dmm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 "a" = (/turf/template_noop,/area/template_noop)
 "b" = (/obj/effect/alien/resin/wall,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
 "c" = (/obj/structure/simple_door/resin,/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
@@ -21,3 +22,52 @@ abbkegbba
 aabbcbbaa
 aaaaaaaaa
 "}
+||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
+"a" = (/turf/template_noop,/area/template_noop)
+"b" = (/obj/effect/alien/resin/wall,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"c" = (/obj/structure/simple_door/resin,/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"d" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/obj/item/weapon/gun/projectile/p92x/large,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"e" = (/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"f" = (/obj/effect/alien/weeds,/obj/item/clothing/suit/storage/vest/tactical,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"g" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"h" = (/obj/effect/alien/weeds,/obj/random/multiple/minevault,/mob/living/simple_mob/animal/space/alien/sentinel/praetorian,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"i" = (/obj/effect/alien/weeds,/obj/effect/alien/egg,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"j" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/queen/empress,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"k" = (/obj/effect/alien/weeds,/obj/item/clothing/head/helmet/tac,/obj/item/weapon/gun/projectile/SVD,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+
+(1,1,1) = {"
+aaaaaaaaa
+aabbcbbaa
+abbdefbba
+abgeeehba
+abiejeiba
+abheeegba
+abbkegbba
+aabbcbbaa
+aaaaaaaaa
+"}
+=======
+"a" = (/turf/template_noop,/area/template_noop)
+"b" = (/obj/effect/alien/resin/wall,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"c" = (/obj/structure/simple_door/resin,/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"d" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/obj/item/weapon/gun/projectile/p92x/large,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"e" = (/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"f" = (/obj/effect/alien/weeds,/obj/item/clothing/suit/storage/vest/tactical,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"g" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"h" = (/obj/effect/alien/weeds,/obj/random/multiple/minevault,/mob/living/simple_mob/animal/space/alien/sentinel/praetorian,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"i" = (/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"j" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/queen/empress,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"k" = (/obj/effect/alien/weeds,/obj/item/clothing/head/helmet/tac,/obj/item/weapon/gun/projectile/SVD,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+
+(1,1,1) = {"
+aaaaaaaaa
+aabbcbbaa
+abbdefbba
+abgeeehba
+abiejeiba
+abheeegba
+abbkegbba
+aabbcbbaa
+aaaaaaaaa
+"}
+>>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul