diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 6347a091f4..6cd1f1d70c 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -74,6 +74,22 @@ icon_state = "cat" origin_tech = null +/obj/item/weapon/holder/mouse + name = "mouse" + desc = "It's a small rodent." + icon_state = "mouse_gray" + origin_tech = null + w_class = 1 + +/obj/item/weapon/holder/mouse/gray + icon_state = "mouse_gray" + +/obj/item/weapon/holder/mouse/white + icon_state = "mouse_white" + +/obj/item/weapon/holder/mouse/brown + icon_state = "mouse_brown" + /obj/item/weapon/holder/borer name = "cortical borer" desc = "It's a slimy brain slug. Gross." diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index ad41fc28aa..e94462a20b 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -28,6 +28,7 @@ maxbodytemp = 323 //Above 50 Degrees Celcius universal_speak = 0 universal_understand = 1 + holder_type = /obj/item/weapon/holder/mouse mob_size = 1 /mob/living/simple_animal/mouse/Life() @@ -62,6 +63,13 @@ if(!body_color) body_color = pick( list("brown","gray","white") ) + switch(body_color) + if("brown") + holder_type = /obj/item/weapon/holder/mouse/brown + if("gray") + holder_type = /obj/item/weapon/holder/mouse/gray + if("white") + holder_type = /obj/item/weapon/holder/mouse/white icon_state = "mouse_[body_color]" icon_living = "mouse_[body_color]" icon_dead = "mouse_[body_color]_dead" @@ -76,6 +84,22 @@ if(client) client.time_died_as_mouse = world.time +/mob/living/simple_animal/mouse/MouseDrop(atom/over_object) + + var/mob/living/carbon/H = over_object + if(!istype(H) || !Adjacent(H)) return ..() + + if(H.a_intent == "help") + get_scooped(H) + return + else + return ..() + +/mob/living/simple_animal/mouse/get_scooped(var/mob/living/carbon/grabber) + if (stat >= DEAD) + return + ..() + /mob/living/simple_animal/mouse/start_pulling(var/atom/movable/AM)//Prevents mouse from pulling things src << "You are too small to pull anything." return @@ -101,14 +125,17 @@ /mob/living/simple_animal/mouse/white body_color = "white" icon_state = "mouse_white" + holder_type = /obj/item/weapon/holder/mouse/white /mob/living/simple_animal/mouse/gray body_color = "gray" icon_state = "mouse_gray" + holder_type = /obj/item/weapon/holder/mouse/gray /mob/living/simple_animal/mouse/brown body_color = "brown" icon_state = "mouse_brown" + holder_type = /obj/item/weapon/holder/mouse/brown //TOM IS ALIVE! SQUEEEEEEEE~K :) /mob/living/simple_animal/mouse/brown/Tom diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 42c1b28cbf..15c0f98212 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 ed6383ba7c..c125ebf6b7 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 e7042ca3ad..d505697c52 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 9143ac4817..ac5c73a100 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ