diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index a31c958b2c..f7d495f6ed 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -48,4 +48,12 @@ name = "maintenance drone" desc = "It's a small maintenance robot." icon_state = "drone" - origin_tech = "magnets=3;engineering=5" \ No newline at end of file + origin_tech = "magnets=3;engineering=5" + + +/obj/item/weapon/holder/cat + + name = "cat" + desc = "It's a cat. Meow." + icon_state = "cat" + origin_tech = null \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 92a27c27b7..a8a9122ef8 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -60,6 +60,25 @@ stop_automated_movement = 1 walk_to(src,movement_target,0,3) + +/mob/living/simple_animal/cat/MouseDrop(atom/over_object) + + var/mob/living/carbon/human/H = over_object + if(!istype(H)) return ..() + + //This REALLY needs to be moved to a general mob proc somewhere. + if(H.a_intent == "help") + var/obj/item/weapon/holder/cat/C = new(loc) + src.loc = C + C.name = loc.name + C.attack_hand(H) + H << "You scoop up [src]." + src << "[H] scoops you up." + H.status_flags |= PASSEMOTES + return + else + return ..() + //RUNTIME IS ALIVE! SQUEEEEEEEE~ /mob/living/simple_animal/cat/Runtime name = "Runtime" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 4d21da4b7d..a36dcfbbdc 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 6cfb9f443d..b55222ded0 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index eccf612ecb..0aa57a3d43 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 9b4a3d6499..8900043e3d 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ