From 55f6c039b34abc972732be045ff928e657b4e01d Mon Sep 17 00:00:00 2001 From: oranges Date: Sat, 19 Jan 2019 21:00:47 +1300 Subject: [PATCH] Showers no longer runtime when you shower with an empty hand (#42410) held items actually contains "null" entries by default using just var/I gets these null items and then tries to wash_obj a null causing a runtime Specifying /obj/item will stop the nulls being iterated --- code/game/objects/structures/shower.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 0896a396081..ebe2ba047bb 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -131,7 +131,8 @@ if(iscarbon(L)) var/mob/living/carbon/M = L . = TRUE - for(var/I in M.held_items) + + for(var/obj/item/I in M.held_items) wash_obj(I) if(M.back && wash_obj(M.back))