From db57f5834b8dc3fffb87777fe9e5f4d2cfa2a644 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Thu, 20 Aug 2015 22:34:03 -0300 Subject: [PATCH] Fixes a runtime caused when interacting with a hat-less Ian --- code/modules/mob/living/simple_animal/friendly/dog.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index bc0ebe9883b..83766139bb4 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -275,7 +275,9 @@ return valid /mob/living/simple_animal/pet/dog/corgi/proc/update_corgi_fluff() - switch(src.inventory_head.type) + if(!inventory_head) + return + switch(inventory_head.type) if(/obj/item/clothing/head/helmet) name = "Sergeant [real_name]" desc = "The ever-loyal, the ever-vigilant."