diff --git a/code/defines/mob/simple_animal/life.dm b/code/defines/mob/simple_animal/life.dm index 5f9e840344f..cc6eaa0e6fe 100644 --- a/code/defines/mob/simple_animal/life.dm +++ b/code/defines/mob/simple_animal/life.dm @@ -132,6 +132,23 @@ onclose(user, "mob[name]") return +/mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob) + if(inventory_head && inventory_back) + //helmet and armor = 100% protection + if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) ) + if( O.force ) + usr << "\red This animal is wearing too much armor. You can't cause it any damage." + for (var/mob/M in viewers(src, null)) + M.show_message("\red \b [user] hits [src] with the [O], however [src] is too armored.") + else + usr << "\red This animal is wearing too much armor. You can't reach it's skin." + for (var/mob/M in viewers(src, null)) + M.show_message("\red [user] gently taps [src] with the [O]. ") + if(prob(15)) + emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on it's face") + return + ..() + /mob/living/simple_animal/corgi/Topic(href, href_list) //Removing from inventory if(href_list["remove_inv"]) @@ -178,7 +195,8 @@ //to be compatible with them. The objects are below. var/list/allowed_types = list( - /obj/item/clothing/head/helmet + /obj/item/clothing/head/helmet, + /obj/item/clothing/glasses/sunglasses ) if( ! ( item_to_add.type in allowed_types ) ) diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 0617b7cab19..5097495d368 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ