- | TITLE | [dat]", "window=library")
- onclose(usr, "library")
-
-/client/proc/toggle_spawning_with_recolour()
- set name = "Toggle Simple/Robot recolour verb"
- set desc = "Makes it so new robots/simple_mobs spawn with a verb to recolour themselves for this round. You must set them separately."
- set category = "Server.Game"
-
- if(!check_rights(R_ADMIN|R_EVENT|R_FUN))
- return
-
- var/which = tgui_alert(usr, "Which do you want to toggle?", "Choose Recolour Toggle", list("Robot", "Simple Mob"))
- switch(which)
- if("Robot")
- CONFIG_SET(flag/allow_robot_recolor, !CONFIG_GET(flag/allow_robot_recolor))
- to_chat(usr, "You have [CONFIG_GET(flag/allow_robot_recolor) ? "enabled" : "disabled"] newly spawned cyborgs to spawn with the recolour verb")
- if("Simple Mob")
- CONFIG_SET(flag/allow_simple_mob_recolor, !CONFIG_GET(flag/allow_simple_mob_recolor))
- to_chat(usr, "You have [CONFIG_GET(flag/allow_simple_mob_recolor) ? "enabled" : "disabled"] newly spawned simple mobs to spawn with the recolour verb")
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index ae4d136b14..59c207329c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1412,6 +1412,9 @@
/mob/living/proc/adjust_nutrition(amount)
nutrition = between(0, nutrition + amount, max_nutrition)
+/mob/living/proc/nutrition_percent()
+ return 100 * nutrition / max_nutrition
+
/mob/living/vv_get_header()
. = ..()
var/refid = REF(src)
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index be086db2b3..5e94bc7cea 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -102,7 +102,7 @@
/obj/item/cell/proc/percent() // return % charge of cell
var/charge_percent = 0
if(maxcharge > 0)
- charge_percent = 100.0*charge/maxcharge
+ charge_percent = 100.0 * charge / maxcharge
return charge_percent
/obj/item/cell/proc/fully_charged()
diff --git a/code/modules/vore/eating/belly_import.dm b/code/modules/vore/eating/belly_import.dm
index deb6f94dc7..65407aea90 100644
--- a/code/modules/vore/eating/belly_import.dm
+++ b/code/modules/vore/eating/belly_import.dm
@@ -1003,6 +1003,10 @@
if(new_show_liquids == 1)
new_belly.show_liquids = TRUE
+ if(isnum(belly_data["reagent_gen_cost_limit"]))
+ var/new_reagent_gen_cost_limit = belly_data["reagent_gen_cost_limit"]
+ new_belly.reagent_gen_cost_limit = sanitize_integer(new_reagent_gen_cost_limit, 0, 100, initial(new_belly.reagent_gen_cost_limit))
+
if(isnum(belly_data["reagentbellymode"]))
var/new_reagentbellymode = belly_data["reagentbellymode"]
if(new_reagentbellymode == 0)
diff --git a/code/modules/vore/eating/belly_obj.dm b/code/modules/vore/eating/belly_obj.dm
index 283066c017..eb9cc89f43 100644
--- a/code/modules/vore/eating/belly_obj.dm
+++ b/code/modules/vore/eating/belly_obj.dm
@@ -162,6 +162,7 @@
var/belly_fullscreen_alpha = 255
// Liquid belly vars
+ var/reagent_gen_cost_limit = 10 //Our lower percentage limit of nutrition / charge until which we produce liquids
var/reagentbellymode = FALSE // Belly has abilities to make liquids from digested/absorbed/drained prey and/or nutrition
var/reagent_mode_flags = 0
@@ -378,6 +379,7 @@
"colorization_enabled",
"show_liquids",
"reagentbellymode",
+ "reagent_gen_cost_limit",
"liquid_fullness1_messages",
"liquid_fullness2_messages",
"liquid_fullness3_messages",
@@ -1357,6 +1359,7 @@
dupe.belly_fullscreen_color4 = belly_fullscreen_color4
dupe.belly_fullscreen_alpha = belly_fullscreen_alpha
dupe.show_liquids = show_liquids
+ dupe.reagent_gen_cost_limit = reagent_gen_cost_limit
dupe.reagentbellymode = reagentbellymode
dupe.vorefootsteps_sounds = vorefootsteps_sounds
dupe.liquid_fullness1_messages = liquid_fullness1_messages
diff --git a/code/modules/vore/eating/belly_obj_liquids.dm b/code/modules/vore/eating/belly_obj_liquids.dm
index 30c18fb7f6..235fee4a35 100644
--- a/code/modules/vore/eating/belly_obj_liquids.dm
+++ b/code/modules/vore/eating/belly_obj_liquids.dm
@@ -5,14 +5,16 @@
if(isrobot(owner))
var/mob/living/silicon/robot/R = owner
if(R.cell && R.cell.charge >= gen_cost*10 && gen_interval >= gen_time)
- GenerateBellyReagents()
+ if(R.cell.percent() >= reagent_gen_cost_limit)
+ GenerateBellyReagents()
gen_interval = 0
return
gen_interval++
return
if(owner.nutrition >= gen_cost && gen_interval >= gen_time)
- GenerateBellyReagents()
+ if(owner.nutrition_percent() >= reagent_gen_cost_limit)
+ GenerateBellyReagents()
gen_interval = 0
return
gen_interval++
diff --git a/code/modules/vore/eating/exportpanel_vr.dm b/code/modules/vore/eating/exportpanel_vr.dm
index 56f034e5c3..988e4d75fc 100644
--- a/code/modules/vore/eating/exportpanel_vr.dm
+++ b/code/modules/vore/eating/exportpanel_vr.dm
@@ -439,6 +439,7 @@
// Liquid Options
belly_data["show_liquids"] = B.show_liquids
belly_data["reagentbellymode"] = B.reagentbellymode
+ belly_data["reagent_gen_cost_limit"] = B.reagent_gen_cost_limit
belly_data["reagent_chosen"] = B.reagent_chosen
belly_data["reagent_name"] = B.reagent_name
belly_data["reagent_transfer_verb"] = B.reagent_transfer_verb
diff --git a/code/modules/vore/eating/panel_databackend/vorepanel_set_liqattribute.dm b/code/modules/vore/eating/panel_databackend/vorepanel_set_liqattribute.dm
index d963ee024f..8c3f4984c2 100644
--- a/code/modules/vore/eating/panel_databackend/vorepanel_set_liqattribute.dm
+++ b/code/modules/vore/eating/panel_databackend/vorepanel_set_liqattribute.dm
@@ -14,6 +14,12 @@
host.vore_selected.show_liquids = 0
to_chat(user,span_warning("Your [lowertext(host.vore_selected.name)] no longer has liquid options."))
. = TRUE
+ if("b_liq_reagent_gen_cost_limit")
+ var/new_limit = text2num(params["val"])
+ if(!isnum(new_limit))
+ return FALSE
+ host.vore_selected.reagent_gen_cost_limit = CLAMP(new_limit, 0, 100)
+ . = TRUE
if("b_liq_reagent_gen")
if(!host.vore_selected.reagentbellymode) //liquid container adjustments and interactions.
host.vore_selected.reagentbellymode = 1
diff --git a/code/modules/vore/eating/panel_databackend/vorepanel_vore_data.dm b/code/modules/vore/eating/panel_databackend/vorepanel_vore_data.dm
index a5df4128b0..5346605e29 100644
--- a/code/modules/vore/eating/panel_databackend/vorepanel_vore_data.dm
+++ b/code/modules/vore/eating/panel_databackend/vorepanel_vore_data.dm
@@ -368,9 +368,18 @@
selected_list["contents"] = selected_contents
if(LIQUID_OPTIONS_TAB)
+ var/liq_gen_resources = 0
+ if(isrobot(owner))
+ var/mob/living/silicon/robot/robot_owner = owner
+ if(robot_owner.cell)
+ liq_gen_resources = robot_owner.cell.percent()
+ else if(isliving(owner))
+ var/mob/living/living_owner = owner
+ liq_gen_resources = living_owner.nutrition_percent()
// liquid belly options
var/list/belly_liquid_data = list(
"show_liq" = selected.show_liquids,
+ "liq_gen_resources" = liq_gen_resources,
"liq_interacts" = compile_liquid_interact_data(selected)
)
selected_list["belly_liquid_data"] = belly_liquid_data
diff --git a/code/modules/vore/eating/panel_databackend/vorepanel_vore_subdata.dm b/code/modules/vore/eating/panel_databackend/vorepanel_vore_subdata.dm
index f7de689f59..7d72ec846f 100644
--- a/code/modules/vore/eating/panel_databackend/vorepanel_vore_subdata.dm
+++ b/code/modules/vore/eating/panel_databackend/vorepanel_vore_subdata.dm
@@ -717,6 +717,7 @@
"liq_reagent_transfer_verb" = selected.reagent_transfer_verb,
"liq_reagent_nutri_rate" = selected.gen_time,
"liq_reagent_capacity" = selected.custom_max_volume,
+ "liq_gen_cost_limit" = selected.reagent_gen_cost_limit,
"liq_sloshing" = selected.vorefootsteps_sounds,
"liq_reagent_addons" = liquid_addon_list,
"custom_reagentcolor" = (selected.custom_reagentcolor ? selected.custom_reagentcolor : selected.reagentcolor),
diff --git a/tgui/packages/tgui/interfaces/RobotSleeper/SubElements/SleeperStatusElements/SleeperPatient.tsx b/tgui/packages/tgui/interfaces/RobotSleeper/SubElements/SleeperStatusElements/SleeperPatient.tsx
index 610001f3fe..dbc132a2cc 100644
--- a/tgui/packages/tgui/interfaces/RobotSleeper/SubElements/SleeperStatusElements/SleeperPatient.tsx
+++ b/tgui/packages/tgui/interfaces/RobotSleeper/SubElements/SleeperStatusElements/SleeperPatient.tsx
@@ -34,27 +34,27 @@ export const SleeperPatient = (props: { name: string }) => {
0 ? undefined : 'red'}>
- {`- Overall Health: ${((100 * our_patient.health) / our_patient.max_health).toFixed(0)}`}
+ {`- Overall Health: ${((100 * our_patient.health) / our_patient.max_health).toFixed()}`}
- {`- Brute Damage: ${our_patient.brute.toFixed(0)}`}
+ {`- Brute Damage: ${our_patient.brute.toFixed()}`}
- {`- Respiratory Damage: ${our_patient.oxy.toFixed(0)}`}
+ {`- Respiratory Damage: ${our_patient.oxy.toFixed()}`}
- {`- Toxin Content: ${our_patient.tox.toFixed(0)}`}
+ {`- Toxin Content: ${our_patient.tox.toFixed()}`}
- {`- Burn Severity: ${our_patient.burn.toFixed(0)}`}
+ {`- Burn Severity: ${our_patient.burn.toFixed()}`}
{(isParalysed ||
diff --git a/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/LiquidTab/LiquidOptionsRight.tsx b/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/LiquidTab/LiquidOptionsRight.tsx
index a64d161624..2846220b71 100644
--- a/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/LiquidTab/LiquidOptionsRight.tsx
+++ b/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/LiquidTab/LiquidOptionsRight.tsx
@@ -16,6 +16,7 @@ export const LiquidOptionsRight = (props: {
liq_reagent_transfer_verb,
liq_reagent_nutri_rate,
liq_reagent_capacity,
+ liq_gen_cost_limit,
liq_custom_name_max,
liq_custom_name_min,
max_liquid_level,
@@ -39,6 +40,18 @@ export const LiquidOptionsRight = (props: {
tooltip="Choose the amount of liquid the belly can contain at most. Ranges from 10 to 300."
/>
+
+
+
@@ -90,7 +90,16 @@ export const VoreSelectedBellyLiquidOptions = (props: {
-
+
+
+ {`Nutrition / Power: ${liq_gen_resources.toFixed()} %`}
+
+
+ }
+ title="Current Liquids"
+ >
{liq_interacts.current_reagents
.sort((a, b) => a.volume - b.volume)
diff --git a/tgui/packages/tgui/interfaces/VorePanel/types.ts b/tgui/packages/tgui/interfaces/VorePanel/types.ts
index 536ae3e39d..71d6f3904b 100644
--- a/tgui/packages/tgui/interfaces/VorePanel/types.ts
+++ b/tgui/packages/tgui/interfaces/VorePanel/types.ts
@@ -213,6 +213,7 @@ export type ContentData = {
export type BellyLiquidData = {
show_liq: BooleanLike;
+ liq_gen_resources: number;
liq_interacts: LiqInteractData;
};
@@ -279,6 +280,7 @@ export type LiqInteractData = {
liq_reagent_transfer_verb: string;
liq_reagent_nutri_rate: number;
liq_reagent_capacity: number;
+ liq_gen_cost_limit: number;
liq_sloshing: BooleanLike;
liq_reagent_addons: CheckBoxEntry[];
custom_reagentcolor: string;
diff --git a/tgui/packages/tgui/interfaces/VorePanelExport/VorePanelExportBellyString.tsx b/tgui/packages/tgui/interfaces/VorePanelExport/VorePanelExportBellyString.tsx
index 773eb4628c..4f38b962ca 100644
--- a/tgui/packages/tgui/interfaces/VorePanelExport/VorePanelExportBellyString.tsx
+++ b/tgui/packages/tgui/interfaces/VorePanelExport/VorePanelExportBellyString.tsx
@@ -199,6 +199,7 @@ export const generateBellyString = (belly: Belly, index: number) => {
reagent_transfer_verb,
gen_time_display,
custom_max_volume,
+ reagent_gen_cost_limit,
vorefootsteps_sounds,
reagent_mode_flag_list,
liquid_overlay,
@@ -847,6 +848,10 @@ export const generateBellyString = (belly: Belly, index: number) => {
{ label: 'Transfer Verb', value: reagent_transfer_verb },
{ label: 'Generation Time', value: gen_time_display },
{ label: 'Liquid Capacity', value: custom_max_volume },
+ {
+ label: 'Generation Limit (Nutrition / Charge) %',
+ value: reagent_gen_cost_limit,
+ },
];
result += formatListItems(liquidItems);
diff --git a/tgui/packages/tgui/interfaces/VorePanelExport/types.ts b/tgui/packages/tgui/interfaces/VorePanelExport/types.ts
index 5efa3590d0..38e2804b5d 100644
--- a/tgui/packages/tgui/interfaces/VorePanelExport/types.ts
+++ b/tgui/packages/tgui/interfaces/VorePanelExport/types.ts
@@ -189,6 +189,7 @@ export type Belly = {
// Liquid Options
show_liquids: BooleanLike;
reagentbellymode: BooleanLike;
+ reagent_gen_cost_limit: number;
reagent_chosen: string;
reagent_name: string;
reagent_transfer_verb: string;
diff --git a/tgui/packages/tgui/interfaces/VotePanel.tsx b/tgui/packages/tgui/interfaces/VotePanel.tsx
index 523301acd9..94a398d6bd 100644
--- a/tgui/packages/tgui/interfaces/VotePanel.tsx
+++ b/tgui/packages/tgui/interfaces/VotePanel.tsx
@@ -20,7 +20,7 @@ export const VotePanel = (props, context) => {
- Time remaining: {remaining.toFixed(0)}s
+ Time remaining: {remaining.toFixed()}s
{choices.map((choice, i) => (
|