diff --git a/code/__defines/belly_modes_vr.dm b/code/__defines/belly_modes_vr.dm index bf64819cd45..810f0da00b3 100644 --- a/code/__defines/belly_modes_vr.dm +++ b/code/__defines/belly_modes_vr.dm @@ -18,6 +18,7 @@ #define DM_FLAG_THICKBELLY 0x8 #define DM_FLAG_AFFECTWORN 0x10 #define DM_FLAG_JAMSENSORS 0x20 +#define DM_FLAG_FORCEPSAY 0x40 //Item related modes #define IM_HOLD "Hold" diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index 7516be2efff..b0b3fce0bb0 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -27,6 +27,11 @@ if(world.time < next_emote) to_chat(src, SPAN_WARNING("You cannot use another emote yet.")) return + //VOREStation Addition Start + if(forced_psay) + pme(message) + return + //VOREStation Addition End if(act == "help") if(world.time >= next_emote_refresh) diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm index 684c0c08a16..06eeee7ac37 100644 --- a/code/modules/mob/living/living_defines_vr.dm +++ b/code/modules/mob/living/living_defines_vr.dm @@ -1,5 +1,6 @@ /mob - var/muffled = 0 // Used by muffling belly + var/muffled = FALSE // Used by muffling belly + var/forced_psay = FALSE // If true will prevent the user from speaking with normal say/emotes, and instead redirect these to a private speech mode with their predator. /mob/living var/ooc_notes = null diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 21f0e7df2ca..d10a1d3f0d7 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -155,7 +155,11 @@ var/list/channel_to_radio_key = new if(stat == DEAD && !forbid_seeing_deadchat) return say_dead(message) return - + //VOREStation Addition Start + if(forced_psay) + psay(message) + return + //VOREStation Addition End //Parse the mode var/message_mode = parse_message_mode(message, "headset") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm index b0c3bb9ca6e..8b38d1965ee 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm @@ -5,6 +5,7 @@ desc = "Someone who has taken a back seat within their own body." icon = 'icons/obj/surgery.dmi' icon_state = "brain1" + forced_psay = TRUE var/mob/living/prey_body //The body of the person who dominated the brain var/prey_ckey //The ckey of the person who dominated the brain var/prey_name //In case the body is missing. ;3c @@ -61,107 +62,9 @@ pred_body = null /mob/living/dominated_brain/Destroy() - if(pred_body) - var/P = FALSE - for(var/I in pred_body) - if(I == src) - continue - if(istype(I, /mob/living/dominated_brain)) - P = TRUE - if(!P) - pred_body.verbs -= /mob/proc/psay - pred_body.verbs -= /mob/proc/pme - lets_unregister_our_signals() . = ..() -/mob/living/dominated_brain/say(var/message, var/datum/language/speaking = null, var/whispering = 0) - - if (src.client) - if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") - return - - if(loc == pred_body) - - message = sanitize(message) - if (!message) - return - log_say(message,src) - if (stat == 2) - return say_dead(message) - - to_chat(src, "You think, \"[message]\"") - to_chat(pred_body, "The captive mind of \the [src] thinks, \"[message]\"") - for(var/I in pred_body.contents) - if(istype(I, /mob/living/dominated_brain) && I != src) - var/mob/living/dominated_brain/db = I - to_chat(db, "The captive mind of \the [src] thinks, \"[message]\"") - - for (var/mob/M in player_list) - if (istype(M, /mob/new_player)) - continue - else if(M.stat == DEAD && M.is_preference_enabled(/datum/client_preference/ghost_ears)) - to_chat(M, "The captive mind of [src] whispers, \"[message]\"") - -/mob/living/dominated_brain/me_verb(message as text) - if (src.client) - if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") - return - - if(loc == pred_body) - - message = sanitize(message) - if (!message) - return - log_emote(message,src) - if (stat == 2) - return say_dead(message) - - to_chat(src, "\The [src] [message]") - to_chat(pred_body, "\The [src] [message]") - for(var/I in pred_body.contents) - if(istype(I, /mob/living/dominated_brain) && I != src) - var/mob/living/dominated_brain/db = I - to_chat(db, "\The [src] [message]") - - for (var/mob/M in player_list) - if (istype(M, /mob/new_player)) - continue - else if(M.stat == DEAD && M.is_preference_enabled(/datum/client_preference/ghost_ears)) - to_chat(M, "\The [src] [message]") - return - -/mob/living/dominated_brain/emote(var/message) - if (src.client) - if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") - return - - if(loc == pred_body) - - message = sanitize(message) - if (!message) - return - log_emote(message,src) - if (stat == 2) - return say_dead(message) - - to_chat(src, "\The [src] [message]") - to_chat(pred_body, "\The [src] [message]") - for(var/I in pred_body.contents) - if(istype(I, /mob/living/dominated_brain) && I != src) - var/mob/living/dominated_brain/db = I - to_chat(db, "\The [src] [message]") - - for (var/mob/M in player_list) - if (istype(M, /mob/new_player)) - continue - else if(M.stat == DEAD && M.is_preference_enabled(/datum/client_preference/ghost_ears)) - to_chat(M, "\The [src] [message]") - return - /mob/living/dominated_brain/process_resist() //Resisting control by an alien mind. if(pred_body.ckey == pred_ckey) @@ -199,8 +102,6 @@ ndb.name = prey_name ndb.prey_ckey = src.prey_ckey ndb.pred_ckey = src.pred_ckey - ndb.pred_body.verbs |= /mob/proc/pme - ndb.pred_body.verbs |= /mob/proc/psay prey_goes_here = ndb prey_goes_here.real_name = src.prey_name @@ -215,8 +116,6 @@ ndb.name = prey_name ndb.prey_ckey = src.prey_ckey ndb.pred_ckey = src.pred_ckey - ndb.pred_body.verbs |= /mob/proc/pme - ndb.pred_body.verbs |= /mob/proc/psay prey_goes_here = ndb src.languages -= src.temp_languages @@ -234,26 +133,29 @@ pred_body.ckey = src.pred_ckey pred_body.ooc_notes = pred_ooc_notes log_and_message_admins("[pred_body] is now controlled by [pred_body.ckey]. They were restored to control through prey domination, and had been controlled by [prey_ckey].") - handle_langs(src) + pred_body.absorb_langs() pred_body.prey_controlled = FALSE qdel(src) -/mob/living/dominated_brain/proc/handle_langs(var/mob/M) +/mob/living/proc/absorb_langs() //This should be called on the predator in the exchange var/list/langlist = list() - pred_body.languages -= pred_body.temp_languages - LAZYCLEARLIST(pred_body.temp_languages) - pred_body.temp_languages = list() - for(var/i in loc) - if(i == M) - continue - if(istype(i,/mob/living/dominated_brain)) - var/mob/living/dominated_brain/db = i - langlist |= db.languages - langlist |= db.prey_langs - langlist -= pred_body.languages - pred_body.temp_languages |= langlist - pred_body.languages |= langlist + languages -= temp_languages + LAZYCLEARLIST(src.temp_languages) + src.temp_languages = list() + for(var/mob/living/L in contents) + if(istype(L,/mob/living/dominated_brain)) + if(L.ckey) + langlist |= L.languages + for(var/b in vore_organs) + for(var/mob/living/L in b) + if(isliving(L)) + if(L.ckey) + langlist |= L.languages + if(langlist.len) + langlist -= languages + temp_languages |= langlist + languages |= langlist //Welcome to the adapted borer code. /mob/proc/dominate_predator() @@ -319,8 +221,6 @@ else pred_brain = new /mob/living/dominated_brain(pred, pred, name, prey) - pred.verbs |= /mob/proc/pme - pred.verbs |= /mob/proc/psay pred_brain.prey_ooc_notes = prey.ooc_notes pred_brain.pred_ooc_notes = pred.ooc_notes pred_brain.name = pred.name @@ -330,7 +230,7 @@ pred_brain.prey_langs |= preylangs pred_brain.prey_ckey = prey.ckey pred_brain.pred_ckey = pred.ckey - pred_brain.handle_langs() + pred_brain.pred_body.absorb_langs() pred.ooc_notes = pred_brain.prey_ooc_notes pred.verbs |= /mob/proc/release_predator @@ -381,72 +281,6 @@ else to_chat(src, "\The [pred_body] is already dominated, and cannot be controlled at this time.") - -/mob/proc/psay(message as text|null) - set category = "Abilities" - set name = "Prey Say (psay)" - set desc = "Emote to a dominated predator/prey." - - if (src.client) - if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") - return - message = sanitize(message) - if (!message) - message = input(usr, "Type a message to emote.","Emote to prey") as text|null - if (!message) - return - - var/f = FALSE - for(var/I in contents) - if(istype(I, /mob/living/dominated_brain)) - var/mob/living/dominated_brain/db = I - to_chat(db, "\The [src] thinks, \"[message]\"") - f = TRUE - if(f) - to_chat(src, "You think \"[message]\"") - for (var/mob/M in player_list) - if (istype(M, /mob/new_player)) - continue - else if(M.stat == DEAD && M.is_preference_enabled(/datum/client_preference/ghost_ears)) - to_chat(M, "\The [src] thinks, \"[message]\"") - log_say(message,src) - else - to_chat(src, "There is no one inside you to talk to...") - return - -/mob/proc/pme(message as text|null) - set category = "Abilities" - set name = "Prey Emote (pme)" - set desc = "Emote to a dominated predator/prey." - - if (src.client) - if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") - return - message = sanitize(message) - if (!message) - message = input(usr, "Type a message to emote.","Emote to prey") as text|null - if (!message) - return - var/f = FALSE - for(var/I in contents) - if(istype(I, /mob/living/dominated_brain)) - var/mob/living/dominated_brain/db = I - to_chat(db, "\The [src] [message]") - f = TRUE - if(f) - to_chat(src, "\The [src] [message]") - for (var/mob/M in player_list) - if (istype(M, /mob/new_player)) - continue - else if(M.stat == DEAD && M.is_preference_enabled(/datum/client_preference/ghost_ears)) - to_chat(M, "\The [src] [message]") - log_emote(message,src) - else - to_chat(src, "There is no one inside you to talk to...") - return - /mob/living/proc/dominate_prey() set category = "Abilities" set name = "Dominate Prey" @@ -491,8 +325,6 @@ var/mob/living/dominated_brain/db = new /mob/living/dominated_brain(src, src, M.name, M) - verbs |= /mob/proc/pme - verbs |= /mob/proc/psay db.name = M.name db.prey_ckey = M.ckey db.pred_ckey = src.ckey @@ -502,10 +334,11 @@ M.languages -= M.temp_languages db.languages |= M.languages - db.handle_langs() db.ooc_notes = M.ooc_notes db.verbs |= /mob/living/dominated_brain/proc/cease_this_foolishness + absorb_langs() + db.ckey = db.prey_ckey log_admin("[db] ([db.ckey]) has agreed to [src]'s dominate prey attempt, and so no longer occupies their original body.") to_chat(src, "You feel your mind expanded as [M] is incorporated into you.") @@ -523,7 +356,7 @@ if(prey_body && prey_body.loc.loc == pred_body) prey_body.ckey = prey_ckey - handle_langs(src) + pred_body.absorb_langs() to_chat(src, "Your connection to [pred_body] fades, and you awaken back in your own body!") to_chat(pred_body, "You feel as though a piece of yourself is missing, as \the [src] returns to their body.") log_admin("[src] ([src.ckey]) has returned to their body, [prey_body].") diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index c30d256c596..d51d048da18 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -4,12 +4,22 @@ /mob/verb/whisper(message as text) set name = "Whisper" set category = "IC" + //VOREStation Addition Start + if(forced_psay) + psay(message) + return + //VOREStation Addition End usr.say(message,whispering=1) /mob/verb/say_verb(message as text) set name = "Say" set category = "IC" + //VOREStation Addition Start + if(forced_psay) + psay(message) + return + //VOREStation Addition End set_typing_indicator(FALSE) usr.say(message) @@ -21,6 +31,11 @@ if(say_disabled) //This is here to try to identify lag problems to_chat(usr, "Speech is currently admin-disabled.") return + //VOREStation Addition Start + if(forced_psay) + pme(message) + return + //VOREStation Addition End //VOREStation Edit Start if(muffled) @@ -63,6 +78,15 @@ else if(universal_speak || universal_understand) return TRUE + //VOREStation Addition Start + if(isliving(src)) + var/mob/living/L = src + if(isbelly(L.loc) && L.absorbed) + var/mob/living/P = L.loc.loc + if(P.say_understands(other, speaking)) + return TRUE + //VOREStation Addition End + //Languages are handled after. if(!speaking) if(!other) diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 8b06163590c..389d726d982 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -10,6 +10,11 @@ if(say_disabled) //This is here to try to identify lag problems to_chat(usr, "Speech is currently admin-disabled.") return + //VOREStation Addition Start + if(forced_psay) + pme(message) + return + //VOREStation Addition End message = sanitize_or_reflect(message,src) //VOREStation Edit - Reflect too-long messages (within reason) if(!message) @@ -26,6 +31,12 @@ to_chat(src, "You are unable to emote.") return + //VOREStation Addition Start + if(forced_psay) + pme(message) + return + //VOREStation Addition End + var/muzzled = is_muzzled() if(m_type == 2 && muzzled) return @@ -99,3 +110,159 @@ to_chat(user,message) to_chat(user, "^ This message was NOT SENT ^ -- It was [length] characters, and the limit is [MAX_MESSAGE_LEN]. It would fit in [posts] separate messages.") #undef MAX_HUGE_MESSAGE_LEN + +///// PSAY ///// + +/mob/verb/psay(message as text|null) + set category = "Abilities" + set name = "Psay" + set desc = "Talk to an absorbed or dominated predator/prey." + + if (src.client) + if(client.prefs.muted & MUTE_IC) + to_chat(src, "You cannot speak in IC (muted).") + return + message = sanitize_or_reflect(message,src) + if (!message) + message = input(usr, "Type a message to say.","Psay") as text|null + if (!message) + return + if (stat == DEAD) + return say_dead(message) + if(!isliving(src)) + forced_psay = FALSE + say(message) + var/f = FALSE //did we find someone to send the message to other than ourself? + var/mob/living/pb //predator body + var/mob/living/M = src + if(istype(M, /mob/living/dominated_brain)) + var/mob/living/dominated_brain/db = M + if(db.loc != db.pred_body) + to_chat(db, "You aren't inside of a brain anymore!!!") + qdel(db) //Oh no, dominated brains shouldn't exist outside of the body, so if we got here something went very wrong. + return + else + pb = db.pred_body + to_chat(pb, "The captive mind of \the [M] thinks, \"[message]\"") //To our pred if dominated brain + f = TRUE + else if(M.forced_psay && M.absorbed) + if(isbelly(M.loc)) + pb = M.loc.loc + to_chat(pb, "\The [M] thinks, \"[message]\"") //To our pred if absorbed + f = TRUE + else + M.forced_psay = FALSE + M.say(message) + + if(pb) //We are prey, let's do the prey thing. + + for(var/I in pb.contents) + if(istype(I, /mob/living/dominated_brain) && I != M) + var/mob/living/dominated_brain/db = I + to_chat(db, "The captive mind of \the [M] thinks, \"[message]\"") //To any dominated brains in the pred + f = TRUE + for(var/B in pb.vore_organs) + for(var/mob/living/L in B) + if(L.absorbed && L != M) + to_chat(L, "\The [M] thinks, \"[message]\"") //To any absorbed people in the pred + f = TRUE + + //Let's also check and see if there's anyone inside of us to send the message to. + for(var/I in M.contents) + if(istype(I, /mob/living/dominated_brain)) + var/mob/living/dominated_brain/db = I + to_chat(db, "\The [M] thinks, \"[message]\"") //To any dominated brains inside us + f = TRUE + for(var/B in M.vore_organs) + for(var/mob/living/L in B) + if(L.absorbed) + to_chat(L, "\The [M] thinks, \"[message]\"") //To any absorbed people inside us + f = TRUE + + if(f) //We found someone to send the message to, let's not print the failed message. + to_chat(M, "You think \"[message]\"") //To us, if we found anyone to send the message to + for (var/mob/G in player_list) + if (istype(G, /mob/new_player)) + continue + else if(G.stat == DEAD && G.is_preference_enabled(/datum/client_preference/ghost_ears)) + to_chat(G, "\The [M] thinks, \"[message]\"") + log_say(message,M) + else + to_chat(M, "There is no one inside you to talk to... ([message])") //So sad + +///// PME ///// + +/mob/verb/pme(message as text|null) + set category = "Abilities" + set name = "Pme" + set desc = "Emote to an absorbed or dominated predator/prey." + + if (src.client) + if(client.prefs.muted & MUTE_IC) + to_chat(src, "You cannot speak in IC (muted).") + return + message = sanitize_or_reflect(message,src) + if (!message) + message = input(usr, "Type a message to emote.","Pme") as text|null + if (!message) + return + if (stat == DEAD) + return say_dead(message) + if(!isliving(src)) + forced_psay = FALSE + me_verb(message) + var/f = FALSE //did we find someone to send the message to other than ourself? + var/mob/living/pb //predator body + var/mob/living/M = src + if(istype(M, /mob/living/dominated_brain)) + var/mob/living/dominated_brain/db = M + if(db.loc != db.pred_body) + to_chat(db, "You aren't inside of a brain anymore!!!") + qdel(db) //Oh no, dominated brains shouldn't exist outside of the body, so if we got here something went very wrong. + return + else + pb = db.pred_body + if(M.forced_psay) + if(isbelly(M.loc) && M.absorbed) + pb = M.loc.loc + else + M.forced_psay = FALSE + M.me_verb(message) + + if(pb) //We are prey, let's do the prey thing. + + to_chat(pb, "\The [M] [message]") //To our pred + f = TRUE + for(var/I in pb.contents) + if(istype(I, /mob/living/dominated_brain) && I != M) + var/mob/living/dominated_brain/db = I + to_chat(db, "\The [M] [message]") //To any dominated brains in the pred + f = TRUE + for(var/B in pb.vore_organs) + for(var/mob/living/L in B) + if(L.absorbed && L != M) + to_chat(L, "\The [M] [message]") //To any absorbed people in the pred + f = TRUE + + //Let's also check and see if there's anyone inside of us to send the message to. + for(var/I in M.contents) + if(istype(I, /mob/living/dominated_brain)) + var/mob/living/dominated_brain/db = I + to_chat(db, "\The [M] [message]") //To any dominated brains inside us + f = TRUE + for(var/B in M.vore_organs) + for(var/mob/living/L in B) + if(L.absorbed) + to_chat(L, "\The [M] [message]") //To any absorbed people inside us + f = TRUE + + if(f) //We found someone to send the message to, let's not print the failed message. + to_chat(M, "\The [M] [message]") //To us, if we found anyone to send the message to + for (var/mob/G in player_list) + if (istype(G, /mob/new_player)) + continue + else if(G.stat == DEAD && G.is_preference_enabled(/datum/client_preference/ghost_ears)) + to_chat(G, "\The [M] [message]") + log_say(message,M) + else + to_chat(M, "There is no one inside you to talk to... ([message])") //So sad diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 02f86a734f0..bc6b6a841df 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -59,7 +59,7 @@ //Actual full digest modes var/tmp/static/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_ABSORB,DM_DRAIN,DM_UNABSORB,DM_HEAL,DM_SHRINK,DM_GROW,DM_SIZE_STEAL,DM_EGG) //Digest mode addon flags - var/tmp/static/list/mode_flag_list = list("Numbing" = DM_FLAG_NUMBING, "Stripping" = DM_FLAG_STRIPPING, "Leave Remains" = DM_FLAG_LEAVEREMAINS, "Muffles" = DM_FLAG_THICKBELLY, "Affect Worn Items" = DM_FLAG_AFFECTWORN, "Jams Sensors" = DM_FLAG_JAMSENSORS) + var/tmp/static/list/mode_flag_list = list("Numbing" = DM_FLAG_NUMBING, "Stripping" = DM_FLAG_STRIPPING, "Leave Remains" = DM_FLAG_LEAVEREMAINS, "Muffles" = DM_FLAG_THICKBELLY, "Affect Worn Items" = DM_FLAG_AFFECTWORN, "Jams Sensors" = DM_FLAG_JAMSENSORS, "Turbo Absorb" = DM_FLAG_FORCEPSAY) //Item related modes var/tmp/static/list/item_digest_modes = list(IM_HOLD,IM_DIGEST_FOOD,IM_DIGEST) @@ -359,9 +359,12 @@ p.undo_prey_takeover(FALSE) return 0 for(var/mob/living/L in M.contents) - L.muffled = 0 + L.muffled = FALSE + L.forced_psay = FALSE + for(var/obj/item/weapon/holder/H in M.contents) - H.held_mob.muffled = 0 + H.held_mob.muffled = FALSE + H.held_mob.forced_psay = FALSE //Place them into our drop_location M.forceMove(drop_location()) @@ -375,7 +378,9 @@ if(ML.client) ML.stop_sound_channel(CHANNEL_PREYLOOP) //Stop the internal loop, it'll restart if the isbelly check on next tick anyway if(ML.muffled) - ML.muffled = 0 + ML.muffled = FALSE + if(ML.forced_psay) + ML.forced_psay = FALSE if(ML.absorbed) ML.absorbed = FALSE handle_absorb_langs(ML, owner) @@ -685,8 +690,6 @@ M.absorbed = TRUE if(M.ckey) - owner.temp_language_sources += M - M.temp_language_sources += owner handle_absorb_langs(M, owner) GLOB.prey_absorbed_roundstat++ @@ -769,35 +772,9 @@ owner.update_icon() ///////////////////////////////////////////////////////////////////////// -/obj/belly/proc/handle_absorb_langs(var/mob/living/prey, var/mob/living/pred) - for(var/mob/living/p in pred.temp_language_sources) //Let's look at the pred's sources - if (!p.absorbed) - for(var/L in pred.temp_languages) - if(L in p.languages) - pred.languages -= L - pred.temp_languages -= L - pred.temp_language_sources -= p - else - for(var/L in p.languages) - if(L in pred.languages) - continue - pred.languages += L - pred.temp_languages += L - - for(var/mob/living/P in prey.temp_language_sources) //Let's look at the prey's sources - if (!prey.absorbed) - for(var/L in prey.temp_languages) - if(L in P.languages) - prey.languages -= L - prey.temp_languages -= L - prey.temp_language_sources -= P - else - for(var/L in P.languages) - if(L in prey.languages) - continue - prey.languages += L - prey.temp_languages += L - +/obj/belly/proc/handle_absorb_langs() + owner.absorb_langs() + //////////////////////////////////////////////////////////////////////// diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 7509c11cc4c..9a73677c0d4 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -186,6 +186,10 @@ if((mode_flags & DM_FLAG_THICKBELLY) && !H.muffled) H.muffled = TRUE + //Force psay + if((mode_flags & DM_FLAG_FORCEPSAY) && !H.forced_psay && H.absorbed) + H.forced_psay = TRUE + //Worn items flag if(mode_flags & DM_FLAG_AFFECTWORN) for(var/slot in slots) diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 3e76a341016..741d7e0941b 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -19,7 +19,6 @@ qdel(O) else if(item_storage) O.forceMove(item_storage) - GLOB.items_digested_roundstat++ qdel(src) return w_class @@ -58,7 +57,6 @@ S.use(1) digest_stage = w_class else - GLOB.items_digested_roundstat++ qdel(src) if(g_damage > w_class) return w_class diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 67b005666bc..4038ed6c54b 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -416,8 +416,8 @@ if(confirm != "Okay" || loc != B) return //Actual escaping - absorbed = 0 //Make sure we're not absorbed - muffled = 0 //Removes Muffling + absorbed = FALSE //Make sure we're not absorbed + muffled = FALSE //Removes Muffling forceMove(get_turf(src)) //Just move me up to the turf, let's not cascade through bellies, there's been a problem, let's just leave. for(var/mob/living/simple_mob/SA in range(10)) SA.prey_excludes[src] = world.time