diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index dbd4e16bc8..5ef4e9ad31 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -21,6 +21,7 @@ var/nutrition_percent = 100 // Nutritional percentage per tick in digestion mode var/digest_brute = 0.5 // Brute damage per tick in digestion mode var/digest_burn = 0.5 // Burn damage per tick in digestion mode + var/digest_oxy = 0 // Oxy damage per tick in digestion mode var/immutable = FALSE // Prevents this belly from being deleted var/escapable = FALSE // Belly can be resisted out of at any time var/escapetime = 20 SECONDS // Deciseconds, how long to escape this belly @@ -132,6 +133,7 @@ "nutrition_percent", "digest_brute", "digest_burn", + "digest_oxy", "immutable", "can_taste", "escapable", @@ -818,6 +820,7 @@ dupe.nutrition_percent = nutrition_percent dupe.digest_brute = digest_brute dupe.digest_burn = digest_burn + dupe.digest_oxy = digest_oxy dupe.immutable = immutable dupe.can_taste = can_taste dupe.escapable = escapable diff --git a/code/modules/vore/eating/bellymodes_datum_vr.dm b/code/modules/vore/eating/bellymodes_datum_vr.dm index 2ddf31c52d..6a0ac0aa85 100644 --- a/code/modules/vore/eating/bellymodes_datum_vr.dm +++ b/code/modules/vore/eating/bellymodes_datum_vr.dm @@ -53,11 +53,14 @@ GLOBAL_LIST_INIT(digest_modes, list()) // Deal digestion damage (and feed the pred) var/old_brute = L.getBruteLoss() var/old_burn = L.getFireLoss() + var/old_oxy = L.getOxyLoss() L.adjustBruteLoss(B.digest_brute) L.adjustFireLoss(B.digest_burn) + L.adjustOxyLoss(B.digest_oxy) var/actual_brute = L.getBruteLoss() - old_brute var/actual_burn = L.getFireLoss() - old_burn - var/damage_gain = (actual_brute + actual_burn)*(B.nutrition_percent / 100) + var/actual_oxy = L.getOxyLoss() - old_oxy + var/damage_gain = (actual_brute + actual_burn + actual_oxy/2)*(B.nutrition_percent / 100) var/offset = (1 + ((L.weight - 137) / 137)) // 130 pounds = .95 140 pounds = 1.02 var/difference = B.owner.size_multiplier / L.size_multiplier diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 75a2540a0e..db94ac8b2f 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -77,6 +77,8 @@ if(!digestion_noise_chance) digestion_noise_chance = DM.noise_chance + +///////////////////// Time to actually process mobs ///////////////////// for(var/target in touchable_mobs) var/mob/living/L = target if(!istype(L)) diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 5ab90cdb40..3e3ed7f737 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -26,7 +26,7 @@ if(isbelly(item_storage)) var/obj/belly/B = item_storage - g_damage = 0.25 * (B.digest_brute + B.digest_burn) + g_damage = 0.25 * (B.digest_brute + B.digest_burn + (B.digest_oxy)/2) if(digest_stage > 0) if(g_damage > digest_stage) @@ -111,7 +111,7 @@ if((. = ..())) if(isbelly(item_storage)) var/obj/belly/B = item_storage - . += 2 * (B.digest_brute + B.digest_burn) + . += 2 * (B.digest_brute + B.digest_burn + (B.digest_oxy)/2) else . += 30 //Organs give a little more diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index bfca29f014..0cb90f1442 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -166,6 +166,7 @@ "nutrition_percent" = selected.nutrition_percent, "digest_brute" = selected.digest_brute, "digest_burn" = selected.digest_burn, + "digest_oxy" = selected.digest_oxy, "bulge_size" = selected.bulge_size, "shrink_grow_size" = selected.shrink_grow_size, "emote_time" = selected.emote_time, @@ -921,6 +922,12 @@ var/new_new_damage = CLAMP(new_damage, 0, 6) host.vore_selected.digest_brute = new_new_damage . = TRUE + if("b_oxy_dmg") + var/new_damage = input(user, "Choose the amount of suffocation damage prey will take per tick. Ranges from 0 to 12.", "Set Belly Suffocation Damage.", host.vore_selected.digest_oxy) as num|null + if(new_damage == null) + return FALSE + var/new_new_damage = CLAMP(new_damage, 0, 12) + host.vore_selected.digest_oxy = new_new_damage if("b_emoteactive") host.vore_selected.emote_active = !host.vore_selected.emote_active . = TRUE diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 845e896969..e145bfa875 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -287,6 +287,7 @@ const VoreSelectedBelly = (props, context) => { nutrition_percent, digest_brute, digest_burn, + digest_oxy, bulge_size, shrink_grow_size, emote_time, @@ -457,6 +458,11 @@ const VoreSelectedBelly = (props, context) => { onClick={() => act("set_attribute", { attribute: "b_burn_dmg" })} content={digest_burn} /> + +