mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-17 10:05:27 +01:00
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".
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user