From f498137dda0d29e0c09dd021bb0a45d4155d0bec Mon Sep 17 00:00:00 2001 From: Atermonera Date: Wed, 17 Mar 2021 23:54:29 -0900 Subject: [PATCH] Merge pull request #7981 from MistakeNot4892/cleanup Minor cleanup. --- code/__defines/mobs.dm | 6 ------ code/modules/food/food/snacks.dm | 3 --- .../mob/living/simple_mob/subtypes/animal/passive/mouse.dm | 1 + code/modules/tgui/states/default.dm | 2 +- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index d166b52fbe1..df74b17bc08 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -160,12 +160,6 @@ #define FLASH_PROTECTION_MODERATE 1 #define FLASH_PROTECTION_MAJOR 2 -#define ANIMAL_SPAWN_DELAY round(config.respawn_delay / 6) -#define DRONE_SPAWN_DELAY round(config.respawn_delay / 3) - -#define ANIMAL_SPAWN_DELAY round(config.respawn_delay / 6) -#define DRONE_SPAWN_DELAY round(config.respawn_delay / 3) - // Incapacitation flags, used by the mob/proc/incapacitated() proc #define INCAPACITATION_RESTRAINED 1 #define INCAPACITATION_BUCKLED_PARTIALLY 2 diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index edbbbdc0d38..237688622d7 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -4724,9 +4724,6 @@ /mob/living/simple_mob var/kitchen_tag = "animal" //Used for cooking with animals -/mob/living/simple_mob/mouse - kitchen_tag = "rodent" - /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel slices_num = 8 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 dedac8e1e2b..292a4eeacd6 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 @@ -7,6 +7,7 @@ item_state = "mouse_gray" icon_living = "mouse_gray" icon_dead = "mouse_gray_dead" + kitchen_tag = "rodent" maxHealth = 5 health = 5 diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm index cd08fb7f4cf..93ba1df55f7 100644 --- a/code/modules/tgui/states/default.dm +++ b/code/modules/tgui/states/default.dm @@ -61,7 +61,7 @@ GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new) return STATUS_CLOSE -/mob/living/simple_animal/default_can_use_tgui_topic(src_object) +/mob/living/simple_mob/default_can_use_tgui_topic(src_object) . = shared_tgui_interaction(src_object) if(. > STATUS_CLOSE) . = min(., shared_living_tgui_distance(src_object)) //simple animals can only use things they're near.