diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 8b48baa27ee..b2e89db6d36 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -66,6 +66,9 @@ qdel(module_store_icon) module_store_icon = null + qdel(talk_wheel_icon) + talk_wheel_icon = null + if(static_inventory.len) for(var/thing in static_inventory) qdel(thing) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index a23877c0d71..93c6bbec76f 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -67,7 +67,7 @@ /obj/screen/talk_wheel/Click() if(world.time <= usr.next_move) return - if(usr.incapacitated()) + if(usr.stat) return if(ishuman(usr)) var/mob/living/carbon/human/H = usr @@ -129,6 +129,8 @@ /obj/screen/talk/Click(location, control,params) if(ishuman(usr)) + if(usr.stat) + return var/mob/living/carbon/human/H = usr var/word_spoken = "" var/list/PL = params2list(params) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 37e60e3b93c..089b9565b13 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -464,3 +464,14 @@ It's fairly easy to fix if dealing with single letters but not so much with comp M << "There were no ghosts willing to take control." message_admins("No ghosts were willing to take control of [key_name_admin(M)])") return FALSE + +//toggles the talk wheel +/mob/verb/toggle_talk_wheel() + set name = "talk-wheel" + set hidden = 1 + + if(ishuman(src)) + var/mob/living/carbon/human/H = src + if(H.hud_used && H.hud_used.talk_wheel_icon) + H.hud_used.talk_wheel_icon.Click() +