From f2f7bb7fd4eca6f57814f63675b9496bb7b01004 Mon Sep 17 00:00:00 2001 From: Darlantan Date: Thu, 22 Sep 2022 01:38:55 -0400 Subject: [PATCH] maybe we can code this to not fuck save data --- code/modules/asset_cache/asset_list_items.dm | 14 +++++++------- code/modules/vore/eating/belly_obj_vr.dm | 10 +++++----- code/modules/vore/eating/living_vr.dm | 8 ++++---- code/modules/vore/eating/vorepanel_vr.dm | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index f37c99d4a2..519e473084 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -300,18 +300,18 @@ name = "vore" /datum/asset/spritesheet/vore/register() - var/icon/downscaled = icon('icons/mob/screen_full_vore.dmi') + var/icon/downscaled = icon('modular_chomp/icons/mob/screen_full_vore_ch.dmi') //CHOMPedit: preserving save data downscaled.Scale(240, 240) InsertAll("", downscaled) ..() -/datum/asset/spritesheet/vore_colorized //This should be getting loaded in the TGUI vore panel but the game refuses to do so, for some reason. It only loads the vore spritesheet. - name = "colorizedvore" +/datum/asset/spritesheet/vore_fixed //This should be getting loaded in the TGUI vore panel but the game refuses to do so, for some reason. It only loads the vore spritesheet. //CHOMPedit + name = "fixedvore" //CHOMPedit -/datum/asset/spritesheet/vore_colorized/register() - var/icon/downscaledVC = icon('modular_chomp/icons/mob/screen_full_vore_ch.dmi') //CHOMPedit - downscaledVC.Scale(240, 240) - InsertAll("", downscaledVC) +/datum/asset/spritesheet/vore_fixed/register() //CHOMPedi start: preserving save data + var/icon/downscaledVF = icon('icons/mob/screen_full_vore.dmi') + downscaledVF.Scale(240, 240) + InsertAll("", downscaledVF) //CHOMpedit end ..() //VOREStation Add End diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 86e6bbb9cf..8274fd53b6 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -163,7 +163,7 @@ // Lets you do a fullscreen overlay. Set to an icon_state string. var/belly_fullscreen = "" var/disable_hud = FALSE - var/colorization_enabled = FALSE + var/colorization_enabled = TRUE //CHOMPedit var/belly_fullscreen_color = "#823232" @@ -393,7 +393,7 @@ if(belly_fullscreen) if(colorization_enabled) - var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/colorized) + var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly) //CHOMPedit: preserving save data F.icon_state = belly_fullscreen F.color = belly_fullscreen_color /* //Allows for 'multilayered' stomachs. Currently not implemented. @@ -401,7 +401,7 @@ var/obj/screen/fullscreen/F2 = L.overlay_fullscreen("belly2", /obj/screen/fullscreen/belly) */ else - var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly) + var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/fixed) //CHOMPedit: preserving save data F.icon_state = belly_fullscreen else L.clear_fullscreen("belly") @@ -420,7 +420,7 @@ if(belly_fullscreen) if(colorization_enabled) - var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/colorized) + var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly) //CHOMPedit: preserving save data F.icon_state = belly_fullscreen F.color = belly_fullscreen_color /* //Allows for 'multilayered' stomachs. Currently not implemented. @@ -428,7 +428,7 @@ var/obj/screen/fullscreen/F2 = L.overlay_fullscreen("belly2", /obj/screen/fullscreen/belly) */ else - var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly) + var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/fixed) //CHOMPedit: preserving save data F.icon_state = belly_fullscreen else L.clear_fullscreen("belly") diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index ebc87d1381..c61b0ce06a 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -1093,12 +1093,12 @@ // Full screen belly overlays! /obj/screen/fullscreen/belly - icon = 'icons/mob/screen_full_vore.dmi' - icon_state = "" - -/obj/screen/fullscreen/belly/colorized icon = 'modular_chomp/icons/mob/screen_full_vore_ch.dmi' //CHOMPedit +/obj/screen/fullscreen/belly/fixed //CHOMPedit: tweaking to preserve save data + icon = 'icons/mob/screen_full_vore.dmi' //CHOMPedit: tweaking to preserve save data + icon_state = "" + /mob/living/proc/vorebelly_printout() //Spew the vorepanel belly messages into chat window for copypasting. set name = "X-Print Vorebelly Settings" set category = "Preferences" diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index c8112cf13f..a2ab410514 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -46,7 +46,7 @@ /datum/vore_look/ui_assets(mob/user) . = ..() . += get_asset_datum(/datum/asset/spritesheet/vore) - . += get_asset_datum(/datum/asset/spritesheet/vore_colorized) //Either this isn't working or my cache is corrupted and won't show them. + . += get_asset_datum(/datum/asset/spritesheet/vore_fixed) //Either this isn't working or my cache is corrupted and won't show them. //CHOMPedit /datum/vore_look/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) @@ -264,9 +264,9 @@ selected_list["belly_fullscreen_color"] = selected.belly_fullscreen_color if(selected.colorization_enabled) - selected_list["possible_fullscreens"] = icon_states('icons/mob/screen_full_colorized_vore.dmi') //Makes any icons inside of here selectable. + selected_list["possible_fullscreens"] = icon_states('modular_chomp/icons/mob/screen_full_vore_ch.dmi') //Makes any icons inside of here selectable. //CHOMPedit else - selected_list["possible_fullscreens"] = icon_states('icons/mob/screen_full_vore.dmi') //Where all stomachs - colorable and not - are stored. + selected_list["possible_fullscreens"] = icon_states('icons/mob/screen_full_vore.dmi') //Where all upstream stomachs are stored. I'm not touching the chunks of comments below but they are inaccurate here. //INSERT COLORIZE-ONLY STOMACHS HERE. //This manually removed color-only stomachs from the above list. //For some reason, colorized stomachs have to be added to both colorized_vore(to be selected) and full_vore (to show the preview in tgui)