From b6cee1119b0b8ddcbeb4052cb268ddfabd175c4b Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Tue, 14 Jul 2026 23:06:50 +0200 Subject: [PATCH] rids of default immutable (#19608) * rids of default immutable * why... * . * . * ugh * some mobs qdel on death * hmm na should be fine * l --- code/game/machinery/computer/card.dm | 2 +- code/modules/mob/living/simple_mob/life.dm | 2 +- code/modules/mob/living/simple_mob/simple_mob_vr.dm | 2 +- .../simple_mob/subtypes/vore/shadekin/shadekin.dm | 2 +- code/modules/vore/eating/belly_dat_vr.dm | 6 +++--- code/modules/vore/eating/belly_obj.dm | 3 +-- code/modules/vore/eating/living_vr.dm | 4 +--- .../panel_databackend/vorepanel_set_attribute.dm | 6 +++--- .../ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx | 10 +++++----- 9 files changed, 17 insertions(+), 20 deletions(-) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index de8added23e..2d69961809f 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -192,7 +192,7 @@ if(!ui.user.get_active_hand()) ui.user.put_in_hands(scan) scan = null - if(bot_login) + else if(bot_login) scan = null bot_login = FALSE else diff --git a/code/modules/mob/living/simple_mob/life.dm b/code/modules/mob/living/simple_mob/life.dm index 19974bb024a..4b017b52ba1 100644 --- a/code/modules/mob/living/simple_mob/life.dm +++ b/code/modules/mob/living/simple_mob/life.dm @@ -183,7 +183,7 @@ if(purge) purge -= 1 -/mob/living/simple_mob/ +/mob/living/simple_mob var/update_icon_timer /mob/living/simple_mob/death(gibbed, deathmessage = "dies!") diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index ab0fef23acc..00a7aafcaa7 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -242,7 +242,7 @@ //A much more detailed version of the default /living implementation var/obj/belly/B = new /obj/belly(src) vore_selected = B - B.immutable = 1 + B.immutable = TRUE B.affects_vore_sprites = TRUE B.name = vore_stomach_name ? vore_stomach_name : "stomach" B.desc = vore_stomach_flavor ? vore_stomach_flavor : "Your surroundings are warm, soft, and slimy. Makes sense, considering you're inside \the [name]." diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm index 7acbebbca0f..d768863d245 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm @@ -137,7 +137,7 @@ /mob/living/simple_mob/shadekin/load_default_bellies() var/obj/belly/B = new /obj/belly(src) vore_selected = B - B.immutable = 1 + B.immutable = TRUE B.affects_vore_sprites = TRUE B.name = vore_stomach_name ? vore_stomach_name : "stomach" B.desc = vore_stomach_flavor ? vore_stomach_flavor : "Your surroundings are warm, soft, and slimy. Makes sense, considering you're inside \the [name]." diff --git a/code/modules/vore/eating/belly_dat_vr.dm b/code/modules/vore/eating/belly_dat_vr.dm index 3dfe0b09380..ec62d5c4511 100644 --- a/code/modules/vore/eating/belly_dat_vr.dm +++ b/code/modules/vore/eating/belly_dat_vr.dm @@ -18,14 +18,14 @@ var/digest_brute = 2 // Brute damage per tick in digestion mode var/digest_burn = 3 // Burn damage per tick in digestion mode var/digest_tickrate = 3 // Modulus this of air controller tick number to iterate gurgles on - var/immutable = 0 // Prevents this belly from being deleted - var/escapable = 0 // Belly can be resisted out of at any time + var/immutable = FALSE // Prevents this belly from being deleted + var/escapable = FALSE // Belly can be resisted out of at any time var/escapetime = 60 SECONDS // Deciseconds, how long to escape this belly var/digestchance = 0 // % Chance of stomach beginning to digest if prey struggles var/absorbchance = 0 // % Chance of stomach beginning to absorb if prey struggles var/escapechance = 0 // % Chance of prey beginning to escape if prey struggles. var/transferchance = 0 // % Chance of prey being - var/can_taste = 0 // If this belly prints the flavor of prey when it eats someone. + var/can_taste = FALSE // If this belly prints the flavor of prey when it eats someone. var/bulge_size = 0.25 // The minimum size the prey has to be in order to show up on examine. var/shrink_grow_size = 1 // This horribly named variable determines the minimum/maximum size it will shrink/grow prey to. var/datum/belly/transferlocation = null // Location that the prey is released if they struggle and get dropped off. diff --git a/code/modules/vore/eating/belly_obj.dm b/code/modules/vore/eating/belly_obj.dm index bdb3fab4262..6011a2833f1 100644 --- a/code/modules/vore/eating/belly_obj.dm +++ b/code/modules/vore/eating/belly_obj.dm @@ -298,7 +298,6 @@ "digest_clone", "bellytemperature", "temperature_damage", - "immutable", "can_taste", "escapable", "escapetime", @@ -488,7 +487,7 @@ ) if (save_digest_mode == 1) - return ..() + saving + list("digest_mode") + saving += "digest_mode" return ..() + saving diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 22cdcb3f40a..bf44bb22072 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -63,7 +63,6 @@ LAZYINITLIST(vore_organs) var/obj/belly/B = new /obj/belly(src) vore_selected = B - B.immutable = TRUE B.name = "Stomach" B.desc = "It appears to be rather warm and wet. Makes sense, considering it's inside \the [name]." B.can_taste = TRUE @@ -287,10 +286,9 @@ QDEL_LIST(vore_organs) for(var/entry in P.belly_prefs) list_to_object(entry,src) - if(!vore_organs.len) + if(!length(vore_organs)) var/obj/belly/B = new /obj/belly(src) vore_selected = B - B.immutable = TRUE B.name = "Stomach" B.desc = "It appears to be rather warm and wet. Makes sense, considering it's inside \the [name]." B.can_taste = TRUE diff --git a/code/modules/vore/eating/panel_databackend/vorepanel_set_attribute.dm b/code/modules/vore/eating/panel_databackend/vorepanel_set_attribute.dm index efcc6753fb3..56bf9f7e934 100644 --- a/code/modules/vore/eating/panel_databackend/vorepanel_set_attribute.dm +++ b/code/modules/vore/eating/panel_databackend/vorepanel_set_attribute.dm @@ -873,15 +873,15 @@ failure_msg += "This is the destiantion for at least '[dest_for]' secondary belly transfers. Remove it as the destination from any bellies before deleting it. " break - if(host.vore_selected.contents.len) + if(length(host.vore_selected.contents)) failure_msg += "You cannot delete bellies with contents! " //These end with spaces, to be nice looking. Make sure you do the same. if(host.vore_selected.immutable) failure_msg += "This belly is marked as undeletable. " - if(host.vore_organs.len == 1) + if(length(host.vore_organs) == 1) failure_msg += "You must have at least one belly. " if(failure_msg) - tgui_alert_async(user,failure_msg,"Error!") + tgui_alert_async(user, failure_msg, "Error!") return FALSE if(host.soulgem?.linked_belly == host.vore_selected) diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx index f9a800ef426..306bd3a73a8 100644 --- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx +++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx @@ -168,24 +168,24 @@ const SelectionField = (props: { - {prepareSearch(modules, searchText).map((modul_option, i) => { + {prepareSearch(modules, searchText).map((module_option, i) => { return (