diff --git a/code/game/objects/random/mob.dm b/code/game/objects/random/mob.dm index d0cee5dff00..be1222aabef 100644 --- a/code/game/objects/random/mob.dm +++ b/code/game/objects/random/mob.dm @@ -240,6 +240,7 @@ /obj/random/mob/mouse/item_to_spawn() return pick(prob(15);/mob/living/simple_mob/animal/passive/mouse/white, + prob(15);/mob/living/simple_mob/animal/passive/mouse/black, prob(30);/mob/living/simple_mob/animal/passive/mouse/brown, prob(30);/mob/living/simple_mob/animal/passive/mouse/gray, prob(30);/mob/living/simple_mob/animal/passive/mouse/rat) diff --git a/code/modules/gamemaster/event2/events/everyone/infestation.dm b/code/modules/gamemaster/event2/events/everyone/infestation.dm index f51456f3628..512679d2fc5 100644 --- a/code/modules/gamemaster/event2/events/everyone/infestation.dm +++ b/code/modules/gamemaster/event2/events/everyone/infestation.dm @@ -31,6 +31,7 @@ things_to_spawn = list( /mob/living/simple_mob/animal/passive/mouse/gray, /mob/living/simple_mob/animal/passive/mouse/brown, + /mob/living/simple_mob/animal/passive/mouse/black, /mob/living/simple_mob/animal/passive/mouse/white, /mob/living/simple_mob/animal/passive/mouse/rat ) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 66c4c81e89d..28cd67588bf 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -136,6 +136,12 @@ var/list/holder_mob_icon_cache = list() /obj/item/weapon/holder/mouse/brown item_state = "mouse_brown" +/obj/item/weapon/holder/mouse/black + item_state = "mouse_black" + +/obj/item/weapon/holder/mouse/operative + item_state = "mouse_operative" + /obj/item/weapon/holder/mouse/rat item_state = "mouse_rat" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm index 56308083555..6dfcd7ae6fe 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm @@ -61,12 +61,16 @@ if (body_color != "rat") desc = "A small [body_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself." holder_type = /obj/item/weapon/holder/mouse/rat + if (body_color == "operative") + holder_type = /obj/item/weapon/holder/mouse/operative if (body_color == "brown") holder_type = /obj/item/weapon/holder/mouse/brown if (body_color == "gray") holder_type = /obj/item/weapon/holder/mouse/gray if (body_color == "white") holder_type = /obj/item/weapon/holder/mouse/white + if (body_color == "black") + holder_type = /obj/item/weapon/holder/mouse/black /mob/living/simple_mob/animal/passive/mouse/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) @@ -119,6 +123,22 @@ icon_rest = "mouse_brown_sleep" holder_type = /obj/item/weapon/holder/mouse/brown +//TOM IS ALIVE! SQUEEEEEEEE~K :) +/mob/living/simple_mob/animal/passive/mouse/brown/Tom + name = "Tom" + desc = "Jerry the cat is not amused." + +/mob/living/simple_mob/animal/passive/mouse/brown/Tom/New() + ..() + // Change my name back, don't want to be named Tom (666) + name = initial(name) + +/mob/living/simple_mob/animal/passive/mouse/black + body_color = "black" + icon_state = "mouse_black" + icon_rest = "mouse_black_sleep" + holder_type = /obj/item/weapon/holder/mouse/black + /mob/living/simple_mob/animal/passive/mouse/rat name = "rat" tt_desc = "E Rattus rattus" @@ -132,17 +152,39 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive -//TOM IS ALIVE! SQUEEEEEEEE~K :) -/mob/living/simple_mob/animal/passive/mouse/brown/Tom - name = "Tom" - desc = "Jerry the cat is not amused." +/mob/living/simple_mob/animal/passive/mouse/operative + name = "mouse operative" + desc = "A cute mouse fitted with a custom blood red suit. Sneaky." + body_color = "operative" + icon_state = "mouse_operative" + icon_rest = "mouse_operative_sleep" + holder_type = /obj/item/weapon/holder/mouse/operative + maxHealth = 35 -/mob/living/simple_mob/animal/passive/mouse/brown/Tom/New() + //It's wearing a void suit, it don't care about atmos + health = 35 + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + maxbodytemp = 700 + + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive + +//The names Cheese... Agent Cheese +/mob/living/simple_mob/animal/passive/mouse/operative/agent_cheese + name = "Agent Cheese" + desc = "I like my cheese Swiss... not American." + +/mob/living/simple_mob/animal/passive/mouse/operative/agent_cheese/New() ..() - // Change my name back, don't want to be named Tom (666) + // Change my name back, don't want to be named agent_cheese (666) name = initial(name) - // Mouse noises /datum/say_list/mouse speak = list("Squeek!","SQUEEK!","Squeek?") diff --git a/icons/inventory/ears/mob.dmi b/icons/inventory/ears/mob.dmi index 4f295fc8e9a..95ec0e9c8a9 100644 Binary files a/icons/inventory/ears/mob.dmi and b/icons/inventory/ears/mob.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 46f5fd2d5d3..c555efe874c 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 346b85779cb..def737dcc36 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/mob/items/lefthand_holder.dmi b/icons/mob/items/lefthand_holder.dmi index e6b77b55cbc..aa7e7807cca 100644 Binary files a/icons/mob/items/lefthand_holder.dmi and b/icons/mob/items/lefthand_holder.dmi differ diff --git a/icons/mob/items/righthand_holder.dmi b/icons/mob/items/righthand_holder.dmi index b413a9904d0..bad25f481b9 100644 Binary files a/icons/mob/items/righthand_holder.dmi and b/icons/mob/items/righthand_holder.dmi differ