From aa5e57e3a607dab979bba9e9d14318a1c3d85585 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 19 Jan 2018 10:16:10 -0500 Subject: [PATCH] Fixes slimepeople not being able to open the bodyswap menu --- .../mob/living/carbon/human/species_types/jellypeople.dm | 4 ++++ 1 file changed, 4 insertions(+) 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 f391c20f1c..d47966631b 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -235,7 +235,11 @@ 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)