From 5727add7ab0325e0bec5cfd7f25b837ae8b42d12 Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Thu, 13 Aug 2020 11:41:33 +0800 Subject: [PATCH] commit name --- code/game/objects/items/pet_carrier.dm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index ff2979dd8b..07053d42ff 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -245,6 +245,10 @@ var/datum/gas_mixture/occupant_gas_supply ///level until the reagent gets INGEST ed instead of TOUCH var/sipping_level = 150 + ///prob50 level of sipping + var/sipping_probably = 99 + ///chem transfer rate / second + var/transfer_rate = 5 /obj/item/pet_carrier/bluespace/Initialize() . = ..() @@ -259,10 +263,11 @@ /obj/item/pet_carrier/bluespace/attack_self(mob/living/user) ..() - if(open) - reagents.reagents_holder_flags = OPENCONTAINER - else - reagents.reagents_holder_flags = NONE + if(reagents) + if(open) + reagents.reagents_holder_flags = OPENCONTAINER + else + reagents.reagents_holder_flags = NONE /obj/item/pet_carrier/bluespace/update_icon_state() if(open) @@ -335,8 +340,9 @@ for(var/mob/living/L in occupants) if(!ishuman(L)) continue - if(reagents.total_volume >= sipping_level && prob(80)) + if((reagents.total_volume >= sipping_level) || ((reagents.total_volume >= sipping_probably) && prob(50))) //sipp reagents.reaction(L, INGEST) //consume + reagents.trans_to(L, transfer_rate) else reagents.reaction(L, TOUCH, show_message = FALSE)