From 8fcef30c5629454f0c2b7ed026770833ed7fbf45 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 22 Jan 2018 07:36:43 -0600 Subject: [PATCH] Update jellypeople.dm --- .../mob/living/carbon/human/species_types/jellypeople.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index d47966631b..cb6ceb35b0 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -235,12 +235,7 @@ else ui_interact(owner) -<<<<<<< HEAD -/datum/action/innate/swap_body/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.conscious_state) -======= /datum/action/innate/swap_body/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state) ->>>>>>> b16e2ba... Merge pull request #34590 from XDTM/SplitSecond - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "slime_swap_body", name, 400, 400, master_ui, state)