From 47998153cdb742d264f6740ae4c556cea02db2ba Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sat, 25 Jul 2020 03:25:28 +0100 Subject: [PATCH] tweaks --- code/game/objects/items/pet_carrier.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index a60aa02ce1..e04278600d 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -108,6 +108,7 @@ return if(ishostile(target) && (!allows_hostiles || istype(target, /mob/living/simple_animal/hostile/carp/cayenne)) || target.move_resist < MOVE_FORCE_VERY_STRONG) //don't allow goliaths into pet carriers, but let cayenne in! to_chat(user, "You have a feeling you shouldn't keep this as a pet.") + return load_occupant(user, target) /obj/item/pet_carrier/relaymove(mob/living/user, direction) @@ -147,7 +148,7 @@ update_icon() else loc.visible_message("[src] starts rattling as something pushes against the [entrance_name]!", null, null, null, user) - to_chat(user, "You start pushing out of [src]... (This will take about 20 seconds.)") + to_chat(user, "You start pushing out of [src]... (This will take about [escape_time/10] seconds.)") if(!do_after(user, escape_time, target = user) || open || !locked || !(user in occupants)) return loc.visible_message("[user] shoves out of [src]!", null, null, null, user) @@ -230,7 +231,7 @@ allows_hostiles = TRUE //can fit hostile creatures, with the move resist restrictions in place, this means they still cannot take things like legions/goliaths/etc regardless has_lock_sprites = FALSE //jar doesn't show the regular lock overlay custom_materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 600) - escape_time = 10 //half the time of a bluespace bodybag + escape_time = 100 //half the time of a bluespace bodybag var/datum/gas_mixture/occupant_gas_supply /obj/item/pet_carrier/bluespace/update_icon_state()