Holder - Mice/Lizards

Holdable Mice and Lizards. Added icons to Objects, so they have object
icons.
This commit is contained in:
Meowykins
2015-02-14 21:38:40 -06:00
parent d96cc75fe7
commit e0d0c35bbb
4 changed files with 57 additions and 1 deletions
+28
View File
@@ -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."
@@ -15,4 +15,16 @@
melee_damage_upper = 2
response_help = "pets"
response_disarm = "shoos"
response_harm = "stomps on"
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 ..()
@@ -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