From b1669b81798768ac4d59f238c060a76ed180a576 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:24:16 -0600 Subject: [PATCH] Update severe.dm --- code/datums/brain_damage/severe.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index a36d4b9fb8..381515e42e 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -165,8 +165,6 @@ /datum/brain_trauma/severe/discoordination/on_lose() owner.remove_disability(MONKEYLIKE, TRAUMA_DISABILITY) ..() -<<<<<<< HEAD -======= /datum/brain_trauma/severe/pacifism name = "Traumatic Non-Violence" @@ -182,4 +180,3 @@ /datum/brain_trauma/severe/pacifism/on_lose() owner.remove_disability(PACIFISM, TRAUMA_DISABILITY) ..() ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)