From ace42d130da0d4ec0b6b9cd11e0e89a577a69098 Mon Sep 17 00:00:00 2001 From: Dahlular Date: Fri, 17 Apr 2020 15:35:21 -0600 Subject: [PATCH] Really quickly fixes animals to be held whoops haha --- code/modules/mob/living/simple_animal/friendly/cat.dm | 1 + code/modules/mob/living/simple_animal/friendly/dog.dm | 1 + code/modules/mob/living/simple_animal/friendly/lizard.dm | 3 ++- code/modules/mob/living/simple_animal/friendly/mouse.dm | 3 ++- code/modules/mob/living/simple_animal/friendly/sloth.dm | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index f2047435..4c47a606 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -32,6 +32,7 @@ gold_core_spawnable = FRIENDLY_SPAWN collar_type = "cat" can_be_held = "cat2" + size_multiplier = 0.5 do_footstep = TRUE diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 9760b066..00f9350d 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -13,6 +13,7 @@ see_in_dark = 5 speak_chance = 1 turns_per_move = 10 + size_multiplier = 0.5 do_footstep = TRUE can_be_held = TRUE diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index a7c56cc7..6076e412 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -24,6 +24,7 @@ environment_smash = ENVIRONMENT_SMASH_NONE var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption. can_be_held = "lizard" + size_multiplier = 0.5 /mob/living/simple_animal/hostile/lizard/CanAttack(atom/the_target)//Can we actually attack a possible target? if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it @@ -43,4 +44,4 @@ /mob/living/simple_animal/hostile/lizard/generate_mob_holder() var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "lizard", 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi', TRUE) - return holder \ No newline at end of file + return holder diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 47e8f4d0..028bada0 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -26,6 +26,7 @@ gold_core_spawnable = FRIENDLY_SPAWN var/chew_probability = 1 can_be_held = TRUE + size_multiplier = 0.5 /mob/living/simple_animal/mouse/Initialize() . = ..() @@ -126,4 +127,4 @@ /mob/living/simple_animal/mouse/generate_mob_holder() var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, (istext(can_be_held) ? can_be_held : ""), 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi') holder.w_class = WEIGHT_CLASS_TINY - return holder \ No newline at end of file + return holder diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm index 175cb8e8..fb114ace 100644 --- a/code/modules/mob/living/simple_animal/friendly/sloth.dm +++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm @@ -23,6 +23,7 @@ speed = 10 glide_size = 2 can_be_held = "sloth" //finally oranges can be held + size_multiplier = 0.5 do_footstep = TRUE