diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index d1adff7d..7fa4c4ba 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -71,6 +71,34 @@ icon_state = "cat" origin_tech = null +// Fuck the mice and their shitty fucking colors - Morgan + +/obj/item/weapon/holder/mouse/gray + name = "mouse" + desc = "It's a mouse. Squeak." + icon_state = "mouse_gray" + origin_tech = null + +/obj/item/weapon/holder/mouse/white + name = "mouse" + desc = "It's a mouse. Squeak." + icon_state = "mouse_white" + origin_tech = null + +/obj/item/weapon/holder/mouse/brown + name = "mouse" + desc = "It's a mouse. Squeak." + icon_state = "mouse_brown" + origin_tech = null + +// End shitty mouse section - Morgan + +/obj/item/weapon/holder/lizard + name = "lizard" + desc = "It's a lizard. Keep Phoebe away." + icon_state = "lizard" + origin_tech = null + /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/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index 4b058ce3..6e41b194 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -15,4 +15,16 @@ melee_damage_upper = 2 response_help = "pets" response_disarm = "shoos" - response_harm = "stomps on" \ No newline at end of file + response_harm = "stomps on" + holder_type = /obj/item/weapon/holder/lizard + +/mob/living/simple_animal/lizard/MouseDrop(atom/over_object) + + var/mob/living/carbon/H = over_object + if(!istype(H)) return ..() + + if(H.a_intent == "help") + get_scooped(H) + return + else + return ..() \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 7a83edb9..519e3593 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 = null /mob/living/simple_animal/mouse/Life() ..() @@ -90,6 +91,17 @@ 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)) return ..() + + if(H.a_intent == "help") + get_scooped(H) + return + else + return ..() + /* * Mouse types */ @@ -97,14 +109,18 @@ /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/obj/objects.dmi b/icons/obj/objects.dmi index f5d95ac8..f1408749 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ