cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9964 from VOREStation/upstream-merge-7981

Browse Source 
[MIRROR] Minor cleanup.
This commit is contained in:
Novacat
2021-03-18 10:38:51 -04:00
committed by Chompstation Bot
parent 5c285eda7d
commit b6c28ecfb0
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/__defines/mobs.dm
View File

@@ -160,12 +160,6 @@
#define FLASH_PROTECTION_MODERATE 1 #define FLASH_PROTECTION_MODERATE 1
#define FLASH_PROTECTION_MAJOR 2 #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 // Incapacitation flags, used by the mob/proc/incapacitated() proc
#define INCAPACITATION_RESTRAINED 1 #define INCAPACITATION_RESTRAINED 1
#define INCAPACITATION_BUCKLED_PARTIALLY 2 #define INCAPACITATION_BUCKLED_PARTIALLY 2

3
code/modules/food/food/snacks.dm
View File

@@ -4730,9 +4730,6 @@
/mob/living/simple_mob /mob/living/simple_mob
var/kitchen_tag = "animal" //Used for cooking with animals 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 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel
slices_num = 8 slices_num = 8

1
code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
View File

@@ -7,6 +7,7 @@
item_state = "mouse_gray" item_state = "mouse_gray"
icon_living = "mouse_gray" icon_living = "mouse_gray"
icon_dead = "mouse_gray_dead" icon_dead = "mouse_gray_dead"
kitchen_tag = "rodent"
maxHealth = 5 maxHealth = 5
health = 5 health = 5

2
code/modules/tgui/states/default.dm
View File

@@ -61,7 +61,7 @@ GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new)
return STATUS_CLOSE 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) . = shared_tgui_interaction(src_object)
if(. > STATUS_CLOSE) if(. > STATUS_CLOSE)
. = min(., shared_living_tgui_distance(src_object)) //simple animals can only use things they're near. . = min(., shared_living_tgui_distance(src_object)) //simple animals can only use things they're near.