diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index f6a72abd94..1a1a85d5c3 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -270,6 +270,7 @@ autowhisper_display.name = "autowhisper" autowhisper_display.screen_loc = ui_under_health hud_elements |= autowhisper_display + other |= autowhisper_display var/obj/screen/aw = new /obj/screen() aw.icon = 'icons/mob/screen/minimalist.dmi' @@ -277,6 +278,7 @@ aw.name = "autowhisper mode" aw.screen_loc = ui_under_health hud_elements |= aw + other |= aw aw = new /obj/screen() aw.icon = 'icons/mob/screen/minimalist.dmi' @@ -284,6 +286,7 @@ aw.name = "check known languages" aw.screen_loc = ui_under_health hud_elements |= aw + other |= aw aw = new /obj/screen() aw.icon = 'icons/mob/screen/minimalist.dmi' @@ -291,6 +294,7 @@ aw.name = "set pose" aw.screen_loc = ui_under_health hud_elements |= aw + other |= aw aw = new /obj/screen() aw.icon = 'icons/mob/screen/minimalist.dmi' @@ -298,6 +302,7 @@ aw.name = "move upwards" aw.screen_loc = ui_under_health hud_elements |= aw + other |= aw aw = new /obj/screen() aw.icon = 'icons/mob/screen/minimalist.dmi' @@ -305,6 +310,7 @@ aw.name = "move downwards" aw.screen_loc = ui_under_health hud_elements |= aw + other |= aw aw = new /obj/screen() aw.icon = HUD.ui_style diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 6ebc01ca1f..d50ba82770 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -507,13 +507,19 @@ var/obj/screen/fullscreen/F2 = L.overlay_fullscreen("belly2", /obj/screen/fullscreen/belly/colorized/overlay) F2.icon_state = "[belly_fullscreen]_l1" F2.color = belly_fullscreen_color_secondary + else + L.clear_fullscreen("belly2") if("[belly_fullscreen]_l2" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi')) var/obj/screen/fullscreen/F3 = L.overlay_fullscreen("belly3", /obj/screen/fullscreen/belly/colorized/overlay) F3.icon_state = "[belly_fullscreen]_l2" F3.color = belly_fullscreen_color_trinary + else + L.clear_fullscreen("belly3") if("[belly_fullscreen]_nc" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi')) var/obj/screen/fullscreen/F4 = L.overlay_fullscreen("belly4", /obj/screen/fullscreen/belly/colorized/overlay) F4.icon_state = "[belly_fullscreen]_nc" + else + L.clear_fullscreen("belly4") */ //Chomp Disable END // Chomp EDIT Begin diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 964baf89a9..31bb989134 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -2694,12 +2694,6 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", host.vore_selected.colorization_enabled = !host.vore_selected.colorization_enabled host.vore_selected.belly_fullscreen = "dark" //This prevents you from selecting a belly that is not meant to be colored and then turning colorization on. . = TRUE - /* - if("b_multilayered") //Allows for 'multilayered' stomachs. Currently not implemented. Add to TGUI. - host.vore_selected.multilayered = !host.vore_selected.multilayered //Add to stomach vars. - host.vore_selected.belly_fullscreen = "dark" - . = TRUE - */ if("b_preview_belly") host.vore_selected.vore_preview(host) //Gives them the stomach overlay. It fades away after ~2 seconds as human/life.dm removes the overlay if not in a gut. . = TRUE @@ -2738,12 +2732,12 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", . = TRUE /* //Chomp REMOVE - use our solution, not upstream's if("b_fullscreen_color_secondary") - var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color) as color|null + var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_secondary) as color|null if(newcolor) host.vore_selected.belly_fullscreen_color_secondary = newcolor . = TRUE if("b_fullscreen_color_trinary") - var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color) as color|null + var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_trinary) as color|null if(newcolor) host.vore_selected.belly_fullscreen_color_trinary = newcolor . = TRUE