Merge branch 'master' into 91-files-changed-fml

code/modules/mob/living/carbon/human/species_types/dwarves.dm

@@ -101,7 +101,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 
 /obj/item/organ/dwarfgland/on_life() //Primary loop to hook into to start delayed loops for other loops..
 	. = ..()
-	if(!owner || owner.stat == DEAD)
+	if(owner && owner.stat != DEAD)
 		dwarf_cycle_ticker()
 
 //Handles the delayed tick cycle by just adding on increments per each on_life() tick

code/modules/mob/living/simple_animal/bot/medbot.dm

@@ -264,6 +264,9 @@
 		if((last_newpatient_speak + 300) < world.time) //Don't spam these messages!
 			var/list/messagevoice = list("Hey, [H.name]! Hold on, I'm coming." = 'sound/voice/medbot/coming.ogg',"Wait [H.name]! I want to help!" = 'sound/voice/medbot/help.ogg',"[H.name], you appear to be injured!" = 'sound/voice/medbot/injured.ogg')
 			var/message = pick(messagevoice)
+			if(prob(1) && ISINRANGE_EX(H.getFireLoss(), 0, 20))
+				message = "Notices your minor burns*OwO what's this?"
+				messagevoice[message] = 'sound/voice/medbot/owo.ogg'
 			speak(message)
 			playsound(loc, messagevoice[message], 50, 0)
 			last_newpatient_speak = world.time

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -97,6 +97,8 @@
 	body_color = "brown"
 	icon_state = "mouse_brown"
 
+GLOBAL_VAR(tom_existed)
+
 //TOM IS ALIVE! SQUEEEEEEEE~K :)
 /mob/living/simple_animal/mouse/brown/Tom
 	name = "Tom"
@@ -106,6 +108,10 @@
 	response_harm   = "splats"
 	gold_core_spawnable = NO_SPAWN
 
+/mob/living/simple_animal/mouse/brown/Tom/Initialize()
+	. = ..()
+	GLOB.tom_existed = TRUE
+
 /obj/item/reagent_containers/food/snacks/deadmouse
 	name = "dead mouse"
 	desc = "It looks like somebody dropped the bass on it. A lizard's favorite meal."