HEY, LISTEN!!! Merge Conflict Marker detected at Xenobiology Lab (187,88,2)! Please manually address all potential merge conflicts!!!

FAIL /datum/unit_test/log_mapping 0s

[10:04:49] Runtime in code/modules/lootpanel/contents.dm,28: Cannot read null.see_invisible proc name: populate contents (/datum/lootpanel/proc/populate_contents) src: /datum/lootpanel (/datum/lootpanel) call stack: /datum/lootpanel (/datum/lootpanel): populate contents() /datum/lootpanel (/datum/lootpanel): on searchable deleted(floor (/datum/search_object), 0) floor (/datum/search_object): SendSignal("parent_qdeleting", /list (/list)) qdel(floor (/datum/search_object), 0) floor (/datum/search_object): on item moved(the floor (127,126,13) (/turf/open/floor/iron), John Doe (/mob/living/carbon/human/consistent), the floor (126,126,13) (/turf/open/floor/iron), null) the floor (127,126,13) (/turf/open/floor/iron): SendSignal("atom_entered", /list (/list)) the floor (127,126,13) (/turf/open/floor/iron): Entered(John Doe (/mob/living/carbon/human/consistent), the floor (126,126,13) (/turf/open/floor/iron), null) John Doe (/mob/living/carbon/human/consistent): doMove(the floor (127,126,13) (/turf/open/floor/iron)) John Doe (/mob/living/carbon/human/consistent): forceMove(the floor (127,126,13) (/turf/open/floor/iron)) John Doe (/mob/living/carbon/human/consistent): forceMove(the floor (127,126,13) (/turf/open/floor/iron)) /datum/unit_test/mecha_damage (/datum/unit_test/mecha_damage): Run() RunUnitTest(/datum/unit_test/mecha_damage (/datum/unit_test/mecha_damage), /list (/list)) RunUnitTests() /datum/callback (/datum/callback): InvokeAsync()

FAIL /datum/unit_test/mecha_damage 0.1s

Process completed with exit code 1.