From 2190676c88c32435bc76a19366992584667d6fd4 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 30 Oct 2022 14:57:01 +0200 Subject: [PATCH] Makes bluespace toilets react to bluespace content Since I had ended up fluffing them to work on Bluespace Magic:tm: I figured they should do what other bs tp stuff does, so now flushing something containing BoH kinda things will scramble the destination coordinates and land it somewhere random instead :v Just another unimportant boredom brainfart moment tbh --- .../game/objects/structures/watercloset_ch.dm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/modular_chomp/code/game/objects/structures/watercloset_ch.dm b/modular_chomp/code/game/objects/structures/watercloset_ch.dm index 2c94a77309..ea93649754 100644 --- a/modular_chomp/code/game/objects/structures/watercloset_ch.dm +++ b/modular_chomp/code/game/objects/structures/watercloset_ch.dm @@ -46,7 +46,21 @@ spawn(refill_cooldown) for(var/atom/movable/F in bowl_contents) if(F.loc == src) - F.forceMove(exit_landmark) + var/list/bs_things = list() + var/bs_error = FALSE + for(var/item in bluespace_item_types) + if(istype(F, item)) + bs_error = TRUE + else + bs_things |= F.search_contents_for(item) + if(bs_error || LAZYLEN(bs_things)) + bs_things.Cut() + bs_error = rand(1, 100) + var/list/posturfs = circlerangeturfs(exit_landmark,bs_error) + var/destturf = safepick(posturfs) + F.forceMove(destturf) + else + F.forceMove(exit_landmark) bowl_contents.Cut() refilling = FALSE return @@ -159,4 +173,4 @@ B.name = "waste hopper" B.desc = "With a resounding CRUNCH, your form has gotten snagged by the Muffin Monster's rotational interlocking cutters indiscriminately crunching away at anything unlucky enough to end up in its hopper, only for the insatiable machine to grind it all down into a slurry mulch fine enough to pass through the narrow sewage lines trouble-free..." B.digest_brute = 20 - B.special_entrance_sound = 'sound/machines/blender.ogg' \ No newline at end of file + B.special_entrance_sound = 'sound/machines/blender.ogg'