From 7a148f2a9db6f252128f4e32a96c953af664d01f Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 29 Sep 2018 16:07:22 +0300 Subject: [PATCH] Small qol tweaks for contamination and sleeperguts. -Removed the toxicity of gurgled items. (Planning to make them affect the user's examine flavor when equipped though.) -Removed the silly animation on mess overlay. (possible remake later with extra flavors etc) -Fixed sleeperbellies not suppressing injury emotes and deathmessages during digestion. -Ruled out the possibility of the sleeperbellies breaking over defined "patient" going "missing". --- code/modules/mob/death.dm | 2 +- .../mob/living/carbon/human/human_damage.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 2 +- .../silicon/robot/dogborg/dog_sleeper_vr.dm | 3 +++ code/modules/organs/organ_external.dm | 2 +- icons/effects/sludgeoverlay_vr.dmi | Bin 3952 -> 2104 bytes 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index af0fdf4301..39ce19fe6c 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -70,7 +70,7 @@ if(stat == DEAD) return 0 - if(src.loc && istype(loc,/obj/belly)) deathmessage = "no message" //VOREStation Add - Prevents death messages from inside mobs + if(src.loc && istype(loc,/obj/belly) || istype(loc,/obj/item/device/dogborg/sleeper)) deathmessage = "no message" //VOREStation Add - Prevents death messages from inside mobs facing_dir = null if(!gibbed && deathmessage != "no message") // This is gross, but reliable. Only brains use it. diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 45f174063f..28de4d6d93 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -447,7 +447,7 @@ This function restores all organs. if((damagetype != BRUTE) && (damagetype != BURN)) if(damagetype == HALLOSS) if((damage > 25 && prob(20)) || (damage > 50 && prob(60))) - if(organ && organ.organ_can_feel_pain() && !isbelly(loc)) //VOREStation Add + if(organ && organ.organ_can_feel_pain() && !isbelly(loc) && !istype(loc, /obj/item/device/dogborg/sleeper)) //VOREStation Add emote("scream") ..(damage, damagetype, def_zone, blocked, soaked) return 1 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index efa040bf2b..f3f72693d3 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -832,7 +832,7 @@ var/total_phoronloss = 0 for(var/obj/item/I in src) - if(I.contaminated || I.gurgled) //VOREStation Edit + if(I.contaminated) if(check_belly(I)) continue //VOREStation Edit if(src.species && src.species.get_bodytype() != "Vox") // This is hacky, I'm so sorry. diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index f6c2028fec..32e31c9a9a 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -560,6 +560,9 @@ if(T.reagents) volume = T.reagents.total_volume water.add_charge(volume) + if(patient == T) + patient_laststat = null + patient = null qdel(T) //Pick a random item to deal with (if there are any) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index c3c709852d..18633519db 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -273,7 +273,7 @@ if(status & ORGAN_BROKEN && brute) jostle_bone(brute) - if(organ_can_feel_pain() && prob(40) && !isbelly(owner.loc)) //VOREStation Edit + if(organ_can_feel_pain() && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/device/dogborg/sleeper)) //VOREStation Edit owner.emote("scream") //getting hit on broken hand hurts if(used_weapon) add_autopsy_data("[used_weapon]", brute + burn) diff --git a/icons/effects/sludgeoverlay_vr.dmi b/icons/effects/sludgeoverlay_vr.dmi index b2a251de6105aa27f997edfdc41c00bb5723913f..af99da5894095cd9b57e488157d9f6e9e690164b 100644 GIT binary patch literal 2104 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