diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index b9bfc277c0..b29f39ad40 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -1,129 +1,4 @@
-<<<<<<< HEAD
-/mob/living/carbon/alien/humanoid
-	name = "alien"
-	icon_state = "alien"
-	pass_flags = PASSTABLE
-	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
-	possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
-	limb_destroyer = 1
-	var/obj/item/r_store = null
-	var/obj/item/l_store = null
-	var/caste = ""
-	var/alt_icon = 'icons/mob/alienleap.dmi' //used to switch between the two alien icon files.
-	var/leap_on_click = 0
-	var/pounce_cooldown = 0
-	var/pounce_cooldown_time = 30
-	var/custom_pixel_x_offset = 0 //for admin fuckery.
-	var/custom_pixel_y_offset = 0
-	var/sneaking = 0 //For sneaky-sneaky mode and appropriate slowdown
-	var/drooling = 0 //For Neruotoxic spit overlays
-	bodyparts = list(/obj/item/bodypart/chest/alien, /obj/item/bodypart/head/alien, /obj/item/bodypart/l_arm/alien,
-					 /obj/item/bodypart/r_arm/alien, /obj/item/bodypart/r_leg/alien, /obj/item/bodypart/l_leg/alien)
-	devourable = TRUE
-
-
-//This is fine right now, if we're adding organ specific damage this needs to be updated
-/mob/living/carbon/alien/humanoid/Initialize()
-	AddAbility(new/obj/effect/proc_holder/alien/regurgitate(null))
-	. = ..()
-
-/mob/living/carbon/alien/humanoid/movement_delay()
-	. = ..()
-	. += move_delay_add + config.alien_delay + sneaking //move_delay_add is used to slow aliens with stun
-
-/mob/living/carbon/alien/humanoid/restrained(ignore_grab)
-	. = handcuffed
-
-
-/mob/living/carbon/alien/humanoid/show_inv(mob/user)
-	user.set_machine(src)
-	var/list/dat = list()
-	dat += {"
-	<HR>
-	<B><FONT size=3>[name]</FONT></B>
-	<HR>"}
-	for(var/i in 1 to held_items.len)
-		var/obj/item/I = get_item_for_held_index(i)
-		dat += "<BR><B>[get_held_index_name(i)]:</B><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "<font color=grey>Empty</font>"]</a>"
-	dat += "<BR><A href='?src=\ref[src];pouches=1'>Empty Pouches</A>"
-
-	if(handcuffed)
-		dat += "<BR><A href='?src=\ref[src];item=[slot_handcuffed]'>Handcuffed</A>"
-	if(legcuffed)
-		dat += "<BR><A href='?src=\ref[src];item=[slot_legcuffed]'>Legcuffed</A>"
-
-	dat += {"
-	<BR>
-	<BR><A href='?src=\ref[user];mach_close=mob\ref[src]'>Close</A>
-	"}
-	user << browse(dat.Join(), "window=mob\ref[src];size=325x500")
-	onclose(user, "mob\ref[src]")
-
-
-/mob/living/carbon/alien/humanoid/Topic(href, href_list)
-	..()
-	//strip panel
-	if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
-		if(href_list["pouches"])
-			visible_message("<span class='danger'>[usr] tries to empty [src]'s pouches.</span>", \
-							"<span class='userdanger'>[usr] tries to empty [src]'s pouches.</span>")
-			if(do_mob(usr, src, POCKET_STRIP_DELAY * 0.5))
-				dropItemToGround(r_store)
-				dropItemToGround(l_store)
-
-/mob/living/carbon/alien/humanoid/cuff_resist(obj/item/I)
-	playsound(src, 'sound/voice/hiss5.ogg', 40, 1, 1)  //Alien roars when starting to break free
-	..(I, cuff_break = INSTANT_CUFFBREAK)
-
-/mob/living/carbon/alien/humanoid/resist_grab(moving_resist)
-	if(pulledby.grab_state)
-		visible_message("<span class='danger'>[src] has broken free of [pulledby]'s grip!</span>")
-	pulledby.stop_pulling()
-	. = 0
-
-/mob/living/carbon/alien/humanoid/get_standard_pixel_y_offset(lying = 0)
-	if(leaping)
-		return -32
-	else if(custom_pixel_y_offset)
-		return custom_pixel_y_offset
-	else
-		return initial(pixel_y)
-
-/mob/living/carbon/alien/humanoid/get_standard_pixel_x_offset(lying = 0)
-	if(leaping)
-		return -32
-	else if(custom_pixel_x_offset)
-		return custom_pixel_x_offset
-	else
-		return initial(pixel_x)
-
-/mob/living/carbon/alien/humanoid/get_permeability_protection()
-	return 0.8
-
-/mob/living/carbon/alien/humanoid/alien_evolve(mob/living/carbon/alien/humanoid/new_xeno)
-	drop_all_held_items()
-	for(var/atom/movable/A in stomach_contents)
-		stomach_contents.Remove(A)
-		new_xeno.stomach_contents.Add(A)
-		A.loc = new_xeno
-	..()
-
-//For alien evolution/promotion/queen finder procs. Checks for an active alien of that type
-/proc/get_alien_type(var/alienpath)
-	for(var/mob/living/carbon/alien/humanoid/A in GLOB.living_mob_list)
-		if(!istype(A, alienpath))
-			continue
-		if(!A.key || A.stat == DEAD) //Only living aliens with a ckey are valid.
-			continue
-		return A
-	return FALSE
-
-
-/mob/living/carbon/alien/humanoid/check_breath(datum/gas_mixture/breath)
-	if(breath && breath.total_moles() > 0 && !sneaking)
-		playsound(get_turf(src), pick('sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg'), 50, 0, -5)
-	..()
-=======
+<<<<<<< HEAD
 /mob/living/carbon/alien/humanoid
 	name = "alien"
 	icon_state = "alien"
@@ -250,4 +125,3 @@
 	if(breath && breath.total_moles() > 0 && !sneaking)
 		playsound(get_turf(src), pick('sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg'), 50, 0, -5)
 	..()
->>>>>>> 4178c20... Configuration datum refactor (#30763)