From 6191c84860b028f400a70034095cdb00ef8578e0 Mon Sep 17 00:00:00 2001
From: Dragonkiller93 <82484852+Dragonkiller93@users.noreply.github.com>
Date: Sun, 6 Jun 2021 04:45:49 -0700
Subject: [PATCH] Poly can no longer grab inside disposals. (#16068)
* Poly can no longer grab inside disposals.
* Update code/modules/mob/living/simple_animal/parrot.dm
Spacing from SabreML
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
---
code/modules/mob/living/simple_animal/parrot.dm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 2dfc5ca2376..4a649dfe7e0 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -562,7 +562,9 @@
if(held_item)
to_chat(src, "You are already holding [held_item]")
return 1
-
+ if(istype(loc, /obj/machinery/disposal) || istype(loc, /obj/structure/disposalholder))
+ to_chat(src, "You are inside a disposal chute!")
+ return 1
for(var/obj/item/I in view(1, src))
//Make sure we're not already holding it and it's small enough
if(I.loc != src && I.w_class <= WEIGHT_CLASS_SMALL)