shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes slimepeople not being able to open the bodyswap menu

Browse Source
This commit is contained in:
Jordan Brown
2018-01-19 10:16:10 -05:00
committed by CitadelStationBot
parent c6f227fc18
commit aa5e57e3a6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+4
View File
@@ -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)